projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4286b67)
ARM: OMAP2+: Drop legacy platform data for am3 and am4 edma
authorTony Lindgren <tony@atomide.com>
Wed, 4 Mar 2020 15:25:31 +0000 (07:25 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 6 Mar 2020 15:20:04 +0000 (07:20 -0800)
We can now probe devices with ti-sysc interconnect driver and dts
data. Let's drop the related platform data and custom ti,hwmods
dts property.

As we're just dropping data, and the early platform data init
is based on the custom ti,hwmods property, we want to drop both
the platform data and ti,hwmods property in a single patch.

Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/boot/dts/am33xx.dtsi patch | blob | history
arch/arm/boot/dts/am4372.dtsi patch | blob | history
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h patch | blob | history
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c patch | blob | history
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c patch | blob | history
arch/arm/mach-omap2/omap_hwmod_33xx_data.c patch | blob | history
arch/arm/mach-omap2/omap_hwmod_43xx_data.c patch | blob | history

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index d8d93e58750e3299a9ef3ca9314af0838aa4598c..5b4dc957c474739cc2483a6e29a29100e053534b 100644 (file)
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -195,7 +195,6 @@
 
                target-module@49000000 {
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "tpcc";
                        reg = <0x49000000 0x4>;
                        reg-names = "rev";
                        clocks = <&l3_clkctrl AM3_L3_TPCC_CLKCTRL 0>;
@@ -223,7 +222,6 @@
 
                target-module@49800000 {
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "tptc0";
                        reg = <0x49800000 0x4>,
                              <0x49800010 0x4>;
                        reg-names = "rev", "sysc";
@@ -247,7 +245,6 @@
 
                target-module@49900000 {
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "tptc1";
                        reg = <0x49900000 0x4>,
                              <0x49900010 0x4>;
                        reg-names = "rev", "sysc";
@@ -271,7 +268,6 @@
 
                target-module@49a00000 {
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "tptc2";
                        reg = <0x49a00000 0x4>,
                              <0x49a00010 0x4>;
                        reg-names = "rev", "sysc";
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index 228c2b5afa33bb62ad5a8ed969ec0fe7042663e1..f9eb6545708371dc2c5360617054168755836dab 100644 (file)
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -187,7 +187,6 @@
 
                target-module@49000000 {
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "tpcc";
                        reg = <0x49000000 0x4>;
                        reg-names = "rev";
                        clocks = <&l3_clkctrl AM4_L3_TPCC_CLKCTRL 0>;
@@ -217,7 +216,6 @@
 
                target-module@49800000 {
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "tptc0";
                        reg = <0x49800000 0x4>,
                              <0x49800010 0x4>;
                        reg-names = "rev", "sysc";
@@ -241,7 +239,6 @@
 
                target-module@49900000 {
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "tptc1";
                        reg = <0x49900000 0x4>,
                              <0x49900010 0x4>;
                        reg-names = "rev", "sysc";
@@ -265,7 +262,6 @@
 
                target-module@49a00000 {
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "tptc2";
                        reg = <0x49a00000 0x4>,
                              <0x49a00010 0x4>;
                        reg-names = "rev", "sysc";
diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h
index 75aabbf5ff222a0830f7a195df055d96b559f5fe..fa2ff41f84b9d440e5a5d7c080cd9c25dcc67a22 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h
@@ -29,10 +29,6 @@ extern struct omap_hwmod_ocp_if am33xx_l3_main__gfx;
 extern struct omap_hwmod_ocp_if am33xx_l4_wkup__rtc;
 extern struct omap_hwmod_ocp_if am33xx_l3_s__gpmc;
 extern struct omap_hwmod_ocp_if am33xx_l4_ls__timer2;
-extern struct omap_hwmod_ocp_if am33xx_l3_main__tpcc;
-extern struct omap_hwmod_ocp_if am33xx_l3_main__tptc0;
-extern struct omap_hwmod_ocp_if am33xx_l3_main__tptc1;
-extern struct omap_hwmod_ocp_if am33xx_l3_main__tptc2;
 extern struct omap_hwmod_ocp_if am33xx_l3_main__ocmc;
 
 extern struct omap_hwmod am33xx_l3_main_hwmod;
@@ -50,10 +46,6 @@ extern struct omap_hwmod am33xx_gpmc_hwmod;
 extern struct omap_hwmod am33xx_rtc_hwmod;
 extern struct omap_hwmod am33xx_timer1_hwmod;
 extern struct omap_hwmod am33xx_timer2_hwmod;
-extern struct omap_hwmod am33xx_tpcc_hwmod;
-extern struct omap_hwmod am33xx_tptc0_hwmod;
-extern struct omap_hwmod am33xx_tptc1_hwmod;
-extern struct omap_hwmod am33xx_tptc2_hwmod;
 
 extern struct omap_hwmod_class am33xx_emif_hwmod_class;
 extern struct omap_hwmod_class am33xx_l4_hwmod_class;
diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c
index 4731946ee2ab9b8a96a226ca449bea905bfcb6a5..0ebbfbb4fb1c151ab0f0bc8624aaba0ea25b92dc 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c
@@ -114,38 +114,6 @@ struct omap_hwmod_ocp_if am33xx_l4_ls__timer2 = {
        .user           = OCP_USER_MPU,
 };
 
-/* l3 main -> tpcc */
-struct omap_hwmod_ocp_if am33xx_l3_main__tpcc = {
-       .master         = &am33xx_l3_main_hwmod,
-       .slave          = &am33xx_tpcc_hwmod,
-       .clk            = "l3_gclk",
-       .user           = OCP_USER_MPU,
-};
-
-/* l3 main -> tpcc0 */
-struct omap_hwmod_ocp_if am33xx_l3_main__tptc0 = {
-       .master         = &am33xx_l3_main_hwmod,
-       .slave          = &am33xx_tptc0_hwmod,
-       .clk            = "l3_gclk",
-       .user           = OCP_USER_MPU,
-};
-
-/* l3 main -> tpcc1 */
-struct omap_hwmod_ocp_if am33xx_l3_main__tptc1 = {
-       .master         = &am33xx_l3_main_hwmod,
-       .slave          = &am33xx_tptc1_hwmod,
-       .clk            = "l3_gclk",
-       .user           = OCP_USER_MPU,
-};
-
-/* l3 main -> tpcc2 */
-struct omap_hwmod_ocp_if am33xx_l3_main__tptc2 = {
-       .master         = &am33xx_l3_main_hwmod,
-       .slave          = &am33xx_tptc2_hwmod,
-       .clk            = "l3_gclk",
-       .user           = OCP_USER_MPU,
-};
-
 /* l3 main -> ocmc */
 struct omap_hwmod_ocp_if am33xx_l3_main__ocmc = {
        .master         = &am33xx_l3_main_hwmod,
diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c
index dc2a684d375d55733879dc1b93c72f37777fdb66..dca5a3a7b97c198c29733ee9ef97e40b07b5f7f4 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c
@@ -365,80 +365,6 @@ struct omap_hwmod am33xx_timer2_hwmod = {
        },
 };
 
-/* tpcc */
-static struct omap_hwmod_class am33xx_tpcc_hwmod_class = {
-       .name           = "tpcc",
-};
-
-struct omap_hwmod am33xx_tpcc_hwmod = {
-       .name           = "tpcc",
-       .class          = &am33xx_tpcc_hwmod_class,
-       .clkdm_name     = "l3_clkdm",
-       .main_clk       = "l3_gclk",
-       .prcm           = {
-               .omap4  = {
-                       .modulemode     = MODULEMODE_SWCTRL,
-               },
-       },
-};
-
-static struct omap_hwmod_class_sysconfig am33xx_tptc_sysc = {
-       .rev_offs       = 0x0,
-       .sysc_offs      = 0x10,
-       .sysc_flags     = (SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
-                         SYSC_HAS_MIDLEMODE),
-       .idlemodes      = (SIDLE_FORCE | SIDLE_SMART | MSTANDBY_FORCE),
-       .sysc_fields    = &omap_hwmod_sysc_type2,
-};
-
-/* 'tptc' class */
-static struct omap_hwmod_class am33xx_tptc_hwmod_class = {
-       .name           = "tptc",
-       .sysc           = &am33xx_tptc_sysc,
-};
-
-/* tptc0 */
-struct omap_hwmod am33xx_tptc0_hwmod = {
-       .name           = "tptc0",
-       .class          = &am33xx_tptc_hwmod_class,
-       .clkdm_name     = "l3_clkdm",
-       .flags          = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY,
-       .main_clk       = "l3_gclk",
-       .prcm           = {
-               .omap4  = {
-                       .modulemode     = MODULEMODE_SWCTRL,
-               },
-       },
-};
-
-/* tptc1 */
-struct omap_hwmod am33xx_tptc1_hwmod = {
-       .name           = "tptc1",
-       .class          = &am33xx_tptc_hwmod_class,
-       .clkdm_name     = "l3_clkdm",
-       .flags          = (HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY),
-       .main_clk       = "l3_gclk",
-       .prcm           = {
-               .omap4  = {
-                       .modulemode     = MODULEMODE_SWCTRL,
-               },
-       },
-};
-
-/* tptc2 */
-struct omap_hwmod am33xx_tptc2_hwmod = {
-       .name           = "tptc2",
-       .class          = &am33xx_tptc_hwmod_class,
-       .clkdm_name     = "l3_clkdm",
-       .flags          = (HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY),
-       .main_clk       = "l3_gclk",
-       .prcm           = {
-               .omap4  = {
-                       .modulemode     = MODULEMODE_SWCTRL,
-               },
-       },
-};
-
 static void omap_hwmod_am33xx_clkctrl(void)
 {
        CLKCTRL(am33xx_timer2_hwmod, AM33XX_CM_PER_TIMER2_CLKCTRL_OFFSET);
@@ -453,10 +379,6 @@ static void omap_hwmod_am33xx_clkctrl(void)
        CLKCTRL(am33xx_l4_ls_hwmod, AM33XX_CM_PER_L4LS_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_l4_wkup_hwmod, AM33XX_CM_WKUP_L4WKUP_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_l3_main_hwmod, AM33XX_CM_PER_L3_CLKCTRL_OFFSET);
-       CLKCTRL(am33xx_tpcc_hwmod, AM33XX_CM_PER_TPCC_CLKCTRL_OFFSET);
-       CLKCTRL(am33xx_tptc0_hwmod, AM33XX_CM_PER_TPTC0_CLKCTRL_OFFSET);
-       CLKCTRL(am33xx_tptc1_hwmod, AM33XX_CM_PER_TPTC1_CLKCTRL_OFFSET);
-       CLKCTRL(am33xx_tptc2_hwmod, AM33XX_CM_PER_TPTC2_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_gfx_hwmod, AM33XX_CM_GFX_GFX_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_mpu_hwmod , AM33XX_CM_MPU_MPU_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_l3_instr_hwmod , AM33XX_CM_PER_L3_INSTR_CLKCTRL_OFFSET);
@@ -488,10 +410,6 @@ static void omap_hwmod_am43xx_clkctrl(void)
        CLKCTRL(am33xx_l4_ls_hwmod, AM43XX_CM_PER_L4LS_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_l4_wkup_hwmod, AM43XX_CM_WKUP_L4WKUP_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_l3_main_hwmod, AM43XX_CM_PER_L3_CLKCTRL_OFFSET);
-       CLKCTRL(am33xx_tpcc_hwmod, AM43XX_CM_PER_TPCC_CLKCTRL_OFFSET);
-       CLKCTRL(am33xx_tptc0_hwmod, AM43XX_CM_PER_TPTC0_CLKCTRL_OFFSET);
-       CLKCTRL(am33xx_tptc1_hwmod, AM43XX_CM_PER_TPTC1_CLKCTRL_OFFSET);
-       CLKCTRL(am33xx_tptc2_hwmod, AM43XX_CM_PER_TPTC2_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_gfx_hwmod, AM43XX_CM_GFX_GFX_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_mpu_hwmod , AM43XX_CM_MPU_MPU_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_l3_instr_hwmod , AM43XX_CM_PER_L3_INSTR_CLKCTRL_OFFSET);
diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
index 1c258616b9a92602c9b87051ecd3e4b25d416bde..c64b735c8accc39c10b7e8fe05aa2fa661776445 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
@@ -294,11 +294,7 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = {
        &am33xx_l4_wkup__timer1,
        &am33xx_l4_wkup__rtc,
        &am33xx_l4_ls__timer2,
-       &am33xx_l3_main__tpcc,
        &am33xx_l3_s__gpmc,
-       &am33xx_l3_main__tptc0,
-       &am33xx_l3_main__tptc1,
-       &am33xx_l3_main__tptc2,
        &am33xx_l3_main__ocmc,
        NULL,
 };
diff --git a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c
index 7fd4353632768b7a77bf79f83ff1f825277f6d23..d2203f44af88a66eeee66a6a3d51e9840e249098 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c
@@ -254,11 +254,7 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = {
        &am43xx_l4_wkup__smartreflex1,
        &am43xx_l4_wkup__timer1,
        &am33xx_l4_ls__timer2,
-       &am33xx_l3_main__tpcc,
        &am33xx_l3_s__gpmc,
-       &am33xx_l3_main__tptc0,
-       &am33xx_l3_main__tptc1,
-       &am33xx_l3_main__tptc2,
        &am33xx_l3_main__ocmc,
        &am43xx_l3_s__usbotgss0,
        &am43xx_l3_s__usbotgss1,
ep93xx device tree rework repo: git://git.maquefel.me/linux.git