Drop even more legacy platform data for omaps
Subsystems (5)
Tony Lindgren
maintainercover Drop even more legacy platform data for omaps
Hi all,
This series of changes remove even more legacy platform data and ti,hwmods devitree property for omap variants.
The patches are against v5.4-rc1 on top of the previous set:
[PATCH 00/21] Drop more legacy platform data for omaps
Please note that the earlier watchdog changes depend on the following patch:
[PATCH] bus: ti-sysc: Fix watchdog quirk handling
Regards,
Tony
Tony Lindgren (10):
ARM: OMAP2+: Drop legacy platform data for omap4 mcbsp
ARM: OMAP2+: Drop legacy platform data for omap5 mcbsp
ARM: OMAP2+: Drop legacy platform data for am4 hdq1w
ARM: OMAP2+: Drop legacy platform data for dra7 hdq1w
ARM: OMAP2+: Drop legacy platform data for omap4 hdq1w
ARM: OMAP2+: Drop legacy platform data for am3 and am4 rng
ARM: OMAP2+: Drop legacy platform data for dra7 rng
ARM: OMAP2+: Drop legacy platform data for am3 and am4 mcasp
ARM: OMAP2+: Drop legacy platform data for omap4 mcasp
ARM: OMAP2+: Drop legacy platform data for musb on omap4
arch/arm/boot/dts/am33xx-l4.dtsi | 3 - arch/arm/boot/dts/am437x-l4.dtsi | 4 - arch/arm/boot/dts/dra7-l4.dtsi | 2 - arch/arm/boot/dts/omap4-l4-abe.dtsi | 4 - arch/arm/boot/dts/omap4-l4.dtsi | 3 - arch/arm/boot/dts/omap5-l4-abe.dtsi | 3 - .../omap_hwmod_33xx_43xx_common_data.h | 4 - .../omap_hwmod_33xx_43xx_interconnect_data.c | 10 - .../omap_hwmod_33xx_43xx_ipblock_data.c | 74 ----- arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 1 - arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 37 --- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 302 ------------------ arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 113 ------- arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 79 ----- 14 files changed, 639 deletions(-)
Signature · 1 line
2.23.0
Tony Lindgren
maintainerPATCH 1/10 ARM: OMAP2+: Drop legacy platform data for omap4 mcbsp
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.
--- arch/arm/boot/dts/omap4-l4-abe.dtsi | 3 - arch/arm/boot/dts/omap4-l4.dtsi | 1 - arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 143 --------------------- 3 files changed, 147 deletions(-)
arch/arm/boot/dts/omap4-l4-abe.dtsi +0 -3
@@ -86,7 +86,6 @@ target-module@22000 { /* 0x40122000, ap 2 02.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "mcbsp1"; reg = <0x2208c 0x4>; reg-names = "sysc"; ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY |
@@ -120,7 +119,6 @@ target-module@24000 { /* 0x40124000, ap 4 04.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "mcbsp2"; reg = <0x2408c 0x4>; reg-names = "sysc"; ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY |
@@ -154,7 +152,6 @@ target-module@26000 { /* 0x40126000, ap 6 06.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "mcbsp3"; reg = <0x2608c 0x4>; reg-names = "sysc"; ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY |
arch/arm/boot/dts/omap4-l4.dtsi +0 -1
@@ -2013,7 +2013,6 @@ target-module@96000 { /* 0x48096000, ap 37 26.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "mcbsp4"; reg = <0x9608c 0x4>; reg-names = "sysc"; ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY |
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +0 -143
161 lines not on this page · raw message
Signature · 1 line
2.23.0
Tony Lindgren
maintainerPATCH 2/10 ARM: OMAP2+: Drop legacy platform data for omap5 mcbsp
In reply to Tony LindgrenWe 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.
--- arch/arm/boot/dts/omap5-l4-abe.dtsi | 3 - arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 113 --------------------- 2 files changed, 116 deletions(-)
arch/arm/boot/dts/omap5-l4-abe.dtsi +0 -3
@@ -86,7 +86,6 @@ target-module@22000 { /* 0x40122000, ap 2 02.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "mcbsp1"; reg = <0x2208c 0x4>; reg-names = "sysc"; ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY |
@@ -120,7 +119,6 @@ target-module@24000 { /* 0x40124000, ap 4 04.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "mcbsp2"; reg = <0x2408c 0x4>; reg-names = "sysc"; ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY |
@@ -154,7 +152,6 @@ target-module@26000 { /* 0x40126000, ap 6 06.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "mcbsp3"; reg = <0x2608c 0x4>; reg-names = "sysc"; ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY |
arch/arm/mach-omap2/omap_hwmod_54xx_data.c +0 -113
131 lines not on this page · raw message
Signature · 1 line
2.23.0
Tony Lindgren
maintainerPATCH 3/10 ARM: OMAP2+: Drop legacy platform data for am4 hdq1w
In reply to Tony LindgrenWe 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.
--- arch/arm/boot/dts/am437x-l4.dtsi | 1 - arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 36 ---------------------- 2 files changed, 37 deletions(-)
arch/arm/boot/dts/am437x-l4.dtsi +0 -1
@@ -2277,7 +2277,6 @@ target-module@47000 { /* 0x48347000, ap 110 70.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "hdq1w"; reg = <0x47000 0x4>, <0x47014 0x4>, <0x47018 0x4>;
arch/arm/mach-omap2/omap_hwmod_43xx_data.c +0 -36
@@ -18,8 +18,6 @@#include "omap_hwmod_33xx_43xx_common_data.h" #include "prcm43xx.h" #include "omap_hwmod_common_data.h" -#include "hdq1w.h" -/* IP blocks */ static struct omap_hwmod am43xx_emif_hwmod = {
@@ -468,32 +466,6 @@ static struct omap_hwmod am43xx_dss_rfbi_hwmod = { .parent_hwmod = &am43xx_dss_core_hwmod, }; -/* HDQ1W */ -static struct omap_hwmod_class_sysconfig am43xx_hdq1w_sysc = { - .rev_offs =0x0000 , - .sysc_offs =0x0014 , - .syss_offs =0x0018 , - .sysc_flags = (SYSC_HAS_SOFTRESET |SYSC_HAS_AUTOIDLE ), - .sysc_fields = &omap_hwmod_sysc_type1, -}; - -static struct omap_hwmod_class am43xx_hdq1w_hwmod_class = { - .name ="hdq1w" , - .sysc = &am43xx_hdq1w_sysc, - .reset = &omap_hdq1w_reset, -}; - -static struct omap_hwmod am43xx_hdq1w_hwmod = { - .name ="hdq1w" , - .class = &am43xx_hdq1w_hwmod_class, - .clkdm_name ="l4ls_clkdm" , - .prcm = { - .omap4 = { - .clkctrl_offs =AM43XX_CM_PER_HDQ1W_CLKCTRL_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -};static struct omap_hwmod_class_sysconfig am43xx_vpfe_sysc = { .rev_offs =0x0 ,
@@ -744,13 +716,6 @@ static struct omap_hwmod_ocp_if am43xx_l4_ls__dss_rfbi = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -static struct omap_hwmod_ocp_if am43xx_l4_ls__hdq1w = { - .master = &am33xx_l4_ls_hwmod, - .slave = &am43xx_hdq1w_hwmod, - .clk ="l4ls_gclk" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; -static struct omap_hwmod_ocp_if am43xx_l3__vpfe0 = { .master = &am43xx_vpfe0_hwmod, .slave = &am33xx_l3_main_hwmod,
@@ -854,7 +819,6 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = { &am43xx_l4_ls__dss, &am43xx_l4_ls__dss_dispc, &am43xx_l4_ls__dss_rfbi, - &am43xx_l4_ls__hdq1w, &am43xx_l3__vpfe0, &am43xx_l3__vpfe1, &am43xx_l4_ls__vpfe0,
Signature · 1 line
2.23.0
Tony Lindgren
maintainerPATCH 4/10 ARM: OMAP2+: Drop legacy platform data for dra7 hdq1w
In reply to Tony LindgrenWe 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.
--- arch/arm/boot/dts/dra7-l4.dtsi | 1 - arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 43 ----------------------- 2 files changed, 44 deletions(-)
arch/arm/boot/dts/dra7-l4.dtsi +0 -1
@@ -2089,7 +2089,6 @@ target-module@b2000 { /* 0x480b2000, ap 37 52.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "hdq1w"; reg = <0xb2000 0x4>, <0xb2014 0x4>, <0xb2018 0x4>;
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +0 -43
62 lines not on this page · raw message
Signature · 1 line
2.23.0
Tony Lindgren
maintainerPATCH 5/10 ARM: OMAP2+: Drop legacy platform data for omap4 hdq1w
In reply to Tony LindgrenWe 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.
--- arch/arm/boot/dts/omap4-l4.dtsi | 1 - arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 43 ---------------------- 2 files changed, 44 deletions(-)
arch/arm/boot/dts/omap4-l4.dtsi +0 -1
@@ -2222,7 +2222,6 @@ target-module@b2000 { /* 0x480b2000, ap 65 3c.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "hdq1w"; reg = <0xb2000 0x4>, <0xb2014 0x4>, <0xb2018 0x4>;
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +0 -43
61 lines not on this page · raw message
Signature · 1 line
2.23.0
Tony Lindgren
maintainerPATCH 6/10 ARM: OMAP2+: Drop legacy platform data for am3 and am4 rng
In reply to Tony LindgrenWe 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.
--- arch/arm/boot/dts/am33xx-l4.dtsi | 1 - arch/arm/boot/dts/am437x-l4.dtsi | 1 - .../omap_hwmod_33xx_43xx_common_data.h | 2 -- .../omap_hwmod_33xx_43xx_interconnect_data.c | 8 ----- .../omap_hwmod_33xx_43xx_ipblock_data.c | 29 ------------------- arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 1 - arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 1 - 7 files changed, 43 deletions(-)
arch/arm/boot/dts/am33xx-l4.dtsi +0 -1
@@ -2044,7 +2044,6 @@ target-module@10000 { /* 0x48310000, ap 76 4e.1 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "rng"; reg = <0x11fe0 0x4>, <0x11fe4 0x4>; reg-names = "rev", "sysc";
arch/arm/boot/dts/am437x-l4.dtsi +0 -1
@@ -1982,7 +1982,6 @@ target-module@10000 { /* 0x48310000, ap 64 4e.1 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "rng"; reg = <0x11fe0 0x4>, <0x11fe4 0x4>; reg-names = "rev", "sysc";
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h +0 -2
@@ -53,7 +53,6 @@ extern struct omap_hwmod_ocp_if am33xx_l3_main__tptc2;extern struct omap_hwmod_ocp_if am33xx_l3_main__ocmc;extern struct omap_hwmod_ocp_if am33xx_l3_main__sha0;extern struct omap_hwmod_ocp_if am33xx_l3_main__aes0; -extern struct omap_hwmod_ocp_if am33xx_l4_per__rng;extern struct omap_hwmod am33xx_l3_main_hwmod;extern struct omap_hwmod am33xx_l3_s_hwmod;
@@ -66,7 +65,6 @@ extern struct omap_hwmod am33xx_gfx_hwmod;extern struct omap_hwmod am33xx_prcm_hwmod;extern struct omap_hwmod am33xx_aes0_hwmod;extern struct omap_hwmod am33xx_sha0_hwmod; -extern struct omap_hwmod am33xx_rng_hwmod;extern struct omap_hwmod am33xx_ocmcram_hwmod;extern struct omap_hwmod am33xx_smartreflex0_hwmod;extern struct omap_hwmod am33xx_smartreflex1_hwmod;
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c +0 -8
@@ -300,11 +300,3 @@ struct omap_hwmod_ocp_if am33xx_l3_main__aes0 = { .clk = "aes0_fck", .user = OCP_USER_MPU | OCP_USER_SDMA, }; - -/* l4 per -> rng */ -struct omap_hwmod_ocp_if am33xx_l4_per__rng = { - .master = &am33xx_l4_ls_hwmod, - .slave = &am33xx_rng_hwmod, - .clk ="rng_fck" , - .user =OCP_USER_MPU , -};
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c +0 -29
@@ -265,33 +265,6 @@ struct omap_hwmod am33xx_sha0_hwmod = { }, }; -/* rng */ -static struct omap_hwmod_class_sysconfig am33xx_rng_sysc = { - .rev_offs =0x1fe0 , - .sysc_offs =0x1fe4 , - .sysc_flags =SYSC_HAS_AUTOIDLE |SYSC_HAS_SIDLEMODE , - .idlemodes =SIDLE_FORCE |SIDLE_NO , - .sysc_fields = &omap_hwmod_sysc_type1, -}; - -static struct omap_hwmod_class am33xx_rng_hwmod_class = { - .name ="rng" , - .sysc = &am33xx_rng_sysc, -}; - -struct omap_hwmod am33xx_rng_hwmod = { - .name ="rng" , - .class = &am33xx_rng_hwmod_class, - .clkdm_name ="l4ls_clkdm" , - .flags =HWMOD_SWSUP_SIDLE , - .main_clk ="rng_fck" , - .prcm = { - .omap4 = { - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; -/* ocmcram */ static struct omap_hwmod_class am33xx_ocmcram_hwmod_class = { .name ="ocmcram" ,
@@ -879,7 +852,6 @@ static void omap_hwmod_am33xx_clkctrl(void)CLKCTRL (am33xx_ocmcram_hwmod ,AM33XX_CM_PER_OCMCRAM_CLKCTRL_OFFSET );CLKCTRL (am33xx_sha0_hwmod ,AM33XX_CM_PER_SHA0_CLKCTRL_OFFSET );CLKCTRL (am33xx_aes0_hwmod ,AM33XX_CM_PER_AES0_CLKCTRL_OFFSET ); -CLKCTRL (am33xx_rng_hwmod,AM33XX_CM_PER_RNG_CLKCTRL_OFFSET ); }static void omap_hwmod_am33xx_rst (void )
@@ -935,7 +907,6 @@ static void omap_hwmod_am43xx_clkctrl(void)CLKCTRL (am33xx_ocmcram_hwmod ,AM43XX_CM_PER_OCMCRAM_CLKCTRL_OFFSET );CLKCTRL (am33xx_sha0_hwmod ,AM43XX_CM_PER_SHA0_CLKCTRL_OFFSET );CLKCTRL (am33xx_aes0_hwmod ,AM43XX_CM_PER_AES0_CLKCTRL_OFFSET ); -CLKCTRL (am33xx_rng_hwmod,AM43XX_CM_PER_RNG_CLKCTRL_OFFSET ); }static void omap_hwmod_am43xx_rst (void )
arch/arm/mach-omap2/omap_hwmod_33xx_data.c +0 -1
@@ -447,7 +447,6 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = { &am33xx_l3_s__usbss, &am33xx_l3_main__sha0, &am33xx_l3_main__aes0, - &am33xx_l4_per__rng, NULL, };
arch/arm/mach-omap2/omap_hwmod_43xx_data.c +0 -1
@@ -786,7 +786,6 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = { &am43xx_l3_s__qspi, &am33xx_l4_per__dcan0, &am33xx_l4_per__dcan1, - &am33xx_l4_per__rng, &am33xx_l4_ls__mcasp0, &am33xx_l4_ls__mcasp1, &am33xx_l4_ls__timer2,
Signature · 1 line
2.23.0
Tony Lindgren
maintainerPATCH 7/10 ARM: OMAP2+: Drop legacy platform data for dra7 rng
In reply to Tony Lindgren--- arch/arm/boot/dts/dra7-l4.dtsi | 1 - arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 36 ----------------------- 2 files changed, 37 deletions(-)
arch/arm/boot/dts/dra7-l4.dtsi +0 -1
@@ -1898,7 +1898,6 @@ target-module@90000 { /* 0x48090000, ap 55 12.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "rng"; reg = <0x91fe0 0x4>, <0x91fe4 0x4>; reg-names = "rev", "sysc";
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +0 -36
@@ -1432,34 +1432,6 @@ static struct omap_hwmod dra7xx_des_hwmod = { }, }; -/* rng */ -static struct omap_hwmod_class_sysconfig dra7xx_rng_sysc = { - .rev_offs =0x1fe0 , - .sysc_offs =0x1fe4 , - .sysc_flags =SYSC_HAS_AUTOIDLE |SYSC_HAS_SIDLEMODE , - .idlemodes =SIDLE_FORCE |SIDLE_NO , - .sysc_fields = &omap_hwmod_sysc_type1, -}; - -static struct omap_hwmod_class dra7xx_rng_hwmod_class = { - .name ="rng" , - .sysc = &dra7xx_rng_sysc, -}; - -static struct omap_hwmod dra7xx_rng_hwmod = { - .name ="rng" , - .class = &dra7xx_rng_hwmod_class, - .flags =HWMOD_SWSUP_SIDLE , - .clkdm_name ="l4sec_clkdm" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_L4SEC_RNG_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_L4SEC_RNG_CONTEXT_OFFSET , - .modulemode =MODULEMODE_HWCTRL , - }, - }, -}; -/* * 'usb_otg_ss' class *
@@ -2070,13 +2042,6 @@ static struct omap_hwmod_ocp_if dra7xx_l4_per1__des = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -/* l4_per1 -> rng */ -static struct omap_hwmod_ocp_if dra7xx_l4_per1__rng = { - .master = &dra7xx_l4_per1_hwmod, - .slave = &dra7xx_rng_hwmod, - .user =OCP_USER_MPU , -}; -/* l4_per3 -> usb_otg_ss1 */ static struct omap_hwmod_ocp_if dra7xx_l4_per3__usb_otg_ss1 = { .master = &dra7xx_l4_per3_hwmod,
@@ -2239,7 +2204,6 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {/* GP-only hwmod links */ static struct omap_hwmod_ocp_if *dra7xx_gp_hwmod_ocp_ifs[]__initdata = { &dra7xx_l4_wkup__timer12, - &dra7xx_l4_per1__rng,NULL , };
Signature · 1 line
2.23.0
Tony Lindgren
maintainerRe: [PATCH 07/10] ARM: OMAP2+: Drop legacy platform data for dra7 rng
Quoted 9 lines · Tony Lindgren
--- arch/arm/boot/dts/dra7-l4.dtsi | 1 - arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 36 ----------------------- 2 files changed, 37 deletions(-)
arch/arm/boot/dts/dra7-l4.dtsi line 1903
Quoted 7 lines
arch/arm/boot/dts/dra7-l4.dtsi +0
-1@@ -1898,7 +1898,6 @@ target-module@90000 { /* 0x48090000, ap 55 12.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "rng"; reg = <0x91fe0 0x4>, <0x91fe4 0x4>; reg-names = "rev", "sysc";
Looks like I missed the patch description on this patch, updated patch below with description and Signed-off-by added.
Regards,
Tony
8< ------------------
From tony Mon Sep 17 00:00:00 2001
From: Tony Lindgren <[email protected]>
Date: Mon, 21 Oct 2019 14:16:40 -0700
Subject: [PATCH] ARM: OMAP2+: Drop legacy platform data for dra7 rng
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.
--- arch/arm/boot/dts/dra7-l4.dtsi | 1 - arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 36 ----------------------- 2 files changed, 37 deletions(-)
arch/arm/boot/dts/dra7-l4.dtsi +0 -1
@@ -1898,7 +1898,6 @@ target-module@90000 { /* 0x48090000, ap 55 12.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "rng"; reg = <0x91fe0 0x4>, <0x91fe4 0x4>; reg-names = "rev", "sysc";
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +0 -36
@@ -1432,34 +1432,6 @@ static struct omap_hwmod dra7xx_des_hwmod = { }, }; -/* rng */ -static struct omap_hwmod_class_sysconfig dra7xx_rng_sysc = { - .rev_offs =0x1fe0 , - .sysc_offs =0x1fe4 , - .sysc_flags =SYSC_HAS_AUTOIDLE |SYSC_HAS_SIDLEMODE , - .idlemodes =SIDLE_FORCE |SIDLE_NO , - .sysc_fields = &omap_hwmod_sysc_type1, -}; - -static struct omap_hwmod_class dra7xx_rng_hwmod_class = { - .name ="rng" , - .sysc = &dra7xx_rng_sysc, -}; - -static struct omap_hwmod dra7xx_rng_hwmod = { - .name ="rng" , - .class = &dra7xx_rng_hwmod_class, - .flags =HWMOD_SWSUP_SIDLE , - .clkdm_name ="l4sec_clkdm" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_L4SEC_RNG_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_L4SEC_RNG_CONTEXT_OFFSET , - .modulemode =MODULEMODE_HWCTRL , - }, - }, -}; -/* * 'usb_otg_ss' class *
@@ -2070,13 +2042,6 @@ static struct omap_hwmod_ocp_if dra7xx_l4_per1__des = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -/* l4_per1 -> rng */ -static struct omap_hwmod_ocp_if dra7xx_l4_per1__rng = { - .master = &dra7xx_l4_per1_hwmod, - .slave = &dra7xx_rng_hwmod, - .user =OCP_USER_MPU , -}; -/* l4_per3 -> usb_otg_ss1 */ static struct omap_hwmod_ocp_if dra7xx_l4_per3__usb_otg_ss1 = { .master = &dra7xx_l4_per3_hwmod,
@@ -2239,7 +2204,6 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {/* GP-only hwmod links */ static struct omap_hwmod_ocp_if *dra7xx_gp_hwmod_ocp_ifs[]__initdata = { &dra7xx_l4_wkup__timer12, - &dra7xx_l4_per1__rng,NULL , };
Signature · 1 line
2.23.0
Tony Lindgren
maintainerPATCH 8/10 ARM: OMAP2+: Drop legacy platform data for am3 and am4 mcasp
In reply to Tony LindgrenWe 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.
--- arch/arm/boot/dts/am33xx-l4.dtsi | 2 - arch/arm/boot/dts/am437x-l4.dtsi | 2 - .../omap_hwmod_33xx_43xx_common_data.h | 2 - .../omap_hwmod_33xx_43xx_interconnect_data.c | 2 - .../omap_hwmod_33xx_43xx_ipblock_data.c | 45 ------------------- 5 files changed, 53 deletions(-)
arch/arm/boot/dts/am33xx-l4.dtsi +0 -2
@@ -1039,7 +1039,6 @@ target-module@38000 { /* 0x48038000, ap 16 02.0 */ compatible = "ti,sysc-omap4-simple", "ti,sysc"; - ti,hwmods = "mcasp0"; reg = <0x38000 0x4>, <0x38004 0x4>; reg-names = "rev", "sysc";
@@ -1070,7 +1069,6 @@ target-module@3c000 { /* 0x4803c000, ap 20 32.0 */ compatible = "ti,sysc-omap4-simple", "ti,sysc"; - ti,hwmods = "mcasp1"; reg = <0x3c000 0x4>, <0x3c004 0x4>; reg-names = "rev", "sysc";
arch/arm/boot/dts/am437x-l4.dtsi +0 -2
@@ -810,7 +810,6 @@ target-module@38000 { /* 0x48038000, ap 14 04.0 */ compatible = "ti,sysc-omap4-simple", "ti,sysc"; - ti,hwmods = "mcasp0"; reg = <0x38000 0x4>, <0x38004 0x4>; reg-names = "rev", "sysc";
@@ -842,7 +841,6 @@ target-module@3c000 { /* 0x4803c000, ap 16 2a.0 */ compatible = "ti,sysc-omap4-simple", "ti,sysc"; - ti,hwmods = "mcasp1"; reg = <0x3c000 0x4>, <0x3c004 0x4>; reg-names = "rev", "sysc";
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h +0 -2
@@ -75,8 +75,6 @@ extern struct omap_hwmod am33xx_epwmss0_hwmod;extern struct omap_hwmod am33xx_epwmss1_hwmod;extern struct omap_hwmod am33xx_epwmss2_hwmod;extern struct omap_hwmod am33xx_gpmc_hwmod; -extern struct omap_hwmod am33xx_mcasp0_hwmod; -extern struct omap_hwmod am33xx_mcasp1_hwmod;extern struct omap_hwmod am33xx_rtc_hwmod;extern struct omap_hwmod am33xx_spi0_hwmod;extern struct omap_hwmod am33xx_spi1_hwmod;
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c +0 -2
@@ -169,7 +169,6 @@ struct omap_hwmod_ocp_if am33xx_l4_ls__spinlock = {/* l4 ls -> mcasp0 */ struct omap_hwmod_ocp_if am33xx_l4_ls__mcasp0 = { .master = &am33xx_l4_ls_hwmod, - .slave = &am33xx_mcasp0_hwmod, .clk ="l4ls_gclk" , .user =OCP_USER_MPU , };
@@ -177,7 +176,6 @@ struct omap_hwmod_ocp_if am33xx_l4_ls__mcasp0 = {/* l4 ls -> mcasp1 */ struct omap_hwmod_ocp_if am33xx_l4_ls__mcasp1 = { .master = &am33xx_l4_ls_hwmod, - .slave = &am33xx_mcasp1_hwmod, .clk ="l4ls_gclk" , .user =OCP_USER_MPU , };
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c +0 -45
63 lines not on this page · raw message
Signature · 1 line
2.23.0
Tony Lindgren
maintainerRe: [PATCH 08/10] ARM: OMAP2+: Drop legacy platform data for am3 and am4 mcasp
Quoted 7 lines · Tony Lindgren
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.
Sorry this one left behind some empty platform data causing an on bbb. Updated patch below.
Regards,
Tony
8< ---------------------
From tony Mon Sep 17 00:00:00 2001
From: Tony Lindgren <[email protected]>
Date: Thu, 17 Oct 2019 13:26:56 -0700
Subject: [PATCHv2] ARM: OMAP2+: Drop legacy platform data for am3 and am4
mcasp
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.
--- arch/arm/boot/dts/am33xx-l4.dtsi | 2 - arch/arm/boot/dts/am437x-l4.dtsi | 2 - .../omap_hwmod_33xx_43xx_common_data.h | 4 -- .../omap_hwmod_33xx_43xx_interconnect_data.c | 16 ------- .../omap_hwmod_33xx_43xx_ipblock_data.c | 45 ------------------- arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 - arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 2 - 7 files changed, 73 deletions(-)
arch/arm/boot/dts/am33xx-l4.dtsi +0 -2
@@ -1039,7 +1039,6 @@ target-module@38000 { /* 0x48038000, ap 16 02.0 */ compatible = "ti,sysc-omap4-simple", "ti,sysc"; - ti,hwmods = "mcasp0"; reg = <0x38000 0x4>, <0x38004 0x4>; reg-names = "rev", "sysc";
@@ -1070,7 +1069,6 @@ target-module@3c000 { /* 0x4803c000, ap 20 32.0 */ compatible = "ti,sysc-omap4-simple", "ti,sysc"; - ti,hwmods = "mcasp1"; reg = <0x3c000 0x4>, <0x3c004 0x4>; reg-names = "rev", "sysc";
arch/arm/boot/dts/am437x-l4.dtsi +0 -2
@@ -810,7 +810,6 @@ target-module@38000 { /* 0x48038000, ap 14 04.0 */ compatible = "ti,sysc-omap4-simple", "ti,sysc"; - ti,hwmods = "mcasp0"; reg = <0x38000 0x4>, <0x38004 0x4>; reg-names = "rev", "sysc";
@@ -842,7 +841,6 @@ target-module@3c000 { /* 0x4803c000, ap 16 2a.0 */ compatible = "ti,sysc-omap4-simple", "ti,sysc"; - ti,hwmods = "mcasp1"; reg = <0x3c000 0x4>, <0x3c004 0x4>; reg-names = "rev", "sysc";
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h +0 -4
@@ -36,8 +36,6 @@ extern struct omap_hwmod_ocp_if am33xx_l4_ls__epwmss1;extern struct omap_hwmod_ocp_if am33xx_l4_ls__epwmss2;extern struct omap_hwmod_ocp_if am33xx_l3_s__gpmc;extern struct omap_hwmod_ocp_if am33xx_l4_ls__spinlock; -extern struct omap_hwmod_ocp_if am33xx_l4_ls__mcasp0; -extern struct omap_hwmod_ocp_if am33xx_l4_ls__mcasp1;extern struct omap_hwmod_ocp_if am33xx_l4_ls__mcspi0;extern struct omap_hwmod_ocp_if am33xx_l4_ls__mcspi1;extern struct omap_hwmod_ocp_if am33xx_l4_ls__timer2;
@@ -75,8 +73,6 @@ extern struct omap_hwmod am33xx_epwmss0_hwmod;extern struct omap_hwmod am33xx_epwmss1_hwmod;extern struct omap_hwmod am33xx_epwmss2_hwmod;extern struct omap_hwmod am33xx_gpmc_hwmod; -extern struct omap_hwmod am33xx_mcasp0_hwmod; -extern struct omap_hwmod am33xx_mcasp1_hwmod;extern struct omap_hwmod am33xx_rtc_hwmod;extern struct omap_hwmod am33xx_spi0_hwmod;extern struct omap_hwmod am33xx_spi1_hwmod;
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c +0 -16
@@ -166,22 +166,6 @@ struct omap_hwmod_ocp_if am33xx_l4_ls__spinlock = { .user = OCP_USER_MPU, }; -/* l4 ls -> mcasp0 */ -struct omap_hwmod_ocp_if am33xx_l4_ls__mcasp0 = { - .master = &am33xx_l4_ls_hwmod, - .slave = &am33xx_mcasp0_hwmod, - .clk ="l4ls_gclk" , - .user =OCP_USER_MPU , -}; - -/* l4 ls -> mcasp1 */ -struct omap_hwmod_ocp_if am33xx_l4_ls__mcasp1 = { - .master = &am33xx_l4_ls_hwmod, - .slave = &am33xx_mcasp1_hwmod, - .clk ="l4ls_gclk" , - .user =OCP_USER_MPU , -}; -/* l4 ls -> mcspi0 */ struct omap_hwmod_ocp_if am33xx_l4_ls__mcspi0 = { .master = &am33xx_l4_ls_hwmod,
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c +0 -45
63 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_33xx_data.c +0 -2
@@ -422,8 +422,6 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = { &am33xx_l4_hs__pruss, &am33xx_l4_per__dcan0, &am33xx_l4_per__dcan1, - &am33xx_l4_ls__mcasp0, - &am33xx_l4_ls__mcasp1, &am33xx_l4_ls__timer2, &am33xx_l4_ls__timer3, &am33xx_l4_ls__timer4,
arch/arm/mach-omap2/omap_hwmod_43xx_data.c +0 -2
@@ -786,8 +786,6 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = { &am43xx_l3_s__qspi, &am33xx_l4_per__dcan0, &am33xx_l4_per__dcan1, - &am33xx_l4_ls__mcasp0, - &am33xx_l4_ls__mcasp1, &am33xx_l4_ls__timer2, &am33xx_l4_ls__timer3, &am33xx_l4_ls__timer4,
Signature · 1 line
2.23.0
Tony Lindgren
maintainerPATCH 9/10 ARM: OMAP2+: Drop legacy platform data for omap4 mcasp
In reply to Tony LindgrenWe 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.
--- arch/arm/boot/dts/omap4-l4-abe.dtsi | 1 - arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 53 ---------------------- 2 files changed, 54 deletions(-)
arch/arm/boot/dts/omap4-l4-abe.dtsi +0 -1
@@ -185,7 +185,6 @@ target-module@28000 { /* 0x40128000, ap 8 08.0 */ compatible = "ti,sysc-mcasp", "ti,sysc"; - ti,hwmods = "mcasp"; reg = <0x28000 0x4>, <0x28004 0x4>; reg-names = "rev", "sysc";
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +0 -53
71 lines not on this page · raw message
Signature · 1 line
2.23.0
Tony Lindgren
maintainerPATCH 10/10 ARM: OMAP2+: Drop legacy platform data for musb on omap4
In reply to Tony LindgrenWe 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.
--- arch/arm/boot/dts/omap4-l4.dtsi | 1 - arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 63 ---------------------- 2 files changed, 64 deletions(-)
arch/arm/boot/dts/omap4-l4.dtsi +0 -1
@@ -381,7 +381,6 @@ target-module@2b000 { /* 0x4a0ab000, ap 84 12.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "usb_otg_hs"; reg = <0x2b400 0x4>, <0x2b404 0x4>, <0x2b408 0x4>;
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +0 -63
93 lines not on this page · raw message
Signature · 1 line
2.23.0
Tony Lindgren
maintainerRe: [PATCH 10/10] ARM: OMAP2+: Drop legacy platform data for musb on omap4
Quoted 7 lines · Tony Lindgren
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.
Turns out the ti-sysc driver is still missing swsup quirk handling, so this patch has a dependency to:
[PATCH] bus: ti-sysc: Handle mstandby quirk and use it for musb
Regards,
Tony