Update am437x to boot with simple-pm-bus and genpd
Subsystems (8)
Tony Lindgren
maintainercover Update am437x to boot with simple-pm-bus and genpd
Hi all,
Similar to the earlier am335x changes, here are the changes done to boot am437x using simple-pm-bus and genpd.
These patches are based on v5.10-rc1 and the following patches:
PATCH 2/4] ARM: OMAP2+: Fix missing select PM_GENERIC_DOMAINS_OF [PATCHv2 0/9] Genpd related code changes to drop am335x pdata [PATCH 00/18] Drop remaining pdata for am335x and use genpd
To make testing things easier, I've pushed out these changes also to a temporary test branch at [0][1] below.
Regards,
Tony
[0] git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-for-v5.11/tmp-testing-genpd
[1] https://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git/log/?h=omap-for-v5.11/tmp-testing-genpd
Tero Kristo (2):
soc: ti: omap-prm: am4: add genpd support for remaining PRM instances
ARM: dts: am43xx: add remaining PRM instances
Tony Lindgren (15):
clk: ti: am437x: Keep am4 l3 main clock always on for genpd
ARM: dts: Configure also interconnect clocks for am4 system timer
ARM: OMAP2+: Drop legacy platform data for am4 control module
ARM: dts: Configure RTC powerdomain for am4
ARM: dts: Configure interconnect target module for am4 wkup_m3
ARM: OMAP2+: Drop legacy platform data for am4 wkup_m3
ARM: OMAP2+: Drop legacy platform data for am4 emif
ARM: OMAP2+: Drop legacy platform data for am4 ocmcram
ARM: OMAP2+: Drop legacy platform data for am4 mpuss
ARM: dts: Use simple-pm-bus for genpd for am4 l4_wkup
ARM: dts: Use simple-pm-bus for genpd for am4 l4_fast
ARM: dts: Use simple-pm-bus for genpd for am4 l4_per
ARM: dts: Move am4 l3 noc to a separate node
ARM: dts: Use simple-pm-bus for genpd for am4 l3
ARM: OMAP2+: Drop legacy remaining legacy platform data for am4
arch/arm/boot/dts/am4372.dtsi | 124 ++++++--- arch/arm/boot/dts/am437x-l4.dtsi | 79 ++++-- arch/arm/mach-omap2/Kconfig | 1 - arch/arm/mach-omap2/Makefile | 5 +- arch/arm/mach-omap2/io.c | 1 - .../omap_hwmod_33xx_43xx_common_data.h | 55 ---- .../omap_hwmod_33xx_43xx_interconnect_data.c | 82 ------ .../omap_hwmod_33xx_43xx_ipblock_data.c | 254 ------------------ arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 166 ------------ drivers/clk/ti/clk-43xx.c | 8 + drivers/soc/ti/omap_prm.c | 36 ++- 11 files changed, 184 insertions(+), 627 deletions(-) delete mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h delete mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c delete mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c delete mode 100644 arch/arm/mach-omap2/omap_hwmod_43xx_data.c
Signature · 1 line
2.29.2
Tony Lindgren
maintainerPATCH 1/17 clk: ti: am437x: Keep am4 l3 main clock always on for genpd
In order for suspend and resume to work with genpd on am4, we must keep l3 main clock always on. Otherwise prm_omap driver will shut down the l3 main clock on suspend when simple-pm-bus and GENPD_FLAG_PM_CLK are used. Note that we already keep the l3 main clock always on with the legacy platform code.
Later on we may want to start managing the l3 main clock with a dedicated interconnect driver instead of using simple-pm-bus and GENPD_FLAG_PM_CLK.
--- drivers/clk/ti/clk-43xx.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/clk/ti/clk-43xx.c +8 -0
@@ -272,6 +272,11 @@ static struct ti_dt_clk am43xx_clks[] = { { .node_name = NULL }, }; +static const char *enable_init_clks[] = { +/* AM4_L3_L3_MAIN_CLKCTRL, needed during suspend */ +"l3-clkctrl:0000:0" , +}; +int __init am43xx_dt_clk_init (void ) {struct clk *clk1, *clk2;
@@ -283,6 +288,9 @@ int __init am43xx_dt_clk_init(void)omap2_clk_disable_autoidle_all (); +omap2_clk_enable_init_clocks (enable_init_clks, +ARRAY_SIZE (enable_init_clks)); +ti_clk_add_aliases ();/*
Signature · 1 line
2.29.2
Re: [PATCH 01/17] clk: ti: am437x: Keep am4 l3 main clock always on for genpd
Quoting Tony Lindgren (2020-11-16 03:19:23)
Quoted 9 lines
In order for suspend and resume to work with genpd on am4, we must keep l3 main clock always on. Otherwise
prm_omapdriver will shut down the l3 main clock on suspend when simple-pm-bus andGENPD_FLAG_PM_CLKare used. Note that we already keep the l3 main clock always on with the legacy platform code.Later on we may want to start managing the l3 main clock with a dedicated interconnect driver instead of using simple-pm-bus and
GENPD_FLAG_PM_CLK.
Quoted 6 lines
Cc Michael Turquette <[email protected]>Cc Stephen Boyd <[email protected]>Cc Tero Kristo <[email protected]>Signed-off-by Tony Lindgren <[email protected]>---
Tony Lindgren
maintainerPATCH 2/17 soc: ti: omap-prm: am4: add genpd support for remaining PRM instances
In reply to Tony LindgrenFrom: Tero Kristo <[email protected]>
Add genpd support for mpu, rtc, tamper, cefuse, per and wkup instances.
--- drivers/soc/ti/omap_prm.c | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-)
drivers/soc/ti/omap_prm.c +33 -3
@@ -243,14 +243,44 @@ static const struct omap_rst_map am4_device_rst_map[] = { };static const struct omap_prm_data am4_prm_data[] = { + { + .name ="mpu" , .base =0x44df0300 , + .pwrstctrl =0x0 , .pwrstst =0x4 , .dmap = &omap_prm_noinact, + }, { .name ="gfx" , .base =0x44df0400 , .pwrstctrl =0 , .pwrstst =0x4 , .dmap = &omap_prm_onoff_noauto, .rstctrl =0x10 , .rstst =0x14 , .rstmap = rst_map_0, .clkdm_name ="gfx_l3" , }, - { .name ="per" , .base =0x44df0800 , .rstctrl =0x10 , .rstst =0x14 , .rstmap = am4_per_rst_map, .clkdm_name ="pruss_ocp" }, - { .name ="wkup" , .base =0x44df2000 , .rstctrl =0x10 , .rstst =0x14 , .rstmap = am3_wkup_rst_map, .flags =OMAP_PRM_HAS_NO_CLKDM }, - { .name ="device" , .base =0x44df4000 , .rstctrl =0x0 , .rstst =0x4 , .rstmap = am4_device_rst_map, .flags =OMAP_PRM_HAS_RSTCTRL |OMAP_PRM_HAS_NO_CLKDM }, + { + .name ="rtc" , .base =0x44df0500 , + .pwrstctrl =0x0 , .pwrstst =0x4 , .dmap = &omap_prm_alwon, + }, + { + .name ="tamper" , .base =0x44df0600 , + .pwrstctrl =0x0 , .pwrstst =0x4 , .dmap = &omap_prm_alwon, + }, + { + .name ="cefuse" , .base =0x44df0700 , + .pwrstctrl =0x0 , .pwrstst =0x4 , .dmap = &omap_prm_onoff_noauto, + }, + { + .name ="per" , .base =0x44df0800 , + .pwrstctrl =0x0 , .pwrstst =0x4 , .dmap = &omap_prm_noinact, + .rstctrl =0x10 , .rstst =0x14 , .rstmap = am4_per_rst_map, + .clkdm_name ="pruss_ocp" + }, + { + .name ="wkup" , .base =0x44df2000 , + .pwrstctrl =0x0 , .pwrstst =0x4 , .dmap = &omap_prm_alwon, + .rstctrl =0x10 , .rstst =0x14 , .rstmap = am3_wkup_rst_map, + .flags =OMAP_PRM_HAS_NO_CLKDM + }, + { + .name ="device" , .base =0x44df4000 , + .rstctrl =0x0 , .rstst =0x4 , .rstmap = am4_device_rst_map, + .flags =OMAP_PRM_HAS_RSTCTRL |OMAP_PRM_HAS_NO_CLKDM + }, { }, };
Signature · 1 line
2.29.2
Tony Lindgren
maintainerPATCH 3/17 ARM: dts: am43xx: add remaining PRM instances
In reply to Tony LindgrenFrom: Tero Kristo <[email protected]>
Add remaining PRM instances for the am43xx SoC. Additionally enable the genpd support for them.
--- arch/arm/boot/dts/am4372.dtsi | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
arch/arm/boot/dts/am4372.dtsi +26 -0
@@ -548,6 +548,12 @@ target-module@56000000 { #include "am43xx-clocks.dtsi" &prcm { + prm_mpu: prm@300 { + compatible = "ti,am4-prm-inst", "ti,omap-prm-inst"; + reg = <0x300 0x100>; + #power-domain-cells = <0>; + }; + prm_gfx: prm@400 { compatible = "ti,am4-prm-inst", "ti,omap-prm-inst"; reg = <0x400 0x100>;
@@ -555,16 +561,36 @@ prm_gfx: prm@400 { #reset-cells = <1>; }; + prm_rtc: prm@500 { + compatible = "ti,am4-prm-inst", "ti,omap-prm-inst"; + reg = <0x500 0x100>; + #power-domain-cells = <0>; + }; + + prm_tamper: prm@600 { + compatible = "ti,am4-prm-inst", "ti,omap-prm-inst"; + reg = <0x600 0x100>; + #power-domain-cells = <0>; + }; + + prm_cefuse: prm@700 { + compatible = "ti,am4-prm-inst", "ti,omap-prm-inst"; + reg = <0x700 0x100>; + #power-domain-cells = <0>; + }; + prm_per: prm@800 { compatible = "ti,am4-prm-inst", "ti,omap-prm-inst"; reg = <0x800 0x100>; #reset-cells = <1>; + #power-domain-cells = <0>; }; prm_wkup: prm@2000 { compatible = "ti,am4-prm-inst", "ti,omap-prm-inst"; reg = <0x2000 0x100>; #reset-cells = <1>; + #power-domain-cells = <0>; }; prm_device: prm@4000 {
Signature · 1 line
2.29.2
Tony Lindgren
maintainerPATCH 4/17 ARM: dts: Configure also interconnect clocks for am4 system timer
In reply to Tony LindgrenWe now manage clocksource and clockevent clocks directly with timer-ti-dm-systimer. In order to use genpd with prm_omap, GENPD_FLAG_PM_CLK and simple-pm-bus, we need to keep the system timer related interconnect clocks enabled until clocksource suspend is done.
--- arch/arm/boot/dts/am4372.dtsi | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm/boot/dts/am4372.dtsi +6 -0
@@ -604,6 +604,9 @@ prm_device: prm@4000 { &timer1_target { ti,no-reset-on-init; ti,no-idle; + clocks = <&l4_wkup_clkctrl AM4_L4_WKUP_TIMER1_CLKCTRL 0>, + <&l4_wkup_clkctrl AM4_L4_WKUP_L4_WKUP_CLKCTRL 0>; + clock-names = "fck", "ick"; timer@0 { assigned-clocks = <&timer1_fck>; assigned-clock-parents = <&sys_clkin_ck>;
@@ -614,6 +617,9 @@ timer@0 { &timer2_target { ti,no-reset-on-init; ti,no-idle; + clocks = <&l4ls_clkctrl AM4_L4LS_TIMER2_CLKCTRL 0>, + <&l4ls_clkctrl AM4_L4LS_L4_LS_CLKCTRL 0>; + clock-names = "fck", "ick"; timer@0 { assigned-clocks = <&timer2_fck>; assigned-clock-parents = <&sys_clkin_ck>;
Signature · 1 line
2.29.2
Tony Lindgren
maintainerPATCH 5/17 ARM: OMAP2+: Drop legacy platform data for am4 control module
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.
To drop the legacy platform data for am3 control module, we need to configure the missing functional clock and tag the module to not idle as platform data also had it configured with HWMOD_INIT_NO_IDLE.
--- arch/arm/boot/dts/am437x-l4.dtsi | 3 +++ .../omap_hwmod_33xx_43xx_ipblock_data.c | 7 ------ arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 22 ------------------- 3 files changed, 3 insertions(+), 29 deletions(-)
arch/arm/boot/dts/am437x-l4.dtsi +3 -0
@@ -265,6 +265,9 @@ target-module@10000 { /* 0x44e10000, ap 22 0c.0 */ compatible = "ti,sysc-omap4", "ti,sysc"; reg = <0x10000 0x4>; reg-names = "rev"; + clocks = <&l4_wkup_clkctrl AM4_L4_WKUP_CONTROL_CLKCTRL 0>; + clock-names = "fck"; + ti,no-idle; #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x10000 0x10000>;
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c +0 -7
@@ -211,13 +211,6 @@ struct omap_hwmod am33xx_smartreflex1_hwmod = { }, }; -/* -* 'control' module class -*/ -struct omap_hwmod_class am33xx_control_hwmod_class = { - .name ="control" , -}; -static void omap_hwmod_am33xx_clkctrl (void ) { CLKCTRL(am33xx_smartreflex0_hwmod,
arch/arm/mach-omap2/omap_hwmod_43xx_data.c +0 -22
@@ -71,20 +71,6 @@ static struct omap_hwmod am43xx_wkup_m3_hwmod = { .rst_lines_cnt = ARRAY_SIZE(am33xx_wkup_m3_resets), }; -static struct omap_hwmod am43xx_control_hwmod = { - .name ="control" , - .class = &am33xx_control_hwmod_class, - .clkdm_name ="l4_wkup_clkdm" , - .flags =HWMOD_INIT_NO_IDLE , - .main_clk ="sys_clkin_ck" , - .prcm = { - .omap4 = { - .clkctrl_offs =AM43XX_CM_WKUP_CONTROL_CLKCTRL_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; -/* Interfaces */ static struct omap_hwmod_ocp_if am43xx_l3_main__emif = { .master = &am33xx_l3_main_hwmod,
@@ -128,13 +114,6 @@ static struct omap_hwmod_ocp_if am43xx_l4_wkup__smartreflex1 = { .user = OCP_USER_MPU, }; -static struct omap_hwmod_ocp_if am43xx_l4_wkup__control = { - .master = &am33xx_l4_wkup_hwmod, - .slave = &am43xx_control_hwmod, - .clk ="sys_clkin_ck" , - .user =OCP_USER_MPU , -}; -static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[]__initdata = { &am33xx_mpu__l3_main, &am33xx_mpu__prcm,
@@ -147,7 +126,6 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = { &am43xx_l3_main__emif, &am43xx_wkup_m3__l4_wkup, &am43xx_l4_wkup__wkup_m3, - &am43xx_l4_wkup__control, &am43xx_l4_wkup__smartreflex0, &am43xx_l4_wkup__smartreflex1, &am33xx_l3_main__ocmc,
Signature · 1 line
2.29.2
Tony Lindgren
maintainerPATCH 6/17 ARM: dts: Configure RTC powerdomain for am4
In reply to Tony LindgrenFor genpd we need the RTC powerdomain configured.
--- arch/arm/boot/dts/am437x-l4.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/am437x-l4.dtsi +1 -0
@@ -422,6 +422,7 @@ rtc_target: target-module@3e000 { /* 0x44e3e000, ap 34 60.0 */ <SYSC_IDLE_SMART>, <SYSC_IDLE_SMART_WKUP>; /* Domains (P, C): rtc_pwrdm, l4_rtc_clkdm */ + power-domains = <&prm_rtc>; clocks = <&l4_rtc_clkctrl AM4_L4_RTC_RTC_CLKCTRL 0>; clock-names = "fck"; #address-cells = <1>;
Signature · 1 line
2.29.2
Tony Lindgren
maintainerPATCH 7/17 ARM: dts: Configure interconnect target module for am4 wkup_m3
In reply to Tony LindgrenWe can now probe devices with device tree only configuration using ti-sysc interconnect target module driver.
Note that we no longer need ti,no-reset-on-init as the rstctrl resets are properly handled by the reset driver and claimed by the RTC driver. And we need to squash together the module ranges for driver compability.
--- arch/arm/boot/dts/am4372.dtsi | 8 -------- arch/arm/boot/dts/am437x-l4.dtsi | 27 +++++++++++++++++---------- 2 files changed, 17 insertions(+), 18 deletions(-)
arch/arm/boot/dts/am4372.dtsi +0 -8
@@ -173,14 +173,6 @@ ocp@44000000 { <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; l4_wkup: interconnect@44c00000 { - wkup_m3: wkup_m3@100000 { - compatible = "ti,am4372-wkup-m3"; - reg = <0x100000 0x4000>, - <0x180000 0x2000>; - reg-names = "umem", "dmem"; - ti,hwmods = "wkup_m3"; - ti,pm-firmware = "am335x-pm-firmware.elf"; - }; }; l4_per: interconnect@48000000 { };
arch/arm/boot/dts/am437x-l4.dtsi +17 -10
@@ -32,19 +32,26 @@ segment@100000 { /* 0x44d00000 */ <0x000f0000 0x001f0000 0x010000>; /* ap 8 */ target-module@0 { /* 0x44d00000, ap 4 28.0 */ - compatible = "ti,sysc"; - status = "disabled"; + compatible = "ti,sysc-omap4", "ti,sysc"; + ti,hwmods = "wkup_m3"; + reg = <0x0 0x4>; + reg-names = "rev"; + clocks = <&l4_wkup_aon_clkctrl AM4_L4_WKUP_AON_WKUP_M3_CLKCTRL 0>; + clock-names = "fck"; #address-cells = <1>; #size-cells = <1>; - ranges = <0x0 0x0 0x4000>; - }; + ranges = <0x00000000 0x00000000 0x4000>, + <0x00080000 0x00080000 0x2000>; - target-module@80000 { /* 0x44d80000, ap 6 10.0 */ - compatible = "ti,sysc"; - status = "disabled"; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0x0 0x80000 0x2000>; + wkup_m3: cpu@0 { + compatible = "ti,am4372-wkup-m3"; + reg = <0x00000000 0x4000>, + <0x00080000 0x2000>; + reg-names = "umem", "dmem"; + resets = <&prm_wkup 3>; + reset-names = "rstctrl"; + ti,pm-firmware = "am335x-pm-firmware.elf"; + }; }; target-module@f0000 { /* 0x44df0000, ap 8 58.0 */
Signature · 1 line
2.29.2
Tony Lindgren
maintainerPATCH 8/17 ARM: OMAP2+: Drop legacy platform data for am4 wkup_m3
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 - .../omap_hwmod_33xx_43xx_ipblock_data.c | 8 ---- arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 39 ------------------- 3 files changed, 48 deletions(-)
arch/arm/boot/dts/am437x-l4.dtsi +0 -1
@@ -33,7 +33,6 @@ segment@100000 { /* 0x44d00000 */ target-module@0 { /* 0x44d00000, ap 4 28.0 */ compatible = "ti,sysc-omap4", "ti,sysc"; - ti,hwmods = "wkup_m3"; reg = <0x0 0x4>; reg-names = "rev"; clocks = <&l4_wkup_aon_clkctrl AM4_L4_WKUP_AON_WKUP_M3_CLKCTRL 0>;
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c +0 -8
@@ -124,14 +124,6 @@ struct omap_hwmod am33xx_mpu_hwmod = { }, }; -/* -* 'wakeup m3' class -* Wakeup controller sub-system under wakeup domain -*/ -struct omap_hwmod_class am33xx_wkup_m3_hwmod_class = { - .name ="wkup_m3" , -}; -/* * 'prcm' class * power and reset manager (whole prcm infrastructure)
arch/arm/mach-omap2/omap_hwmod_43xx_data.c +0 -39
@@ -48,29 +48,6 @@ static struct omap_hwmod am43xx_l4_hs_hwmod = { }, }; -static struct omap_hwmod_rst_info am33xx_wkup_m3_resets[] = { - { .name ="wkup_m3" , .rst_shift =3 , .st_shift =5 }, -}; - -static struct omap_hwmod am43xx_wkup_m3_hwmod = { - .name ="wkup_m3" , - .class = &am33xx_wkup_m3_hwmod_class, - .clkdm_name ="l4_wkup_aon_clkdm" , -/* Keep hardreset asserted */ - .flags =HWMOD_INIT_NO_RESET |HWMOD_NO_IDLEST , - .main_clk ="sys_clkin_ck" , - .prcm = { - .omap4 = { - .clkctrl_offs =AM43XX_CM_WKUP_WKUP_M3_CLKCTRL_OFFSET , - .rstctrl_offs =AM43XX_RM_WKUP_RSTCTRL_OFFSET , - .rstst_offs =AM43XX_RM_WKUP_RSTST_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, - .rst_lines = am33xx_wkup_m3_resets, - .rst_lines_cnt =ARRAY_SIZE (am33xx_wkup_m3_resets), -}; -/* Interfaces */ static struct omap_hwmod_ocp_if am43xx_l3_main__emif = { .master = &am33xx_l3_main_hwmod,
@@ -86,20 +63,6 @@ static struct omap_hwmod_ocp_if am43xx_l3_main__l4_hs = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -static struct omap_hwmod_ocp_if am43xx_wkup_m3__l4_wkup = { - .master = &am43xx_wkup_m3_hwmod, - .slave = &am33xx_l4_wkup_hwmod, - .clk ="sys_clkin_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -static struct omap_hwmod_ocp_if am43xx_l4_wkup__wkup_m3 = { - .master = &am33xx_l4_wkup_hwmod, - .slave = &am43xx_wkup_m3_hwmod, - .clk ="sys_clkin_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; -static struct omap_hwmod_ocp_if am43xx_l4_wkup__smartreflex0 = { .master = &am33xx_l4_wkup_hwmod, .slave = &am33xx_smartreflex0_hwmod,
@@ -124,8 +87,6 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = { &am33xx_l3_main__l3_instr, &am33xx_l3_s__l3_main, &am43xx_l3_main__emif, - &am43xx_wkup_m3__l4_wkup, - &am43xx_l4_wkup__wkup_m3, &am43xx_l4_wkup__smartreflex0, &am43xx_l4_wkup__smartreflex1, &am33xx_l3_main__ocmc,
Signature · 1 line
2.29.2
Tony Lindgren
maintainerPATCH 9/17 ARM: OMAP2+: Drop legacy platform data for am4 emif
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.
--- arch/arm/boot/dts/am4372.dtsi | 24 +++++++++++++------ .../omap_hwmod_33xx_43xx_ipblock_data.c | 15 ------------ arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 21 ---------------- 3 files changed, 17 insertions(+), 43 deletions(-)
arch/arm/boot/dts/am4372.dtsi +17 -7
@@ -179,14 +179,24 @@ l4_per: interconnect@48000000 { l4_fast: interconnect@4a000000 { }; - emif: emif@4c000000 { - compatible = "ti,emif-am4372"; - reg = <0x4c000000 0x1000000>; - ti,hwmods = "emif"; - interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>; + target-module@4c000000 { + compatible = "ti,sysc-omap4-simple", "ti,sysc"; + reg = <0x4c000000 0x4>; + reg-names = "rev"; + clocks = <&emif_clkctrl AM4_EMIF_EMIF_CLKCTRL 0>; + clock-names = "fck"; ti,no-idle; - sram = <&pm_sram_code - &pm_sram_data>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x4c000000 0x1000000>; + + emif: emif@0 { + compatible = "ti,emif-am4372"; + reg = <0 0x1000000>; + interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>; + sram = <&pm_sram_code + &pm_sram_data>; + }; }; target-module@49000000 {
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c +0 -15
@@ -139,21 +139,6 @@ struct omap_hwmod am33xx_prcm_hwmod = { .clkdm_name = "l4_wkup_clkdm", }; -/* -* 'emif' class -* instance(s): emif -*/ -static struct omap_hwmod_class_sysconfig am33xx_emif_sysc = { - .rev_offs =0x0000 , -}; - -struct omap_hwmod_class am33xx_emif_hwmod_class = { - .name ="emif" , - .sysc = &am33xx_emif_sysc, -}; - - -/* ocmcram */ static struct omap_hwmod_class am33xx_ocmcram_hwmod_class = { .name ="ocmcram" ,
arch/arm/mach-omap2/omap_hwmod_43xx_data.c +0 -21
@@ -20,20 +20,6 @@#include "omap_hwmod_common_data.h" /* IP blocks */ -static struct omap_hwmod am43xx_emif_hwmod = { - .name ="emif" , - .class = &am33xx_emif_hwmod_class, - .clkdm_name ="emif_clkdm" , - .flags =HWMOD_INIT_NO_IDLE , - .main_clk ="dpll_ddr_m2_ck" , - .prcm = { - .omap4 = { - .clkctrl_offs =AM43XX_CM_PER_EMIF_CLKCTRL_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; -static struct omap_hwmod am43xx_l4_hs_hwmod = { .name ="l4_hs" , .class = &am33xx_l4_hwmod_class,
@@ -49,12 +35,6 @@ static struct omap_hwmod am43xx_l4_hs_hwmod = { };/* Interfaces */ -static struct omap_hwmod_ocp_if am43xx_l3_main__emif = { - .master = &am33xx_l3_main_hwmod, - .slave = &am43xx_emif_hwmod, - .clk ="dpll_core_m4_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -};static struct omap_hwmod_ocp_if am43xx_l3_main__l4_hs = { .master = &am33xx_l3_main_hwmod,
@@ -86,7 +66,6 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = { &am33xx_l3_main__l3_s, &am33xx_l3_main__l3_instr, &am33xx_l3_s__l3_main, - &am43xx_l3_main__emif, &am43xx_l4_wkup__smartreflex0, &am43xx_l4_wkup__smartreflex1, &am33xx_l3_main__ocmc,
Signature · 1 line
2.29.2
Tony Lindgren
maintainerPATCH 10/17 ARM: OMAP2+: Drop legacy platform data for am4 ocmcram
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.
Note that we need to use "ti,no-idle" here.
--- arch/arm/boot/dts/am4372.dtsi | 36 ++++++++++++------- .../omap_hwmod_33xx_43xx_interconnect_data.c | 7 ---- .../omap_hwmod_33xx_43xx_ipblock_data.c | 19 ---------- arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 1 - 4 files changed, 23 insertions(+), 40 deletions(-)
arch/arm/boot/dts/am4372.dtsi +23 -13
@@ -503,23 +503,33 @@ qspi: spi@0 { }; }; - ocmcram: sram@40300000 { - compatible = "mmio-sram"; - reg = <0x40300000 0x40000>; /* 256k */ - ranges = <0x0 0x40300000 0x40000>; + target-module@40300000 { + compatible = "ti,sysc-omap4-simple", "ti,sysc"; + clocks = <&l3_clkctrl AM4_L3_OCMCRAM_CLKCTRL 0>; + clock-names = "fck"; + ti,no-idle; #address-cells = <1>; #size-cells = <1>; + ranges = <0 0x40300000 0x40000>; - pm_sram_code: pm-code-sram@0 { - compatible = "ti,sram"; - reg = <0x0 0x1000>; - protect-exec; - }; + ocmcram: sram@0 { + compatible = "mmio-sram"; + reg = <0 0x40000>; /* 256k */ + ranges = <0 0 0x40000>; + #address-cells = <1>; + #size-cells = <1>; - pm_sram_data: pm-data-sram@1000 { - compatible = "ti,sram"; - reg = <0x1000 0x1000>; - pool; + pm_sram_code: pm-code-sram@0 { + compatible = "ti,sram"; + reg = <0x0 0x1000>; + protect-exec; + }; + + pm_sram_data: pm-data-sram@1000 { + compatible = "ti,sram"; + reg = <0x1000 0x1000>; + pool; + }; }; };
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c +0 -7
@@ -73,10 +73,3 @@ struct omap_hwmod_ocp_if am33xx_l3_s__l3_main = { .clk = "l3s_gclk", .user = OCP_USER_MPU | OCP_USER_SDMA, }; - -/* l3 main -> ocmc */ -struct omap_hwmod_ocp_if am33xx_l3_main__ocmc = { - .master = &am33xx_l3_main_hwmod, - .slave = &am33xx_ocmcram_hwmod, - .user =OCP_USER_MPU |OCP_USER_SDMA , -};
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c +0 -19
@@ -139,24 +139,6 @@ struct omap_hwmod am33xx_prcm_hwmod = { .clkdm_name = "l4_wkup_clkdm", }; -/* ocmcram */ -static struct omap_hwmod_class am33xx_ocmcram_hwmod_class = { - .name ="ocmcram" , -}; - -struct omap_hwmod am33xx_ocmcram_hwmod = { - .name ="ocmcram" , - .class = &am33xx_ocmcram_hwmod_class, - .clkdm_name ="l3_clkdm" , - .flags =HWMOD_INIT_NO_IDLE , - .main_clk ="l3_gclk" , - .prcm = { - .omap4 = { - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; -/* 'smartreflex' class */ static struct omap_hwmod_class am33xx_smartreflex_hwmod_class = { .name ="smartreflex" ,
@@ -215,7 +197,6 @@ static void omap_hwmod_am43xx_clkctrl(void)CLKCTRL (am33xx_l4_wkup_hwmod,AM43XX_CM_WKUP_L4WKUP_CLKCTRL_OFFSET );CLKCTRL (am33xx_l3_main_hwmod,AM43XX_CM_PER_L3_CLKCTRL_OFFSET );CLKCTRL (am33xx_mpu_hwmod ,AM43XX_CM_MPU_MPU_CLKCTRL_OFFSET ); -CLKCTRL (am33xx_ocmcram_hwmod ,AM43XX_CM_PER_OCMCRAM_CLKCTRL_OFFSET ); }void omap_hwmod_am43xx_reg (void )
arch/arm/mach-omap2/omap_hwmod_43xx_data.c +0 -1
@@ -68,7 +68,6 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = { &am33xx_l3_s__l3_main, &am43xx_l4_wkup__smartreflex0, &am43xx_l4_wkup__smartreflex1, - &am33xx_l3_main__ocmc, NULL, };
Signature · 1 line
2.29.2
Tony Lindgren
maintainerPATCH 11/17 ARM: OMAP2+: Drop legacy platform data for am4 mpuss
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.
--- arch/arm/boot/dts/am4372.dtsi | 6 ------ arch/arm/boot/dts/am437x-l4.dtsi | 18 ++++++++++++++++ .../omap_hwmod_33xx_43xx_common_data.h | 3 --- .../omap_hwmod_33xx_43xx_interconnect_data.c | 16 -------------- .../omap_hwmod_33xx_43xx_ipblock_data.c | 21 ------------------- arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 2 -- 6 files changed, 18 insertions(+), 48 deletions(-)
arch/arm/boot/dts/am4372.dtsi +0 -6
@@ -107,12 +107,6 @@ oppnitro-1000000000 { soc { compatible = "ti,omap-infra"; - mpu { - compatible = "ti,omap4-mpu"; - ti,hwmods = "mpu"; - pm-sram = <&pm_sram_code - &pm_sram_data>; - }; }; gic: interrupt-controller@48241000 {
arch/arm/boot/dts/am437x-l4.dtsi +18 -0
@@ -1631,6 +1631,24 @@ segment@200000 { /* 0x48200000 */ compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; + ranges = <0x00000000 0x00200000 0x010000>; + + target-module@0 { + compatible = "ti,sysc-omap4-simple", "ti,sysc"; + power-domains = <&prm_mpu>; + clocks = <&mpu_clkctrl AM4_MPU_MPU_CLKCTRL 0>; + clock-names = "fck"; + ti,no-idle; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0 0x10000>; + + mpu@0 { + compatible = "ti,omap4-mpu"; + pm-sram = <&pm_sram_code + &pm_sram_data>; + }; + }; }; segment@300000 { /* 0x48300000 */
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h +0 -3
@@ -17,12 +17,10 @@#ifndef __ARCH_ARM_MACH_OMAP2_OMAP_HWMOD_33XX_43XX_COMMON_DATA_H#define __ARCH_ARM_MACH_OMAP2_OMAP_HWMOD_33XX_43XX_COMMON_DATA_H -extern struct omap_hwmod_ocp_if am33xx_mpu__l3_main;extern struct omap_hwmod_ocp_if am33xx_l3_main__l3_s;extern struct omap_hwmod_ocp_if am33xx_l3_s__l4_ls;extern struct omap_hwmod_ocp_if am33xx_l3_s__l4_wkup;extern struct omap_hwmod_ocp_if am33xx_l3_main__l3_instr; -extern struct omap_hwmod_ocp_if am33xx_mpu__prcm;extern struct omap_hwmod_ocp_if am33xx_l3_s__l3_main;extern struct omap_hwmod_ocp_if am33xx_gfx__l3_main;extern struct omap_hwmod_ocp_if am33xx_l3_main__gfx;
@@ -34,7 +32,6 @@ extern struct omap_hwmod am33xx_l3_s_hwmod;extern struct omap_hwmod am33xx_l3_instr_hwmod;extern struct omap_hwmod am33xx_l4_ls_hwmod;extern struct omap_hwmod am33xx_l4_wkup_hwmod; -extern struct omap_hwmod am33xx_mpu_hwmod;extern struct omap_hwmod am33xx_gfx_hwmod;extern struct omap_hwmod am33xx_prcm_hwmod;extern struct omap_hwmod am33xx_ocmcram_hwmod;
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c +0 -16
@@ -18,14 +18,6 @@#include "omap_hwmod.h" #include "omap_hwmod_33xx_43xx_common_data.h" -/* mpu -> l3 main */ -struct omap_hwmod_ocp_if am33xx_mpu__l3_main = { - .master = &am33xx_mpu_hwmod, - .slave = &am33xx_l3_main_hwmod, - .clk ="dpll_mpu_m2_ck" , - .user =OCP_USER_MPU , -}; -/* l3 main -> l3 s */ struct omap_hwmod_ocp_if am33xx_l3_main__l3_s = { .master = &am33xx_l3_main_hwmod,
@@ -58,14 +50,6 @@ struct omap_hwmod_ocp_if am33xx_l3_main__l3_instr = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -/* mpu -> prcm */ -struct omap_hwmod_ocp_if am33xx_mpu__prcm = { - .master = &am33xx_mpu_hwmod, - .slave = &am33xx_prcm_hwmod, - .clk ="dpll_mpu_m2_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; -/* l3 s -> l3 main*/ struct omap_hwmod_ocp_if am33xx_l3_s__l3_main = { .master = &am33xx_l3_s_hwmod,
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c +0 -21
@@ -104,26 +104,6 @@ struct omap_hwmod am33xx_l4_wkup_hwmod = { }, }; -/* -* 'mpu' class -*/ -static struct omap_hwmod_class am33xx_mpu_hwmod_class = { - .name ="mpu" , -}; - -struct omap_hwmod am33xx_mpu_hwmod = { - .name ="mpu" , - .class = &am33xx_mpu_hwmod_class, - .clkdm_name ="mpu_clkdm" , - .flags =HWMOD_INIT_NO_IDLE , - .main_clk ="dpll_mpu_m2_ck" , - .prcm = { - .omap4 = { - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; -/* * 'prcm' class * power and reset manager (whole prcm infrastructure)
@@ -196,7 +176,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_mpu_hwmod ,AM43XX_CM_MPU_MPU_CLKCTRL_OFFSET ); }void omap_hwmod_am43xx_reg (void )
arch/arm/mach-omap2/omap_hwmod_43xx_data.c +0 -2
@@ -58,8 +58,6 @@ static struct omap_hwmod_ocp_if am43xx_l4_wkup__smartreflex1 = { };static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[]__initdata = { - &am33xx_mpu__l3_main, - &am33xx_mpu__prcm, &am33xx_l3_s__l4_ls, &am33xx_l3_s__l4_wkup, &am43xx_l3_main__l4_hs,
Signature · 1 line
2.29.2
Tony Lindgren
maintainerPATCH 12/17 ARM: dts: Use simple-pm-bus for genpd for am4 l4_wkup
In reply to Tony LindgrenWe can now enable simple-pm-bus to use genpd.
--- arch/arm/boot/dts/am437x-l4.dtsi | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
arch/arm/boot/dts/am437x-l4.dtsi +7 -4
@@ -1,5 +1,8 @@ &l4_wkup { /* 0x44c00000 */ - compatible = "ti,am4-l4-wkup", "simple-bus"; + compatible = "ti,am4-l4-wkup", "simple-pm-bus"; + power-domains = <&prm_wkup>; + clocks = <&l4_wkup_clkctrl AM4_L4_WKUP_L4_WKUP_CLKCTRL 0>; + clock-names = "fck"; reg = <0x44c00000 0x800>, <0x44c00800 0x800>, <0x44c01000 0x400>,
@@ -12,7 +15,7 @@ &l4_wkup { /* 0x44c00000 */ <0x00200000 0x44e00000 0x100000>; /* segment 2 */ segment@0 { /* 0x44c00000 */ - compatible = "simple-bus"; + compatible = "simple-pm-bus"; #address-cells = <1>; #size-cells = <1>; ranges = <0x00000000 0x00000000 0x000800>, /* ap 0 */
@@ -22,7 +25,7 @@ segment@0 { /* 0x44c00000 */ }; segment@100000 { /* 0x44d00000 */ - compatible = "simple-bus"; + compatible = "simple-pm-bus"; #address-cells = <1>; #size-cells = <1>; ranges = <0x00000000 0x00100000 0x004000>, /* ap 4 */
@@ -81,7 +84,7 @@ prcm_clockdomains: clockdomains { }; segment@200000 { /* 0x44e00000 */ - compatible = "simple-bus"; + compatible = "simple-pm-bus"; #address-cells = <1>; #size-cells = <1>; ranges = <0x00000000 0x00200000 0x001000>, /* ap 9 */
Signature · 1 line
2.29.2
Tony Lindgren
maintainerPATCH 13/17 ARM: dts: Use simple-pm-bus for genpd for am4 l4_fast
In reply to Tony LindgrenWe can now enable simple-pm-bus to use genpd.
--- arch/arm/boot/dts/am437x-l4.dtsi | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
arch/arm/boot/dts/am437x-l4.dtsi +5 -2
@@ -492,7 +492,10 @@ target-module@88000 { /* 0x44e88000, ap 38 12.0 */ }; &l4_fast { /* 0x4a000000 */ - compatible = "ti,am4-l4-fast", "simple-bus"; + compatible = "ti,am4-l4-fast", "simple-pm-bus"; + power-domains = <&prm_per>; + clocks = <&l3_clkctrl AM4_L3_L4_HS_CLKCTRL 0>; + clock-names = "fck"; reg = <0x4a000000 0x800>, <0x4a000800 0x800>, <0x4a001000 0x400>;
@@ -502,7 +505,7 @@ &l4_fast { /* 0x4a000000 */ ranges = <0x00000000 0x4a000000 0x1000000>; /* segment 0 */ segment@0 { /* 0x4a000000 */ - compatible = "simple-bus"; + compatible = "simple-pm-bus"; #address-cells = <1>; #size-cells = <1>; ranges = <0x00000000 0x00000000 0x000800>, /* ap 0 */
Signature · 1 line
2.29.2
Tony Lindgren
maintainerPATCH 14/17 ARM: dts: Use simple-pm-bus for genpd for am4 l4_per
In reply to Tony LindgrenWe can now enable simple-pm-bus to use genpd.
--- arch/arm/boot/dts/am437x-l4.dtsi | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
arch/arm/boot/dts/am437x-l4.dtsi +8 -5
@@ -610,7 +610,10 @@ target-module@400000 { /* 0x4a400000, ap 5 08.0 */ }; &l4_per { /* 0x48000000 */ - compatible = "ti,am4-l4-per", "simple-bus"; + compatible = "ti,am4-l4-per", "simple-pm-bus"; + power-domains = <&prm_per>; + clocks = <&l4ls_clkctrl AM4_L4LS_L4_LS_CLKCTRL 0>; + clock-names = "fck"; reg = <0x48000000 0x800>, <0x48000800 0x800>, <0x48001000 0x400>,
@@ -628,7 +631,7 @@ &l4_per { /* 0x48000000 */ <0x46400000 0x46400000 0x400000>; /* l3 data port */ segment@0 { /* 0x48000000 */ - compatible = "simple-bus"; + compatible = "simple-pm-bus"; #address-cells = <1>; #size-cells = <1>; ranges = <0x00000000 0x00000000 0x000800>, /* ap 0 */
@@ -1203,7 +1206,7 @@ hwspinlock: spinlock@0 { }; segment@100000 { /* 0x48100000 */ - compatible = "simple-bus"; + compatible = "simple-pm-bus"; #address-cells = <1>; #size-cells = <1>; ranges = <0x0008c000 0x0018c000 0x001000>, /* ap 34 */
@@ -1634,7 +1637,7 @@ mmc2: mmc@0 { }; segment@200000 { /* 0x48200000 */ - compatible = "simple-bus"; + compatible = "simple-pm-bus"; #address-cells = <1>; #size-cells = <1>; ranges = <0x00000000 0x00200000 0x010000>;
@@ -1658,7 +1661,7 @@ mpu@0 { }; segment@300000 { /* 0x48300000 */ - compatible = "simple-bus"; + compatible = "simple-pm-bus"; #address-cells = <1>; #size-cells = <1>; ranges = <0x00000000 0x00300000 0x001000>, /* ap 56 */
Signature · 1 line
2.29.2
Tony Lindgren
maintainerPATCH 15/17 ARM: dts: Move am4 l3 noc to a separate node
In reply to Tony LindgrenIn preparation for probing l3 with simple-pm-bus and genpd, we must move l3 noc to a separate node to prevent omap_l3_noc.c driver from claiming the whole l3 instance before simple-pm-bus has a chance to probe.
--- arch/arm/boot/dts/am4372.dtsi | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
arch/arm/boot/dts/am4372.dtsi +8 -4
@@ -161,10 +161,14 @@ ocp@44000000 { ranges; ti,hwmods = "l3_main"; ti,no-idle; - reg = <0x44000000 0x400000 - 0x44800000 0x400000>; - interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; + + l3-noc@44000000 { + compatible = "ti,am4372-l3-noc"; + reg = <0x44000000 0x400000>, + <0x44800000 0x400000>; + interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; + }; l4_wkup: interconnect@44c00000 { };
Signature · 1 line
2.29.2
Tony Lindgren
maintainerPATCH 16/17 ARM: dts: Use simple-pm-bus for genpd for am4 l3
In reply to Tony LindgrenWe can now enable simple-pm-bus to use genpd.
--- arch/arm/boot/dts/am4372.dtsi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm/boot/dts/am4372.dtsi +4 -2
@@ -155,11 +155,13 @@ cache-controller@48242000 { }; ocp@44000000 { - compatible = "ti,am4372-l3-noc", "simple-bus"; + compatible = "simple-pm-bus"; + power-domains = <&prm_per>; + clocks = <&l3_clkctrl AM4_L3_L3_MAIN_CLKCTRL 0>; + clock-names = "fck"; #address-cells = <1>; #size-cells = <1>; ranges; - ti,hwmods = "l3_main"; ti,no-idle; l3-noc@44000000 {
Signature · 1 line
2.29.2
Tony Lindgren
maintainerPATCH 17/17 ARM: OMAP2+: Drop legacy remaining legacy platform data for am4
In reply to Tony LindgrenWe can now drop the remaining legacy platform data as we are probing devices with device tree data.
--- arch/arm/mach-omap2/Kconfig | 1 - arch/arm/mach-omap2/Makefile | 5 +- arch/arm/mach-omap2/io.c | 1 - .../omap_hwmod_33xx_43xx_common_data.h | 52 ----- .../omap_hwmod_33xx_43xx_interconnect_data.c | 59 ------ .../omap_hwmod_33xx_43xx_ipblock_data.c | 184 ------------------ arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 81 -------- 7 files changed, 1 insertion(+), 382 deletions(-) delete mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h delete mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c delete mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c delete mode 100644 arch/arm/mach-omap2/omap_hwmod_43xx_data.c
arch/arm/mach-omap2/Kconfig +0 -1
@@ -78,7 +78,6 @@ config SOC_AM43XX select HAVE_ARM_TWD select ARM_ERRATA_754322 select ARM_ERRATA_775420 - select OMAP_HWMOD select OMAP_INTERCONNECT select ARM_CPU_SUSPEND if PM
arch/arm/mach-omap2/Makefile +1 -4
@@ -23,7 +23,7 @@ obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common) obj-$(CONFIG_ARCH_OMAP4) += $(hwmod-common) $(secure-common) obj-$(CONFIG_SOC_AM33XX) += $(secure-common) obj-$(CONFIG_SOC_OMAP5) += $(hwmod-common) $(secure-common) -obj-$(CONFIG_SOC_AM43XX) += $(hwmod-common) $(secure-common) +obj-$(CONFIG_SOC_AM43XX) += $(secure-common) obj-$(CONFIG_SOC_DRA7XX) += $(hwmod-common) $(secure-common) ifneq ($(CONFIG_SND_SOC_OMAP_MCBSP),)
@@ -206,9 +206,6 @@ obj-$(CONFIG_SOC_OMAP2430) += omap_hwmod_2xxx_interconnect_data.o obj-$(CONFIG_SOC_OMAP2430) += omap_hwmod_2430_data.o obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_2xxx_3xxx_ipblock_data.o obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_3xxx_data.o -obj-$(CONFIG_SOC_AM43XX) += omap_hwmod_43xx_data.o -obj-$(CONFIG_SOC_AM43XX) += omap_hwmod_33xx_43xx_interconnect_data.o -obj-$(CONFIG_SOC_AM43XX) += omap_hwmod_33xx_43xx_ipblock_data.o obj-$(CONFIG_SOC_TI81XX) += omap_hwmod_81xx_data.o obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o obj-$(CONFIG_SOC_OMAP5) += omap_hwmod_54xx_data.o
arch/arm/mach-omap2/io.c +0 -1
@@ -588,7 +588,6 @@ void __init am43xx_init_early(void)omap2_prcm_base_init ();am43xx_powerdomains_init ();am43xx_clockdomains_init (); -am43xx_hwmod_init ();omap_hwmod_init_postsetup ();omap_l2_cache_init (); omap_clk_soc_init = am43xx_dt_clk_init;
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h deleted +0 -52
52 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c deleted +0 -59
59 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c deleted +0 -184
184 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_43xx_data.c deleted +0 -81
81 lines not on this page · raw message
Signature · 1 line
2.29.2