drop selected platform data for omap4
Subsystems (4)
Tony Lindgren
maintainercover drop selected platform data for omap4
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 omap4
ARM: OMAP2+: Drop i2c platform data for omap4
ARM: OMAP2+: Drop gpio platform data for omap4
ARM: OMAP2+: Drop uart platform data for omap4
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 602 --------------------- 1 file changed, 602 deletions(-)
Signature · 1 line
2.21.0
Tony Lindgren
maintainerPATCH 1/4 ARM: OMAP2+: Drop mmc platform data for omap4
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_44xx_data.c | 160 --------------------- 1 file changed, 160 deletions(-)
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +0 -160
@@ -21,7 +21,6 @@*/ #include <linux/io.h> -#include <linux/platform_data/hsmmc-omap.h> #include <linux/power/smartreflex.h> #include <linux/platform_data/i2c-omap.h>
@@ -1902,102 +1901,6 @@ static struct omap_hwmod omap44xx_mcspi4_hwmod = {* multimedia card high-speed/sd/sdio (mmc/sd/sdio) host controller */ -static struct omap_hwmod_class_sysconfig omap44xx_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 omap44xx_mmc_hwmod_class = { - .name ="mmc" , - .sysc = &omap44xx_mmc_sysc, -}; - -/* mmc1 */ -static struct omap_hsmmc_dev_attr mmc1_dev_attr = { - .flags =OMAP_HSMMC_SUPPORTS_DUAL_VOLT , -}; - -static struct omap_hwmod omap44xx_mmc1_hwmod = { - .name ="mmc1" , - .class = &omap44xx_mmc_hwmod_class, - .clkdm_name ="l3_init_clkdm" , - .main_clk ="hsmmc1_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP4_CM_L3INIT_MMC1_CLKCTRL_OFFSET , - .context_offs =OMAP4_RM_L3INIT_MMC1_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, - .dev_attr = &mmc1_dev_attr, -}; - -/* mmc2 */ -static struct omap_hwmod omap44xx_mmc2_hwmod = { - .name ="mmc2" , - .class = &omap44xx_mmc_hwmod_class, - .clkdm_name ="l3_init_clkdm" , - .main_clk ="hsmmc2_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP4_CM_L3INIT_MMC2_CLKCTRL_OFFSET , - .context_offs =OMAP4_RM_L3INIT_MMC2_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* mmc3 */ -static struct omap_hwmod omap44xx_mmc3_hwmod = { - .name ="mmc3" , - .class = &omap44xx_mmc_hwmod_class, - .clkdm_name ="l4_per_clkdm" , - .main_clk ="func_48m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP4_CM_L4PER_MMCSD3_CLKCTRL_OFFSET , - .context_offs =OMAP4_RM_L4PER_MMCSD3_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* mmc4 */ -static struct omap_hwmod omap44xx_mmc4_hwmod = { - .name ="mmc4" , - .class = &omap44xx_mmc_hwmod_class, - .clkdm_name ="l4_per_clkdm" , - .main_clk ="func_48m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP4_CM_L4PER_MMCSD4_CLKCTRL_OFFSET , - .context_offs =OMAP4_RM_L4PER_MMCSD4_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* mmc5 */ -static struct omap_hwmod omap44xx_mmc5_hwmod = { - .name ="mmc5" , - .class = &omap44xx_mmc_hwmod_class, - .clkdm_name ="l4_per_clkdm" , - .main_clk ="func_48m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP4_CM_L4PER_MMCSD5_CLKCTRL_OFFSET , - .context_offs =OMAP4_RM_L4PER_MMCSD5_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -};/* * 'mmu' class
@@ -3079,22 +2982,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__l3_main_1 = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -/* mmc1 -> l3_main_1 */ -static struct omap_hwmod_ocp_if omap44xx_mmc1__l3_main_1 = { - .master = &omap44xx_mmc1_hwmod, - .slave = &omap44xx_l3_main_1_hwmod, - .clk ="l3_div_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* mmc2 -> l3_main_1 */ -static struct omap_hwmod_ocp_if omap44xx_mmc2__l3_main_1 = { - .master = &omap44xx_mmc2_hwmod, - .slave = &omap44xx_l3_main_1_hwmod, - .clk ="l3_div_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; -/* mpu -> l3_main_1 */ static struct omap_hwmod_ocp_if omap44xx_mpu__l3_main_1 = { .master = &omap44xx_mpu_hwmod,
@@ -3799,46 +3686,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mcspi4 = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -/* l4_per -> mmc1 */ -static struct omap_hwmod_ocp_if omap44xx_l4_per__mmc1 = { - .master = &omap44xx_l4_per_hwmod, - .slave = &omap44xx_mmc1_hwmod, - .clk ="l4_div_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> mmc2 */ -static struct omap_hwmod_ocp_if omap44xx_l4_per__mmc2 = { - .master = &omap44xx_l4_per_hwmod, - .slave = &omap44xx_mmc2_hwmod, - .clk ="l4_div_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> mmc3 */ -static struct omap_hwmod_ocp_if omap44xx_l4_per__mmc3 = { - .master = &omap44xx_l4_per_hwmod, - .slave = &omap44xx_mmc3_hwmod, - .clk ="l4_div_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> mmc4 */ -static struct omap_hwmod_ocp_if omap44xx_l4_per__mmc4 = { - .master = &omap44xx_l4_per_hwmod, - .slave = &omap44xx_mmc4_hwmod, - .clk ="l4_div_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> mmc5 */ -static struct omap_hwmod_ocp_if omap44xx_l4_per__mmc5 = { - .master = &omap44xx_l4_per_hwmod, - .slave = &omap44xx_mmc5_hwmod, - .clk ="l4_div_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; -/* l3_main_2 -> ocmc_ram */ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__ocmc_ram = { .master = &omap44xx_l3_main_2_hwmod,
@@ -4161,8 +4008,6 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { &omap44xx_dss__l3_main_1, &omap44xx_l3_main_2__l3_main_1, &omap44xx_l4_cfg__l3_main_1, - &omap44xx_mmc1__l3_main_1, - &omap44xx_mmc2__l3_main_1, &omap44xx_mpu__l3_main_1, &omap44xx_debugss__l3_main_2, &omap44xx_dma_system__l3_main_2,
@@ -4250,11 +4095,6 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { &omap44xx_l4_per__mcspi2, &omap44xx_l4_per__mcspi3, &omap44xx_l4_per__mcspi4, - &omap44xx_l4_per__mmc1, - &omap44xx_l4_per__mmc2, - &omap44xx_l4_per__mmc3, - &omap44xx_l4_per__mmc4, - &omap44xx_l4_per__mmc5, &omap44xx_l3_main_2__mmu_ipu, &omap44xx_l4_cfg__mmu_dsp, &omap44xx_l3_main_2__ocmc_ram,
Signature · 1 line
2.21.0
Tony Lindgren
maintainerPATCH 2/4 ARM: OMAP2+: Drop i2c platform data for omap4
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_44xx_data.c | 119 --------------------- 1 file changed, 119 deletions(-)
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +0 -119
@@ -22,7 +22,6 @@#include <linux/io.h> #include <linux/power/smartreflex.h> -#include <linux/platform_data/i2c-omap.h> #include <linux/omap-dma.h>
@@ -32,7 +31,6 @@#include "cm2_44xx.h" #include "prm44xx.h" #include "prm-regbits-44xx.h" -#include "i2c.h" #include "wd_timer.h" /* Base offset for all OMAP4 interrupts external to MPUSS */
@@ -1357,87 +1355,6 @@ static struct omap_hwmod omap44xx_hsi_hwmod = {* multimaster high-speed i2c controller */ -static struct omap_hwmod_class_sysconfig omap44xx_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 omap44xx_i2c_hwmod_class = { - .name ="i2c" , - .sysc = &omap44xx_i2c_sysc, - .reset = &omap_i2c_reset, -}; - -/* i2c1 */ -static struct omap_hwmod omap44xx_i2c1_hwmod = { - .name ="i2c1" , - .class = &omap44xx_i2c_hwmod_class, - .clkdm_name ="l4_per_clkdm" , - .flags =HWMOD_16BIT_REG |HWMOD_SET_DEFAULT_CLOCKACT , - .main_clk ="func_96m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP4_CM_L4PER_I2C1_CLKCTRL_OFFSET , - .context_offs =OMAP4_RM_L4PER_I2C1_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* i2c2 */ -static struct omap_hwmod omap44xx_i2c2_hwmod = { - .name ="i2c2" , - .class = &omap44xx_i2c_hwmod_class, - .clkdm_name ="l4_per_clkdm" , - .flags =HWMOD_16BIT_REG |HWMOD_SET_DEFAULT_CLOCKACT , - .main_clk ="func_96m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP4_CM_L4PER_I2C2_CLKCTRL_OFFSET , - .context_offs =OMAP4_RM_L4PER_I2C2_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* i2c3 */ -static struct omap_hwmod omap44xx_i2c3_hwmod = { - .name ="i2c3" , - .class = &omap44xx_i2c_hwmod_class, - .clkdm_name ="l4_per_clkdm" , - .flags =HWMOD_16BIT_REG |HWMOD_SET_DEFAULT_CLOCKACT , - .main_clk ="func_96m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP4_CM_L4PER_I2C3_CLKCTRL_OFFSET , - .context_offs =OMAP4_RM_L4PER_I2C3_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* i2c4 */ -static struct omap_hwmod omap44xx_i2c4_hwmod = { - .name ="i2c4" , - .class = &omap44xx_i2c_hwmod_class, - .clkdm_name ="l4_per_clkdm" , - .flags =HWMOD_16BIT_REG |HWMOD_SET_DEFAULT_CLOCKACT , - .main_clk ="func_96m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP4_CM_L4PER_I2C4_CLKCTRL_OFFSET , - .context_offs =OMAP4_RM_L4PER_I2C4_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -};/* * 'ipu' class
@@ -3518,38 +3435,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__hsi = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -/* l4_per -> i2c1 */ -static struct omap_hwmod_ocp_if omap44xx_l4_per__i2c1 = { - .master = &omap44xx_l4_per_hwmod, - .slave = &omap44xx_i2c1_hwmod, - .clk ="l4_div_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> i2c2 */ -static struct omap_hwmod_ocp_if omap44xx_l4_per__i2c2 = { - .master = &omap44xx_l4_per_hwmod, - .slave = &omap44xx_i2c2_hwmod, - .clk ="l4_div_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> i2c3 */ -static struct omap_hwmod_ocp_if omap44xx_l4_per__i2c3 = { - .master = &omap44xx_l4_per_hwmod, - .slave = &omap44xx_i2c3_hwmod, - .clk ="l4_div_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> i2c4 */ -static struct omap_hwmod_ocp_if omap44xx_l4_per__i2c4 = { - .master = &omap44xx_l4_per_hwmod, - .slave = &omap44xx_i2c4_hwmod, - .clk ="l4_div_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; -/* l3_main_2 -> ipu */ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__ipu = { .master = &omap44xx_l3_main_2_hwmod,
@@ -4074,10 +3959,6 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { &omap44xx_l3_main_2__gpu, &omap44xx_l4_per__hdq1w, &omap44xx_l4_cfg__hsi, - &omap44xx_l4_per__i2c1, - &omap44xx_l4_per__i2c2, - &omap44xx_l4_per__i2c3, - &omap44xx_l4_per__i2c4, &omap44xx_l3_main_2__ipu, &omap44xx_l3_main_2__iss,/* &omap44xx_iva__sl2if, */
Signature · 1 line
2.21.0
Tony Lindgren
maintainerPATCH 3/4 ARM: OMAP2+: Drop gpio platform data for omap4
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_44xx_data.c | 207 --------------------- 1 file changed, 207 deletions(-)
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +0 -207
@@ -1052,159 +1052,6 @@ static struct omap_hwmod omap44xx_fdif_hwmod = { }, }; -/* -* 'gpio' class -* general purpose io module -*/ - -static struct omap_hwmod_class_sysconfig omap44xx_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 omap44xx_gpio_hwmod_class = { - .name ="gpio" , - .sysc = &omap44xx_gpio_sysc, -}; - -/* gpio1 */ -static struct omap_hwmod_opt_clk gpio1_opt_clks[] = { - { .role ="dbclk" , .clk ="gpio1_dbclk" }, -}; - -static struct omap_hwmod omap44xx_gpio1_hwmod = { - .name ="gpio1" , - .class = &omap44xx_gpio_hwmod_class, - .clkdm_name ="l4_wkup_clkdm" , - .main_clk ="l4_wkup_clk_mux_ck" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP4_CM_WKUP_GPIO1_CLKCTRL_OFFSET , - .context_offs =OMAP4_RM_WKUP_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 omap44xx_gpio2_hwmod = { - .name ="gpio2" , - .class = &omap44xx_gpio_hwmod_class, - .clkdm_name ="l4_per_clkdm" , - .flags =HWMOD_CONTROL_OPT_CLKS_IN_RESET , - .main_clk ="l4_div_ck" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP4_CM_L4PER_GPIO2_CLKCTRL_OFFSET , - .context_offs =OMAP4_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 omap44xx_gpio3_hwmod = { - .name ="gpio3" , - .class = &omap44xx_gpio_hwmod_class, - .clkdm_name ="l4_per_clkdm" , - .flags =HWMOD_CONTROL_OPT_CLKS_IN_RESET , - .main_clk ="l4_div_ck" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP4_CM_L4PER_GPIO3_CLKCTRL_OFFSET , - .context_offs =OMAP4_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 omap44xx_gpio4_hwmod = { - .name ="gpio4" , - .class = &omap44xx_gpio_hwmod_class, - .clkdm_name ="l4_per_clkdm" , - .flags =HWMOD_CONTROL_OPT_CLKS_IN_RESET , - .main_clk ="l4_div_ck" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP4_CM_L4PER_GPIO4_CLKCTRL_OFFSET , - .context_offs =OMAP4_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 omap44xx_gpio5_hwmod = { - .name ="gpio5" , - .class = &omap44xx_gpio_hwmod_class, - .clkdm_name ="l4_per_clkdm" , - .flags =HWMOD_CONTROL_OPT_CLKS_IN_RESET , - .main_clk ="l4_div_ck" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP4_CM_L4PER_GPIO5_CLKCTRL_OFFSET , - .context_offs =OMAP4_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 omap44xx_gpio6_hwmod = { - .name ="gpio6" , - .class = &omap44xx_gpio_hwmod_class, - .clkdm_name ="l4_per_clkdm" , - .flags =HWMOD_CONTROL_OPT_CLKS_IN_RESET , - .main_clk ="l4_div_ck" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP4_CM_L4PER_GPIO6_CLKCTRL_OFFSET , - .context_offs =OMAP4_RM_L4PER_GPIO6_CONTEXT_OFFSET , - .modulemode =MODULEMODE_HWCTRL , - }, - }, - .opt_clks = gpio6_opt_clks, - .opt_clks_cnt =ARRAY_SIZE (gpio6_opt_clks), -}; -/* * 'gpmc' class * general purpose memory controller
@@ -3355,54 +3202,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__fdif = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -/* l4_wkup -> gpio1 */ -static struct omap_hwmod_ocp_if omap44xx_l4_wkup__gpio1 = { - .master = &omap44xx_l4_wkup_hwmod, - .slave = &omap44xx_gpio1_hwmod, - .clk ="l4_wkup_clk_mux_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> gpio2 */ -static struct omap_hwmod_ocp_if omap44xx_l4_per__gpio2 = { - .master = &omap44xx_l4_per_hwmod, - .slave = &omap44xx_gpio2_hwmod, - .clk ="l4_div_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> gpio3 */ -static struct omap_hwmod_ocp_if omap44xx_l4_per__gpio3 = { - .master = &omap44xx_l4_per_hwmod, - .slave = &omap44xx_gpio3_hwmod, - .clk ="l4_div_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> gpio4 */ -static struct omap_hwmod_ocp_if omap44xx_l4_per__gpio4 = { - .master = &omap44xx_l4_per_hwmod, - .slave = &omap44xx_gpio4_hwmod, - .clk ="l4_div_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> gpio5 */ -static struct omap_hwmod_ocp_if omap44xx_l4_per__gpio5 = { - .master = &omap44xx_l4_per_hwmod, - .slave = &omap44xx_gpio5_hwmod, - .clk ="l4_div_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> gpio6 */ -static struct omap_hwmod_ocp_if omap44xx_l4_per__gpio6 = { - .master = &omap44xx_l4_per_hwmod, - .slave = &omap44xx_gpio6_hwmod, - .clk ="l4_div_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; -/* l3_main_2 -> gpmc */ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__gpmc = { .master = &omap44xx_l3_main_2_hwmod,
@@ -3949,12 +3748,6 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { &omap44xx_l4_per__dss_venc, &omap44xx_l4_per__elm, &omap44xx_l4_cfg__fdif, - &omap44xx_l4_wkup__gpio1, - &omap44xx_l4_per__gpio2, - &omap44xx_l4_per__gpio3, - &omap44xx_l4_per__gpio4, - &omap44xx_l4_per__gpio5, - &omap44xx_l4_per__gpio6, &omap44xx_l3_main_2__gpmc, &omap44xx_l3_main_2__gpu, &omap44xx_l4_per__hdq1w,
Signature · 1 line
2.21.0
Tony Lindgren
maintainerPATCH 4/4 ARM: OMAP2+: Drop uart platform data for omap4
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_44xx_data.c | 116 --------------------- 1 file changed, 116 deletions(-)
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +0 -116
@@ -2341,86 +2341,6 @@ static struct omap_hwmod omap44xx_timer11_hwmod = {* universal asynchronous receiver/transmitter (uart) */ -static struct omap_hwmod_class_sysconfig omap44xx_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 omap44xx_uart_hwmod_class = { - .name ="uart" , - .sysc = &omap44xx_uart_sysc, -}; - -/* uart1 */ -static struct omap_hwmod omap44xx_uart1_hwmod = { - .name ="uart1" , - .class = &omap44xx_uart_hwmod_class, - .clkdm_name ="l4_per_clkdm" , - .flags =HWMOD_SWSUP_SIDLE_ACT , - .main_clk ="func_48m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP4_CM_L4PER_UART1_CLKCTRL_OFFSET , - .context_offs =OMAP4_RM_L4PER_UART1_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* uart2 */ -static struct omap_hwmod omap44xx_uart2_hwmod = { - .name ="uart2" , - .class = &omap44xx_uart_hwmod_class, - .clkdm_name ="l4_per_clkdm" , - .flags =HWMOD_SWSUP_SIDLE_ACT , - .main_clk ="func_48m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP4_CM_L4PER_UART2_CLKCTRL_OFFSET , - .context_offs =OMAP4_RM_L4PER_UART2_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* uart3 */ -static struct omap_hwmod omap44xx_uart3_hwmod = { - .name ="uart3" , - .class = &omap44xx_uart_hwmod_class, - .clkdm_name ="l4_per_clkdm" , - .flags =DEBUG_OMAP4UART3_FLAGS |HWMOD_SWSUP_SIDLE_ACT , - .main_clk ="func_48m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP4_CM_L4PER_UART3_CLKCTRL_OFFSET , - .context_offs =OMAP4_RM_L4PER_UART3_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* uart4 */ -static struct omap_hwmod omap44xx_uart4_hwmod = { - .name ="uart4" , - .class = &omap44xx_uart_hwmod_class, - .clkdm_name ="l4_per_clkdm" , - .flags =DEBUG_OMAP4UART4_FLAGS |HWMOD_SWSUP_SIDLE_ACT , - .main_clk ="func_48m_fclk" , - .prcm = { - .omap4 = { - .clkctrl_offs =OMAP4_CM_L4PER_UART4_CLKCTRL_OFFSET , - .context_offs =OMAP4_RM_L4PER_UART4_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -};/* * 'usb_host_fs' class
@@ -3578,38 +3498,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__timer11 = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -/* l4_per -> uart1 */ -static struct omap_hwmod_ocp_if omap44xx_l4_per__uart1 = { - .master = &omap44xx_l4_per_hwmod, - .slave = &omap44xx_uart1_hwmod, - .clk ="l4_div_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> uart2 */ -static struct omap_hwmod_ocp_if omap44xx_l4_per__uart2 = { - .master = &omap44xx_l4_per_hwmod, - .slave = &omap44xx_uart2_hwmod, - .clk ="l4_div_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> uart3 */ -static struct omap_hwmod_ocp_if omap44xx_l4_per__uart3 = { - .master = &omap44xx_l4_per_hwmod, - .slave = &omap44xx_uart3_hwmod, - .clk ="l4_div_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per -> uart4 */ -static struct omap_hwmod_ocp_if omap44xx_l4_per__uart4 = { - .master = &omap44xx_l4_per_hwmod, - .slave = &omap44xx_uart4_hwmod, - .clk ="l4_div_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; -/* l4_cfg -> usb_host_fs */ static struct omap_hwmod_ocp_if __maybe_unused omap44xx_l4_cfg__usb_host_fs = { .master = &omap44xx_l4_cfg_hwmod,
@@ -3797,10 +3685,6 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { &omap44xx_l4_per__timer9, &omap44xx_l4_per__timer10, &omap44xx_l4_per__timer11, - &omap44xx_l4_per__uart1, - &omap44xx_l4_per__uart2, - &omap44xx_l4_per__uart3, - &omap44xx_l4_per__uart4,/* &omap44xx_l4_cfg__usb_host_fs, */ &omap44xx_l4_cfg__usb_host_hs, &omap44xx_l4_cfg__usb_otg_hs,
Signature · 1 line
2.21.0