drop selected platform data for omap5
Subsystems (4)
Tony Lindgren
maintainercover drop selected platform data for omap5
With the pending patches for ti-sysc interconnect target module driver, we can now drop legacy platform data for selected devices.
This series depends on the following pathces:
[PATCH 0/7] omap changes to allocate struct omap_hwmod dynamically [PATCH 00/14] ti-sysc changes to probe devices with dts data only
Tony Lindgren (4):
ARM: OMAP2+: Drop mmc platform data for omap5
ARM: OMAP2+: Drop i2c platform data for omap5
ARM: OMAP2+: Drop gpio platform data for omap5
ARM: OMAP2+: Drop uart platform data for omap5
arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 746 --------------------- 1 file changed, 746 deletions(-)
Signature · 1 line
2.21.0
Tony Lindgren
maintainerPATCH 1/4 ARM: OMAP2+: Drop mmc platform data for omap5
We can now drop legacy platform data one interconnect target module at a time in favor of the device tree based data that has been added earlier.
--- arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 155 --------------------- 1 file changed, 155 deletions(-)
arch/arm/mach-omap2/omap_hwmod_54xx_data.c +0 -155
@@ -18,7 +18,6 @@*/ #include <linux/io.h> -#include <linux/platform_data/hsmmc-omap.h> #include <linux/power/smartreflex.h> #include <linux/platform_data/i2c-omap.h>
@@ -1182,115 +1181,6 @@ static struct omap_hwmod omap54xx_mcspi4_hwmod = { }, }; -/* -* 'mmc' class -* multimedia card high-speed/sd/sdio (mmc/sd/sdio) host controller -*/ - -static struct omap_hwmod_class_sysconfig omap54xx_mmc_sysc = { - .rev_offs =0x0000 , - .sysc_offs =0x0010 , - .sysc_flags = (SYSC_HAS_EMUFREE |SYSC_HAS_MIDLEMODE | -SYSC_HAS_RESET_STATUS |SYSC_HAS_SIDLEMODE | -SYSC_HAS_SOFTRESET ), - .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART | -SIDLE_SMART_WKUP |MSTANDBY_FORCE |MSTANDBY_NO | -MSTANDBY_SMART |MSTANDBY_SMART_WKUP ), - .sysc_fields = &omap_hwmod_sysc_type2, -}; - -static struct omap_hwmod_class omap54xx_mmc_hwmod_class = { - .name ="mmc" , - .sysc = &omap54xx_mmc_sysc, -}; - -/* mmc1 */ -static struct omap_hwmod_opt_clk mmc1_opt_clks[] = { - { .role ="32khz_clk" , .clk ="mmc1_32khz_clk" }, -}; - -/* mmc1 dev_attr */ -static struct omap_hsmmc_dev_attr mmc1_dev_attr = { - .flags =OMAP_HSMMC_SUPPORTS_DUAL_VOLT , -}; - -static struct omap_hwmod omap54xx_mmc1_hwmod = { - .name ="mmc1" , - .class = &omap54xx_mmc_hwmod_class, - .clkdm_name ="l3init_clkdm" , - .main_clk ="mmc1_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_L3INIT_MMC1_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_L3INIT_MMC1_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, - .opt_clks = mmc1_opt_clks, - .opt_clks_cnt =ARRAY_SIZE (mmc1_opt_clks), - .dev_attr = &mmc1_dev_attr, -}; - -/* mmc2 */ -static struct omap_hwmod omap54xx_mmc2_hwmod = { - .name ="mmc2" , - .class = &omap54xx_mmc_hwmod_class, - .clkdm_name ="l3init_clkdm" , - .main_clk ="mmc2_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_L3INIT_MMC2_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_L3INIT_MMC2_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* mmc3 */ -static struct omap_hwmod omap54xx_mmc3_hwmod = { - .name ="mmc3" , - .class = &omap54xx_mmc_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .main_clk ="func_48m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_L4PER_MMC3_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_L4PER_MMC3_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* mmc4 */ -static struct omap_hwmod omap54xx_mmc4_hwmod = { - .name ="mmc4" , - .class = &omap54xx_mmc_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .main_clk ="func_48m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_L4PER_MMC4_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_L4PER_MMC4_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* mmc5 */ -static struct omap_hwmod omap54xx_mmc5_hwmod = { - .name ="mmc5" , - .class = &omap54xx_mmc_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .main_clk ="func_96m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_L4PER_MMC5_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_L4PER_MMC5_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; -/* * 'mmu' class * The memory management unit performs virtual to physical address translation
@@ -2456,46 +2346,6 @@ static struct omap_hwmod_ocp_if omap54xx_l4_per__mcspi4 = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -/* l4_per -> mmc1 */ -static struct omap_hwmod_ocp_if omap54xx_l4_per__mmc1 = { - .master = &omap54xx_l4_per_hwmod, - .slave = &omap54xx_mmc1_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> mmc2 */ -static struct omap_hwmod_ocp_if omap54xx_l4_per__mmc2 = { - .master = &omap54xx_l4_per_hwmod, - .slave = &omap54xx_mmc2_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> mmc3 */ -static struct omap_hwmod_ocp_if omap54xx_l4_per__mmc3 = { - .master = &omap54xx_l4_per_hwmod, - .slave = &omap54xx_mmc3_hwmod, - .clk ="l4_root_clk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> mmc4 */ -static struct omap_hwmod_ocp_if omap54xx_l4_per__mmc4 = { - .master = &omap54xx_l4_per_hwmod, - .slave = &omap54xx_mmc4_hwmod, - .clk ="l4_root_clk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> mmc5 */ -static struct omap_hwmod_ocp_if omap54xx_l4_per__mmc5 = { - .master = &omap54xx_l4_per_hwmod, - .slave = &omap54xx_mmc5_hwmod, - .clk ="l4_root_clk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; -/* l4_cfg -> mpu */ static struct omap_hwmod_ocp_if omap54xx_l4_cfg__mpu = { .master = &omap54xx_l4_cfg_hwmod,
@@ -2741,11 +2591,6 @@ static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = { &omap54xx_l4_per__mcspi2, &omap54xx_l4_per__mcspi3, &omap54xx_l4_per__mcspi4, - &omap54xx_l4_per__mmc1, - &omap54xx_l4_per__mmc2, - &omap54xx_l4_per__mmc3, - &omap54xx_l4_per__mmc4, - &omap54xx_l4_per__mmc5, &omap54xx_l4_cfg__mpu, &omap54xx_l4_cfg__spinlock, &omap54xx_l4_cfg__ocp2scp1,
Signature · 1 line
2.21.0
Tony Lindgren
maintainerPATCH 2/4 ARM: OMAP2+: Drop i2c platform data for omap5
In reply to Tony LindgrenWe can now drop legacy platform data one interconnect target module at a time in favor of the device tree based data that has been added earlier.
--- arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 150 --------------------- 1 file changed, 150 deletions(-)
arch/arm/mach-omap2/omap_hwmod_54xx_data.c +0 -150
@@ -19,7 +19,6 @@#include <linux/io.h> #include <linux/power/smartreflex.h> -#include <linux/platform_data/i2c-omap.h> #include <linux/omap-dma.h>
@@ -28,7 +27,6 @@#include "cm1_54xx.h" #include "cm2_54xx.h" #include "prm54xx.h" -#include "i2c.h" #include "wd_timer.h" /* Base offset for all OMAP5 interrupts external to MPUSS */
@@ -796,109 +794,6 @@ static struct omap_hwmod omap54xx_gpio8_hwmod = { .opt_clks_cnt = ARRAY_SIZE(gpio8_opt_clks), }; -/* -* 'i2c' class -* multimaster high-speed i2c controller -*/ - -static struct omap_hwmod_class_sysconfig omap54xx_i2c_sysc = { - .rev_offs =0 , - .sysc_offs =0x0010 , - .syss_offs =0x0090 , - .sysc_flags = (SYSC_HAS_AUTOIDLE |SYSC_HAS_CLOCKACTIVITY | -SYSC_HAS_ENAWAKEUP |SYSC_HAS_SIDLEMODE | -SYSC_HAS_SOFTRESET |SYSS_HAS_RESET_STATUS ), - .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART | -SIDLE_SMART_WKUP ), - .sysc_fields = &omap_hwmod_sysc_type1, -}; - -static struct omap_hwmod_class omap54xx_i2c_hwmod_class = { - .name ="i2c" , - .sysc = &omap54xx_i2c_sysc, - .reset = &omap_i2c_reset, -}; - -/* i2c1 */ -static struct omap_hwmod omap54xx_i2c1_hwmod = { - .name ="i2c1" , - .class = &omap54xx_i2c_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .flags =HWMOD_16BIT_REG |HWMOD_SET_DEFAULT_CLOCKACT , - .main_clk ="func_96m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_L4PER_I2C1_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_L4PER_I2C1_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* i2c2 */ -static struct omap_hwmod omap54xx_i2c2_hwmod = { - .name ="i2c2" , - .class = &omap54xx_i2c_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .flags =HWMOD_16BIT_REG |HWMOD_SET_DEFAULT_CLOCKACT , - .main_clk ="func_96m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_L4PER_I2C2_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_L4PER_I2C2_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* i2c3 */ -static struct omap_hwmod omap54xx_i2c3_hwmod = { - .name ="i2c3" , - .class = &omap54xx_i2c_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .flags =HWMOD_16BIT_REG |HWMOD_SET_DEFAULT_CLOCKACT , - .main_clk ="func_96m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_L4PER_I2C3_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_L4PER_I2C3_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* i2c4 */ -static struct omap_hwmod omap54xx_i2c4_hwmod = { - .name ="i2c4" , - .class = &omap54xx_i2c_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .flags =HWMOD_16BIT_REG |HWMOD_SET_DEFAULT_CLOCKACT , - .main_clk ="func_96m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_L4PER_I2C4_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_L4PER_I2C4_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* i2c5 */ -static struct omap_hwmod omap54xx_i2c5_hwmod = { - .name ="i2c5" , - .class = &omap54xx_i2c_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .flags =HWMOD_16BIT_REG |HWMOD_SET_DEFAULT_CLOCKACT , - .main_clk ="func_96m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_L4PER_I2C5_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_L4PER_I2C5_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; -/* * 'kbd' class * keyboard controller
@@ -2226,46 +2121,6 @@ static struct omap_hwmod_ocp_if omap54xx_l4_per__gpio8 = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -/* l4_per -> i2c1 */ -static struct omap_hwmod_ocp_if omap54xx_l4_per__i2c1 = { - .master = &omap54xx_l4_per_hwmod, - .slave = &omap54xx_i2c1_hwmod, - .clk ="l4_root_clk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> i2c2 */ -static struct omap_hwmod_ocp_if omap54xx_l4_per__i2c2 = { - .master = &omap54xx_l4_per_hwmod, - .slave = &omap54xx_i2c2_hwmod, - .clk ="l4_root_clk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> i2c3 */ -static struct omap_hwmod_ocp_if omap54xx_l4_per__i2c3 = { - .master = &omap54xx_l4_per_hwmod, - .slave = &omap54xx_i2c3_hwmod, - .clk ="l4_root_clk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> i2c4 */ -static struct omap_hwmod_ocp_if omap54xx_l4_per__i2c4 = { - .master = &omap54xx_l4_per_hwmod, - .slave = &omap54xx_i2c4_hwmod, - .clk ="l4_root_clk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> i2c5 */ -static struct omap_hwmod_ocp_if omap54xx_l4_per__i2c5 = { - .master = &omap54xx_l4_per_hwmod, - .slave = &omap54xx_i2c5_hwmod, - .clk ="l4_root_clk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; -/* l4_wkup -> kbd */ static struct omap_hwmod_ocp_if omap54xx_l4_wkup__kbd = { .master = &omap54xx_l4_wkup_hwmod,
@@ -2575,11 +2430,6 @@ static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = { &omap54xx_l4_per__gpio6, &omap54xx_l4_per__gpio7, &omap54xx_l4_per__gpio8, - &omap54xx_l4_per__i2c1, - &omap54xx_l4_per__i2c2, - &omap54xx_l4_per__i2c3, - &omap54xx_l4_per__i2c4, - &omap54xx_l4_per__i2c5, &omap54xx_l3_main_2__mmu_ipu, &omap54xx_l4_wkup__kbd, &omap54xx_l4_cfg__mailbox,
Signature · 1 line
2.21.0
Tony Lindgren
maintainerPATCH 3/4 ARM: OMAP2+: Drop gpio platform data for omap5
In reply to Tony LindgrenWe can now drop legacy platform data one interconnect target module at a time in favor of the device tree based data that has been added earlier.
--- arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 269 --------------------- 1 file changed, 269 deletions(-)
arch/arm/mach-omap2/omap_hwmod_54xx_data.c +0 -269
@@ -597,203 +597,6 @@ static struct omap_hwmod omap54xx_emif2_hwmod = { }, }; -/* -* 'gpio' class -* general purpose io module -*/ - -static struct omap_hwmod_class_sysconfig omap54xx_gpio_sysc = { - .rev_offs =0x0000 , - .sysc_offs =0x0010 , - .syss_offs =0x0114 , - .sysc_flags = (SYSC_HAS_AUTOIDLE |SYSC_HAS_ENAWAKEUP | -SYSC_HAS_SIDLEMODE |SYSC_HAS_SOFTRESET | -SYSS_HAS_RESET_STATUS ), - .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART | -SIDLE_SMART_WKUP ), - .sysc_fields = &omap_hwmod_sysc_type1, -}; - -static struct omap_hwmod_class omap54xx_gpio_hwmod_class = { - .name ="gpio" , - .sysc = &omap54xx_gpio_sysc, -}; - -/* gpio1 */ -static struct omap_hwmod_opt_clk gpio1_opt_clks[] = { - { .role ="dbclk" , .clk ="gpio1_dbclk" }, -}; - -static struct omap_hwmod omap54xx_gpio1_hwmod = { - .name ="gpio1" , - .class = &omap54xx_gpio_hwmod_class, - .clkdm_name ="wkupaon_clkdm" , - .main_clk ="wkupaon_iclk_mux" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_WKUPAON_GPIO1_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_WKUPAON_GPIO1_CONTEXT_OFFSET , - .modulemode =MODULEMODE_HWCTRL , - }, - }, - .opt_clks = gpio1_opt_clks, - .opt_clks_cnt =ARRAY_SIZE (gpio1_opt_clks), -}; - -/* gpio2 */ -static struct omap_hwmod_opt_clk gpio2_opt_clks[] = { - { .role ="dbclk" , .clk ="gpio2_dbclk" }, -}; - -static struct omap_hwmod omap54xx_gpio2_hwmod = { - .name ="gpio2" , - .class = &omap54xx_gpio_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .flags =HWMOD_CONTROL_OPT_CLKS_IN_RESET , - .main_clk ="l4_root_clk_div" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_L4PER_GPIO2_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_L4PER_GPIO2_CONTEXT_OFFSET , - .modulemode =MODULEMODE_HWCTRL , - }, - }, - .opt_clks = gpio2_opt_clks, - .opt_clks_cnt =ARRAY_SIZE (gpio2_opt_clks), -}; - -/* gpio3 */ -static struct omap_hwmod_opt_clk gpio3_opt_clks[] = { - { .role ="dbclk" , .clk ="gpio3_dbclk" }, -}; - -static struct omap_hwmod omap54xx_gpio3_hwmod = { - .name ="gpio3" , - .class = &omap54xx_gpio_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .flags =HWMOD_CONTROL_OPT_CLKS_IN_RESET , - .main_clk ="l4_root_clk_div" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_L4PER_GPIO3_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_L4PER_GPIO3_CONTEXT_OFFSET , - .modulemode =MODULEMODE_HWCTRL , - }, - }, - .opt_clks = gpio3_opt_clks, - .opt_clks_cnt =ARRAY_SIZE (gpio3_opt_clks), -}; - -/* gpio4 */ -static struct omap_hwmod_opt_clk gpio4_opt_clks[] = { - { .role ="dbclk" , .clk ="gpio4_dbclk" }, -}; - -static struct omap_hwmod omap54xx_gpio4_hwmod = { - .name ="gpio4" , - .class = &omap54xx_gpio_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .flags =HWMOD_CONTROL_OPT_CLKS_IN_RESET , - .main_clk ="l4_root_clk_div" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_L4PER_GPIO4_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_L4PER_GPIO4_CONTEXT_OFFSET , - .modulemode =MODULEMODE_HWCTRL , - }, - }, - .opt_clks = gpio4_opt_clks, - .opt_clks_cnt =ARRAY_SIZE (gpio4_opt_clks), -}; - -/* gpio5 */ -static struct omap_hwmod_opt_clk gpio5_opt_clks[] = { - { .role ="dbclk" , .clk ="gpio5_dbclk" }, -}; - -static struct omap_hwmod omap54xx_gpio5_hwmod = { - .name ="gpio5" , - .class = &omap54xx_gpio_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .flags =HWMOD_CONTROL_OPT_CLKS_IN_RESET , - .main_clk ="l4_root_clk_div" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_L4PER_GPIO5_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_L4PER_GPIO5_CONTEXT_OFFSET , - .modulemode =MODULEMODE_HWCTRL , - }, - }, - .opt_clks = gpio5_opt_clks, - .opt_clks_cnt =ARRAY_SIZE (gpio5_opt_clks), -}; - -/* gpio6 */ -static struct omap_hwmod_opt_clk gpio6_opt_clks[] = { - { .role ="dbclk" , .clk ="gpio6_dbclk" }, -}; - -static struct omap_hwmod omap54xx_gpio6_hwmod = { - .name ="gpio6" , - .class = &omap54xx_gpio_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .flags =HWMOD_CONTROL_OPT_CLKS_IN_RESET , - .main_clk ="l4_root_clk_div" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_L4PER_GPIO6_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_L4PER_GPIO6_CONTEXT_OFFSET , - .modulemode =MODULEMODE_HWCTRL , - }, - }, - .opt_clks = gpio6_opt_clks, - .opt_clks_cnt =ARRAY_SIZE (gpio6_opt_clks), -}; - -/* gpio7 */ -static struct omap_hwmod_opt_clk gpio7_opt_clks[] = { - { .role ="dbclk" , .clk ="gpio7_dbclk" }, -}; - -static struct omap_hwmod omap54xx_gpio7_hwmod = { - .name ="gpio7" , - .class = &omap54xx_gpio_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .flags =HWMOD_CONTROL_OPT_CLKS_IN_RESET , - .main_clk ="l4_root_clk_div" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_L4PER_GPIO7_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_L4PER_GPIO7_CONTEXT_OFFSET , - .modulemode =MODULEMODE_HWCTRL , - }, - }, - .opt_clks = gpio7_opt_clks, - .opt_clks_cnt =ARRAY_SIZE (gpio7_opt_clks), -}; - -/* gpio8 */ -static struct omap_hwmod_opt_clk gpio8_opt_clks[] = { - { .role ="dbclk" , .clk ="gpio8_dbclk" }, -}; - -static struct omap_hwmod omap54xx_gpio8_hwmod = { - .name ="gpio8" , - .class = &omap54xx_gpio_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .flags =HWMOD_CONTROL_OPT_CLKS_IN_RESET , - .main_clk ="l4_root_clk_div" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_L4PER_GPIO8_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_L4PER_GPIO8_CONTEXT_OFFSET , - .modulemode =MODULEMODE_HWCTRL , - }, - }, - .opt_clks = gpio8_opt_clks, - .opt_clks_cnt =ARRAY_SIZE (gpio8_opt_clks), -}; -/* * 'kbd' class * keyboard controller
@@ -2057,70 +1860,6 @@ static struct omap_hwmod_ocp_if omap54xx_mpu__emif2 = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -/* l4_wkup -> gpio1 */ -static struct omap_hwmod_ocp_if omap54xx_l4_wkup__gpio1 = { - .master = &omap54xx_l4_wkup_hwmod, - .slave = &omap54xx_gpio1_hwmod, - .clk ="wkupaon_iclk_mux" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> gpio2 */ -static struct omap_hwmod_ocp_if omap54xx_l4_per__gpio2 = { - .master = &omap54xx_l4_per_hwmod, - .slave = &omap54xx_gpio2_hwmod, - .clk ="l4_root_clk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> gpio3 */ -static struct omap_hwmod_ocp_if omap54xx_l4_per__gpio3 = { - .master = &omap54xx_l4_per_hwmod, - .slave = &omap54xx_gpio3_hwmod, - .clk ="l4_root_clk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> gpio4 */ -static struct omap_hwmod_ocp_if omap54xx_l4_per__gpio4 = { - .master = &omap54xx_l4_per_hwmod, - .slave = &omap54xx_gpio4_hwmod, - .clk ="l4_root_clk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> gpio5 */ -static struct omap_hwmod_ocp_if omap54xx_l4_per__gpio5 = { - .master = &omap54xx_l4_per_hwmod, - .slave = &omap54xx_gpio5_hwmod, - .clk ="l4_root_clk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> gpio6 */ -static struct omap_hwmod_ocp_if omap54xx_l4_per__gpio6 = { - .master = &omap54xx_l4_per_hwmod, - .slave = &omap54xx_gpio6_hwmod, - .clk ="l4_root_clk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> gpio7 */ -static struct omap_hwmod_ocp_if omap54xx_l4_per__gpio7 = { - .master = &omap54xx_l4_per_hwmod, - .slave = &omap54xx_gpio7_hwmod, - .clk ="l4_root_clk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> gpio8 */ -static struct omap_hwmod_ocp_if omap54xx_l4_per__gpio8 = { - .master = &omap54xx_l4_per_hwmod, - .slave = &omap54xx_gpio8_hwmod, - .clk ="l4_root_clk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; -/* l4_wkup -> kbd */ static struct omap_hwmod_ocp_if omap54xx_l4_wkup__kbd = { .master = &omap54xx_l4_wkup_hwmod,
@@ -2422,14 +2161,6 @@ static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = { &omap54xx_l3_main_2__dss_rfbi, &omap54xx_mpu__emif1, &omap54xx_mpu__emif2, - &omap54xx_l4_wkup__gpio1, - &omap54xx_l4_per__gpio2, - &omap54xx_l4_per__gpio3, - &omap54xx_l4_per__gpio4, - &omap54xx_l4_per__gpio5, - &omap54xx_l4_per__gpio6, - &omap54xx_l4_per__gpio7, - &omap54xx_l4_per__gpio8, &omap54xx_l3_main_2__mmu_ipu, &omap54xx_l4_wkup__kbd, &omap54xx_l4_cfg__mailbox,
Signature · 1 line
2.21.0
Tony Lindgren
maintainerPATCH 4/4 ARM: OMAP2+: Drop uart platform data for omap5
In reply to Tony LindgrenWe can now drop legacy platform data one interconnect target module at a time in favor of the device tree based data that has been added earlier.
--- arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 172 --------------------- 1 file changed, 172 deletions(-)
arch/arm/mach-omap2/omap_hwmod_54xx_data.c +0 -172
@@ -1243,124 +1243,6 @@ static struct omap_hwmod omap54xx_timer11_hwmod = { }, }; -/* -* 'uart' class -* universal asynchronous receiver/transmitter (uart) -*/ - -static struct omap_hwmod_class_sysconfig omap54xx_uart_sysc = { - .rev_offs =0x0050 , - .sysc_offs =0x0054 , - .syss_offs =0x0058 , - .sysc_flags = (SYSC_HAS_AUTOIDLE |SYSC_HAS_ENAWAKEUP | -SYSC_HAS_SIDLEMODE |SYSC_HAS_SOFTRESET | -SYSS_HAS_RESET_STATUS ), - .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART | -SIDLE_SMART_WKUP ), - .sysc_fields = &omap_hwmod_sysc_type1, -}; - -static struct omap_hwmod_class omap54xx_uart_hwmod_class = { - .name ="uart" , - .sysc = &omap54xx_uart_sysc, -}; - -/* uart1 */ -static struct omap_hwmod omap54xx_uart1_hwmod = { - .name ="uart1" , - .class = &omap54xx_uart_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .flags =HWMOD_SWSUP_SIDLE_ACT , - .main_clk ="func_48m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_L4PER_UART1_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_L4PER_UART1_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* uart2 */ -static struct omap_hwmod omap54xx_uart2_hwmod = { - .name ="uart2" , - .class = &omap54xx_uart_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .flags =HWMOD_SWSUP_SIDLE_ACT , - .main_clk ="func_48m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_L4PER_UART2_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_L4PER_UART2_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* uart3 */ -static struct omap_hwmod omap54xx_uart3_hwmod = { - .name ="uart3" , - .class = &omap54xx_uart_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .flags =DEBUG_OMAP4UART3_FLAGS |HWMOD_SWSUP_SIDLE_ACT , - .main_clk ="func_48m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_L4PER_UART3_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_L4PER_UART3_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* uart4 */ -static struct omap_hwmod omap54xx_uart4_hwmod = { - .name ="uart4" , - .class = &omap54xx_uart_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .flags =DEBUG_OMAP4UART4_FLAGS |HWMOD_SWSUP_SIDLE_ACT , - .main_clk ="func_48m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_L4PER_UART4_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_L4PER_UART4_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* uart5 */ -static struct omap_hwmod omap54xx_uart5_hwmod = { - .name ="uart5" , - .class = &omap54xx_uart_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .flags =HWMOD_SWSUP_SIDLE_ACT , - .main_clk ="func_48m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_L4PER_UART5_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_L4PER_UART5_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* uart6 */ -static struct omap_hwmod omap54xx_uart6_hwmod = { - .name ="uart6" , - .class = &omap54xx_uart_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .flags =HWMOD_SWSUP_SIDLE_ACT , - .main_clk ="func_48m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP54XX_CM_L4PER_UART6_CLKCTRL_OFFSET , - .context_offs =OMAP54XX_RM_L4PER_UART6_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; -/* * 'usb_host_hs' class * high-speed multi-port usb host controller
@@ -2052,54 +1934,6 @@ static struct omap_hwmod_ocp_if omap54xx_l4_per__timer11 = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -/* l4_per -> uart1 */ -static struct omap_hwmod_ocp_if omap54xx_l4_per__uart1 = { - .master = &omap54xx_l4_per_hwmod, - .slave = &omap54xx_uart1_hwmod, - .clk ="l4_root_clk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> uart2 */ -static struct omap_hwmod_ocp_if omap54xx_l4_per__uart2 = { - .master = &omap54xx_l4_per_hwmod, - .slave = &omap54xx_uart2_hwmod, - .clk ="l4_root_clk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> uart3 */ -static struct omap_hwmod_ocp_if omap54xx_l4_per__uart3 = { - .master = &omap54xx_l4_per_hwmod, - .slave = &omap54xx_uart3_hwmod, - .clk ="l4_root_clk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> uart4 */ -static struct omap_hwmod_ocp_if omap54xx_l4_per__uart4 = { - .master = &omap54xx_l4_per_hwmod, - .slave = &omap54xx_uart4_hwmod, - .clk ="l4_root_clk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> uart5 */ -static struct omap_hwmod_ocp_if omap54xx_l4_per__uart5 = { - .master = &omap54xx_l4_per_hwmod, - .slave = &omap54xx_uart5_hwmod, - .clk ="l4_root_clk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> uart6 */ -static struct omap_hwmod_ocp_if omap54xx_l4_per__uart6 = { - .master = &omap54xx_l4_per_hwmod, - .slave = &omap54xx_uart6_hwmod, - .clk ="l4_root_clk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; -/* l4_cfg -> usb_host_hs */ static struct omap_hwmod_ocp_if omap54xx_l4_cfg__usb_host_hs = { .master = &omap54xx_l4_cfg_hwmod,
@@ -2186,12 +2020,6 @@ static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = { &omap54xx_l4_per__timer9, &omap54xx_l4_per__timer10, &omap54xx_l4_per__timer11, - &omap54xx_l4_per__uart1, - &omap54xx_l4_per__uart2, - &omap54xx_l4_per__uart3, - &omap54xx_l4_per__uart4, - &omap54xx_l4_per__uart5, - &omap54xx_l4_per__uart6, &omap54xx_l4_cfg__usb_host_hs, &omap54xx_l4_cfg__usb_tll_hs, &omap54xx_l4_cfg__usb_otg_ss,
Signature · 1 line
2.21.0