Probe l4 abe and most timers with ti-sysc
Subsystems (7)
Tony Lindgren
maintainercover Probe l4 abe and most timers with ti-sysc
Hi all,
This series updates l4-abe devices and non-system timers to probe with ti-sysc.
After this series we now have l4-abe instances with all devices probing with dts data and ti-sysc driver. So for omap4 and 5, l4-abe can now be used to experiment with adding genpd support to drivers/soc/ti/omap_prm.c to power down the abe domain when not in use :)
Note that we cannot yet probe system timers with ti-sysc.
Regards,
Tony
Tony Lindgren (9):
ARM: OMAP2+: Drop legacy platform data for omap4 aess
ARM: OMAP2+: Drop legacy platform data for omap4 dmic
ARM: OMAP2+: Drop legacy platform data for omap4 mcpdm
ARM: OMAP2+: Drop legacy platform data for omap5 dmic
ARM: OMAP2+: Drop legacy platform data for omap5 mcpdm
ARM: OMAP2+: Drop legacy platform data for omap4 timers except timer1
ARM: OMAP2+: Drop legacy platform data for omap5 timers except timer1
ARM: OMAP2+: Drop legacy platform data for am3 and am4 timers except
timer1 and 2
ARM: OMAP2+: Drop legacy platform data for dra7 timers except timer1
to 4
arch/arm/boot/dts/am33xx-l4.dtsi | 5 - arch/arm/boot/dts/am437x-l4.dtsi | 9 - arch/arm/boot/dts/dra7-l4.dtsi | 12 - arch/arm/boot/dts/omap4-l4-abe.dtsi | 7 - arch/arm/boot/dts/omap4-l4.dtsi | 6 - arch/arm/boot/dts/omap5-l4-abe.dtsi | 6 - arch/arm/boot/dts/omap5-l4.dtsi | 6 - arch/arm/mach-omap2/omap_hwmod.c | 18 - arch/arm/mach-omap2/omap_hwmod.h | 3 - .../omap_hwmod_33xx_43xx_common_data.h | 10 - .../omap_hwmod_33xx_43xx_interconnect_data.c | 40 -- .../omap_hwmod_33xx_43xx_ipblock_data.c | 70 --- arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 5 - arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 89 ---- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 421 ------------------ arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 357 --------------- arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 295 ------------ arch/arm/mach-omap2/omap_hwmod_reset.c | 24 - include/sound/aess.h | 53 --- 19 files changed, 1436 deletions(-) delete mode 100644 include/sound/aess.h
Signature · 1 line
2.24.0
Tony Lindgren
maintainerPATCH 1/9 ARM: OMAP2+: Drop legacy platform data for omap4 aess
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 | 1 - arch/arm/mach-omap2/omap_hwmod.c | 18 ------ arch/arm/mach-omap2/omap_hwmod.h | 3 - arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 64 ---------------------- arch/arm/mach-omap2/omap_hwmod_reset.c | 24 -------- include/sound/aess.h | 53 ------------------ 6 files changed, 163 deletions(-) delete mode 100644 include/sound/aess.h
arch/arm/boot/dts/omap4-l4-abe.dtsi +0 -1
@@ -466,7 +466,6 @@ target-module@c0000 { /* 0x401c0000, ap 30 1e.0 */ target-module@f1000 { /* 0x401f1000, ap 32 20.0 */ compatible = "ti,sysc-omap4", "ti,sysc"; - ti,hwmods = "aess"; reg = <0xf1000 0x4>, <0xf1010 0x4>; reg-names = "rev", "sysc";
arch/arm/mach-omap2/omap_hwmod.c +0 -18
@@ -1852,23 +1852,6 @@ static int _omap4_get_context_lost(struct omap_hwmod *oh)return oh->prcm.omap4.context_lost_counter; } -/** -* _enable_preprogram - Pre-program an IP block during the _enable() process -* @oh: struct omap_hwmod * -* -* Some IP blocks (such as AESS) require some additional programming -* after enable before they can enter idle. If a function pointer to -* do so is present in the hwmod data, then call it and pass along the -* return value; otherwise, return 0. -*/ -static int _enable_preprogram (struct omap_hwmod *oh) -{ -if (!oh->class->enable_preprogram) -return 0 ; - -return oh->class->enable_preprogram (oh); -} -/** * _enable - enable an omap_hwmod * @oh: struct omap_hwmod *
@@ -1952,7 +1935,6 @@ static int _enable(struct omap_hwmod *oh)_update_sysc_cache (oh);_enable_sysc (oh); } - r =_enable_preprogram (oh); }else {if (soc_ops.disable_module) soc_ops.disable_module (oh);
arch/arm/mach-omap2/omap_hwmod.h +0 -3
@@ -501,7 +501,6 @@ struct omap_hwmod_omap4_prcm {* @sysc: device SYSCONFIG/SYSSTATUS register data * @pre_shutdown: ptr to fn to be executed immediately prior to device shutdown * @reset: ptr to fn to be executed in place of the standard hwmod reset fn -* @enable_preprogram: ptr to fn to be executed during device enable * @lock: ptr to fn to be executed to lock IP registers * @unlock: ptr to fn to be executed to unlock IP registers *
@@ -526,7 +525,6 @@ struct omap_hwmod_class {struct omap_hwmod_class_sysconfig *sysc;int (*pre_shutdown)(struct omap_hwmod *oh);int (*reset)(struct omap_hwmod *oh); -int (*enable_preprogram)(struct omap_hwmod *oh);void (*lock)(struct omap_hwmod *oh);void (*unlock)(struct omap_hwmod *oh); };
@@ -662,7 +660,6 @@ const char *omap_hwmod_get_main_clk(struct omap_hwmod *oh);* */ -extern int omap_hwmod_aess_preprogram (struct omap_hwmod *oh);void omap_hwmod_rtc_unlock (struct omap_hwmod *oh);void omap_hwmod_rtc_lock (struct omap_hwmod *oh);
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +0 -64
94 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_reset.c +0 -24
@@ -26,8 +26,6 @@#include <linux/kernel.h> #include <linux/errno.h> -#include <sound/aess.h> -#include "omap_hwmod.h" #include "common.h"
@@ -40,28 +38,6 @@#define OMAP_RTC_STATUS_BUSY BIT(0)#define OMAP_RTC_MAX_READY_TIME 50 -/** -* omap_hwmod_aess_preprogram - enable AESS internal autogating -* @oh: struct omap_hwmod * -* -* The AESS will not IdleAck to the PRCM until its internal autogating -* is enabled. Since internal autogating is disabled by default after -* AESS reset, we must enable autogating after the hwmod code resets -* the AESS. Returns 0. -*/ -int omap_hwmod_aess_preprogram (struct omap_hwmod *oh) -{ -void __iomem *va; - - va =omap_hwmod_get_mpu_rt_va (oh); -if (!va) -return -EINVAL ; - -aess_enable_autogating (va); - -return 0 ; -} -/** * omap_rtc_wait_not_busy - Wait for the RTC BUSY flag * @oh: struct omap_hwmod *
include/sound/aess.h deleted +0 -53
53 lines not on this page · raw message
Signature · 1 line
2.24.0
Tony Lindgren
maintainerPATCH 2/9 ARM: OMAP2+: Drop legacy platform data for omap4 dmic
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 | 43 ---------------------- 2 files changed, 44 deletions(-)
arch/arm/boot/dts/omap4-l4-abe.dtsi +0 -1
@@ -219,7 +219,6 @@ target-module@2a000 { /* 0x4012a000, ap 10 0a.0 */ target-module@2e000 { /* 0x4012e000, ap 12 0c.0 */ compatible = "ti,sysc-omap4", "ti,sysc"; - ti,hwmods = "dmic"; reg = <0x2e000 0x4>, <0x2e010 0x4>; reg-names = "rev", "sysc";
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +0 -43
61 lines not on this page · raw message
Signature · 1 line
2.24.0
Tony Lindgren
maintainerPATCH 3/9 ARM: OMAP2+: Drop legacy platform data for omap4 mcpdm
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 | 57 ---------------------- 2 files changed, 58 deletions(-)
arch/arm/boot/dts/omap4-l4-abe.dtsi +0 -1
@@ -278,7 +278,6 @@ wdt3: wdt@0 { mcpdm_module: target-module@32000 { /* 0x40132000, ap 16 10.0 */ compatible = "ti,sysc-omap4", "ti,sysc"; - ti,hwmods = "mcpdm"; reg = <0x32000 0x4>, <0x32010 0x4>; reg-names = "rev", "sysc";
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +0 -57
75 lines not on this page · raw message
Signature · 1 line
2.24.0
Tony Lindgren
maintainerPATCH 4/9 ARM: OMAP2+: Drop legacy platform data for omap5 dmic
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 | 1 - arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 43 ---------------------- 2 files changed, 44 deletions(-)
arch/arm/boot/dts/omap5-l4-abe.dtsi +0 -1
@@ -203,7 +203,6 @@ target-module@2a000 { /* 0x4012a000, ap 10 0a.0 */ target-module@2e000 { /* 0x4012e000, ap 12 0c.0 */ compatible = "ti,sysc-omap4", "ti,sysc"; - ti,hwmods = "dmic"; reg = <0x2e000 0x4>, <0x2e010 0x4>; reg-names = "rev", "sysc";
arch/arm/mach-omap2/omap_hwmod_54xx_data.c +0 -43
61 lines not on this page · raw message
Signature · 1 line
2.24.0
Tony Lindgren
maintainerPATCH 5/9 ARM: OMAP2+: Drop legacy platform data for omap5 mcpdm
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 | 1 - arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 57 ---------------------- 2 files changed, 58 deletions(-)
arch/arm/boot/dts/omap5-l4-abe.dtsi +0 -1
@@ -243,7 +243,6 @@ target-module@30000 { /* 0x40130000, ap 14 0e.0 */ mcpdm_module: target-module@32000 { /* 0x40132000, ap 16 10.0 */ compatible = "ti,sysc-omap4", "ti,sysc"; - ti,hwmods = "mcpdm"; reg = <0x32000 0x4>, <0x32010 0x4>; reg-names = "rev", "sysc";
arch/arm/mach-omap2/omap_hwmod_54xx_data.c +0 -57
75 lines not on this page · raw message
Signature · 1 line
2.24.0
Tony Lindgren
maintainerPATCH 6/9 ARM: OMAP2+: Drop legacy platform data for omap4 timers except timer1
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 | 4 - arch/arm/boot/dts/omap4-l4.dtsi | 6 - arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 257 --------------------- 3 files changed, 267 deletions(-)
arch/arm/boot/dts/omap4-l4-abe.dtsi +0 -4
@@ -312,7 +312,6 @@ mcpdm: mcpdm@0 { target-module@38000 { /* 0x40138000, ap 18 12.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer5"; reg = <0x38000 0x4>, <0x38010 0x4>; reg-names = "rev", "sysc";
@@ -343,7 +342,6 @@ timer5: timer@0 { target-module@3a000 { /* 0x4013a000, ap 20 14.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer6"; reg = <0x3a000 0x4>, <0x3a010 0x4>; reg-names = "rev", "sysc";
@@ -374,7 +372,6 @@ timer6: timer@0 { target-module@3c000 { /* 0x4013c000, ap 22 16.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer7"; reg = <0x3c000 0x4>, <0x3c010 0x4>; reg-names = "rev", "sysc";
@@ -405,7 +402,6 @@ timer7: timer@0 { target-module@3e000 { /* 0x4013e000, ap 24 18.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer8"; reg = <0x3e000 0x4>, <0x3e010 0x4>; reg-names = "rev", "sysc";
arch/arm/boot/dts/omap4-l4.dtsi +0 -6
@@ -1422,7 +1422,6 @@ uart3: serial@0 { target-module@32000 { /* 0x48032000, ap 5 02.0 */ compatible = "ti,sysc-omap2-timer", "ti,sysc"; - ti,hwmods = "timer2"; reg = <0x32000 0x4>, <0x32010 0x4>, <0x32014 0x4>;
@@ -1454,7 +1453,6 @@ timer2: timer@0 { target-module@34000 { /* 0x48034000, ap 7 04.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer3"; reg = <0x34000 0x4>, <0x34010 0x4>; reg-names = "rev", "sysc";
@@ -1482,7 +1480,6 @@ timer3: timer@0 { target-module@36000 { /* 0x48036000, ap 9 0e.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer4"; reg = <0x36000 0x4>, <0x36010 0x4>; reg-names = "rev", "sysc";
@@ -1510,7 +1507,6 @@ timer4: timer@0 { target-module@3e000 { /* 0x4803e000, ap 11 08.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer9"; reg = <0x3e000 0x4>, <0x3e010 0x4>; reg-names = "rev", "sysc";
@@ -1942,7 +1938,6 @@ elm: elm@0 { target-module@86000 { /* 0x48086000, ap 43 24.0 */ compatible = "ti,sysc-omap2-timer", "ti,sysc"; - ti,hwmods = "timer10"; reg = <0x86000 0x4>, <0x86010 0x4>, <0x86014 0x4>;
@@ -1975,7 +1970,6 @@ timer10: timer@0 { target-module@88000 { /* 0x48088000, ap 45 2e.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer11"; reg = <0x88000 0x4>, <0x88010 0x4>; reg-names = "rev", "sysc";
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +0 -257
281 lines not on this page · raw message
Signature · 1 line
2.24.0
Tony Lindgren
maintainerPATCH 7/9 ARM: OMAP2+: Drop legacy platform data for omap5 timers except timer1
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 | 4 - arch/arm/boot/dts/omap5-l4.dtsi | 6 - arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 257 --------------------- 3 files changed, 267 deletions(-)
arch/arm/boot/dts/omap5-l4-abe.dtsi +0 -4
@@ -277,7 +277,6 @@ mcpdm: mcpdm@0 { target-module@38000 { /* 0x40138000, ap 18 12.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer5"; reg = <0x38000 0x4>, <0x38010 0x4>; reg-names = "rev", "sysc";
@@ -309,7 +308,6 @@ timer5: timer@0 { target-module@3a000 { /* 0x4013a000, ap 20 14.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer6"; reg = <0x3a000 0x4>, <0x3a010 0x4>; reg-names = "rev", "sysc";
@@ -341,7 +339,6 @@ timer6: timer@0 { target-module@3c000 { /* 0x4013c000, ap 22 16.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer7"; reg = <0x3c000 0x4>, <0x3c010 0x4>; reg-names = "rev", "sysc";
@@ -372,7 +369,6 @@ timer7: timer@0 { target-module@3e000 { /* 0x4013e000, ap 24 18.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer8"; reg = <0x3e000 0x4>, <0x3e010 0x4>; reg-names = "rev", "sysc";
arch/arm/boot/dts/omap5-l4.dtsi +0 -6
@@ -1061,7 +1061,6 @@ uart3: serial@0 { target-module@32000 { /* 0x48032000, ap 5 3e.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer2"; reg = <0x32000 0x4>, <0x32010 0x4>; reg-names = "rev", "sysc";
@@ -1089,7 +1088,6 @@ timer2: timer@0 { target-module@34000 { /* 0x48034000, ap 7 46.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer3"; reg = <0x34000 0x4>, <0x34010 0x4>; reg-names = "rev", "sysc";
@@ -1117,7 +1115,6 @@ timer3: timer@0 { target-module@36000 { /* 0x48036000, ap 9 4e.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer4"; reg = <0x36000 0x4>, <0x36010 0x4>; reg-names = "rev", "sysc";
@@ -1145,7 +1142,6 @@ timer4: timer@0 { target-module@3e000 { /* 0x4803e000, ap 11 56.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer9"; reg = <0x3e000 0x4>, <0x3e010 0x4>; reg-names = "rev", "sysc";
@@ -1713,7 +1709,6 @@ i2c5: i2c@0 { target-module@86000 { /* 0x48086000, ap 41 5e.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer10"; reg = <0x86000 0x4>, <0x86010 0x4>; reg-names = "rev", "sysc";
@@ -1742,7 +1737,6 @@ timer10: timer@0 { target-module@88000 { /* 0x48088000, ap 43 66.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer11"; reg = <0x88000 0x4>, <0x88010 0x4>; reg-names = "rev", "sysc";
arch/arm/mach-omap2/omap_hwmod_54xx_data.c +0 -257
281 lines not on this page · raw message
Signature · 1 line
2.24.0
Tony Lindgren
maintainerPATCH 8/9 ARM: OMAP2+: Drop legacy platform data for am3 and am4 timers except timer1 and 2
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 | 5 -- arch/arm/boot/dts/am437x-l4.dtsi | 9 -- .../omap_hwmod_33xx_43xx_common_data.h | 10 --- .../omap_hwmod_33xx_43xx_interconnect_data.c | 40 --------- .../omap_hwmod_33xx_43xx_ipblock_data.c | 70 --------------- arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 5 -- arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 89 ------------------- 7 files changed, 228 deletions(-)
arch/arm/boot/dts/am33xx-l4.dtsi +0 -5
@@ -1134,7 +1134,6 @@ timer2: timer@0 { target-module@42000 { /* 0x48042000, ap 24 1c.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer3"; reg = <0x42000 0x4>, <0x42010 0x4>, <0x42014 0x4>;
@@ -1160,7 +1159,6 @@ timer3: timer@0 { target-module@44000 { /* 0x48044000, ap 26 26.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer4"; reg = <0x44000 0x4>, <0x44010 0x4>, <0x44014 0x4>;
@@ -1187,7 +1185,6 @@ timer4: timer@0 { target-module@46000 { /* 0x48046000, ap 28 28.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer5"; reg = <0x46000 0x4>, <0x46010 0x4>, <0x46014 0x4>;
@@ -1214,7 +1211,6 @@ timer5: timer@0 { target-module@48000 { /* 0x48048000, ap 30 22.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer6"; reg = <0x48000 0x4>, <0x48010 0x4>, <0x48014 0x4>;
@@ -1241,7 +1237,6 @@ timer6: timer@0 { target-module@4a000 { /* 0x4804a000, ap 85 60.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer7"; reg = <0x4a000 0x4>, <0x4a010 0x4>, <0x4a014 0x4>;
arch/arm/boot/dts/am437x-l4.dtsi +0 -9
@@ -900,7 +900,6 @@ timer2: timer@0 { target-module@42000 { /* 0x48042000, ap 20 24.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer3"; reg = <0x42000 0x4>, <0x42010 0x4>, <0x42014 0x4>;
@@ -927,7 +926,6 @@ timer3: timer@0 { target-module@44000 { /* 0x48044000, ap 22 26.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer4"; reg = <0x44000 0x4>, <0x44010 0x4>, <0x44014 0x4>;
@@ -955,7 +953,6 @@ timer4: timer@0 { target-module@46000 { /* 0x48046000, ap 24 28.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer5"; reg = <0x46000 0x4>, <0x46010 0x4>, <0x46014 0x4>;
@@ -983,7 +980,6 @@ timer5: timer@0 { target-module@48000 { /* 0x48048000, ap 26 1a.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer6"; reg = <0x48000 0x4>, <0x48010 0x4>, <0x48014 0x4>;
@@ -1011,7 +1007,6 @@ timer6: timer@0 { target-module@4a000 { /* 0x4804a000, ap 71 48.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer7"; reg = <0x4a000 0x4>, <0x4a010 0x4>, <0x4a014 0x4>;
@@ -1527,7 +1522,6 @@ gpio3: gpio@0 { target-module@c1000 { /* 0x481c1000, ap 94 68.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer8"; reg = <0xc1000 0x4>, <0xc1010 0x4>, <0xc1014 0x4>;
@@ -2162,7 +2156,6 @@ target-module@2a000 { /* 0x4832a000, ap 88 3c.0 */ target-module@3d000 { /* 0x4833d000, ap 102 6e.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer9"; reg = <0x3d000 0x4>, <0x3d010 0x4>, <0x3d014 0x4>;
@@ -2189,7 +2182,6 @@ timer9: timer@0 { target-module@3f000 { /* 0x4833f000, ap 104 5c.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer10"; reg = <0x3f000 0x4>, <0x3f010 0x4>, <0x3f014 0x4>;
@@ -2216,7 +2208,6 @@ timer10: timer@0 { target-module@41000 { /* 0x48341000, ap 106 76.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer11"; reg = <0x41000 0x4>, <0x41010 0x4>, <0x41014 0x4>;
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h +0 -10
@@ -39,11 +39,6 @@ extern struct omap_hwmod_ocp_if am33xx_l4_ls__spinlock;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; -extern struct omap_hwmod_ocp_if am33xx_l4_ls__timer3; -extern struct omap_hwmod_ocp_if am33xx_l4_ls__timer4; -extern struct omap_hwmod_ocp_if am33xx_l4_ls__timer5; -extern struct omap_hwmod_ocp_if am33xx_l4_ls__timer6; -extern struct omap_hwmod_ocp_if am33xx_l4_ls__timer7;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;
@@ -75,11 +70,6 @@ extern struct omap_hwmod am33xx_spi1_hwmod;extern struct omap_hwmod am33xx_spinlock_hwmod;extern struct omap_hwmod am33xx_timer1_hwmod;extern struct omap_hwmod am33xx_timer2_hwmod; -extern struct omap_hwmod am33xx_timer3_hwmod; -extern struct omap_hwmod am33xx_timer4_hwmod; -extern struct omap_hwmod am33xx_timer5_hwmod; -extern struct omap_hwmod am33xx_timer6_hwmod; -extern struct omap_hwmod am33xx_timer7_hwmod;extern struct omap_hwmod am33xx_tpcc_hwmod;extern struct omap_hwmod am33xx_tptc0_hwmod;extern struct omap_hwmod am33xx_tptc1_hwmod;
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c +0 -40
@@ -190,46 +190,6 @@ struct omap_hwmod_ocp_if am33xx_l4_ls__timer2 = { .user = OCP_USER_MPU, }; -/* l4 per -> timer3 */ -struct omap_hwmod_ocp_if am33xx_l4_ls__timer3 = { - .master = &am33xx_l4_ls_hwmod, - .slave = &am33xx_timer3_hwmod, - .clk ="l4ls_gclk" , - .user =OCP_USER_MPU , -}; - -/* l4 per -> timer4 */ -struct omap_hwmod_ocp_if am33xx_l4_ls__timer4 = { - .master = &am33xx_l4_ls_hwmod, - .slave = &am33xx_timer4_hwmod, - .clk ="l4ls_gclk" , - .user =OCP_USER_MPU , -}; - -/* l4 per -> timer5 */ -struct omap_hwmod_ocp_if am33xx_l4_ls__timer5 = { - .master = &am33xx_l4_ls_hwmod, - .slave = &am33xx_timer5_hwmod, - .clk ="l4ls_gclk" , - .user =OCP_USER_MPU , -}; - -/* l4 per -> timer6 */ -struct omap_hwmod_ocp_if am33xx_l4_ls__timer6 = { - .master = &am33xx_l4_ls_hwmod, - .slave = &am33xx_timer6_hwmod, - .clk ="l4ls_gclk" , - .user =OCP_USER_MPU , -}; - -/* l4 per -> timer7 */ -struct omap_hwmod_ocp_if am33xx_l4_ls__timer7 = { - .master = &am33xx_l4_ls_hwmod, - .slave = &am33xx_timer7_hwmod, - .clk ="l4ls_gclk" , - .user =OCP_USER_MPU , -}; -/* l3 main -> tpcc */ struct omap_hwmod_ocp_if am33xx_l3_main__tpcc = { .master = &am33xx_l3_main_hwmod,
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c +0 -70
88 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_33xx_data.c +0 -5
@@ -380,11 +380,6 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = { &am33xx_l4_per__dcan0, &am33xx_l4_per__dcan1, &am33xx_l4_ls__timer2, - &am33xx_l4_ls__timer3, - &am33xx_l4_ls__timer4, - &am33xx_l4_ls__timer5, - &am33xx_l4_ls__timer6, - &am33xx_l4_ls__timer7, &am33xx_l3_main__tpcc, &am33xx_l4_ls__spinlock, &am33xx_l4_ls__elm,
arch/arm/mach-omap2/omap_hwmod_43xx_data.c +0 -89
113 lines not on this page · raw message
Signature · 1 line
2.24.0
Tony Lindgren
maintainerPATCH 9/9 ARM: OMAP2+: Drop legacy platform data for dra7 timers except timer1 to 4
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 | 12 - arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 295 ---------------------- 2 files changed, 307 deletions(-)
arch/arm/boot/dts/dra7-l4.dtsi +0 -12
@@ -1233,7 +1233,6 @@ timer4: timer@0 { target-module@3e000 { /* 0x4803e000, ap 11 56.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer9"; reg = <0x3e000 0x4>, <0x3e010 0x4>; reg-names = "rev", "sysc";
@@ -1842,7 +1841,6 @@ i2c5: i2c@0 { target-module@86000 { /* 0x48086000, ap 41 5e.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer10"; reg = <0x86000 0x4>, <0x86010 0x4>; reg-names = "rev", "sysc";
@@ -1870,7 +1868,6 @@ timer10: timer@0 { target-module@88000 { /* 0x48088000, ap 43 66.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer11"; reg = <0x88000 0x4>, <0x88010 0x4>; reg-names = "rev", "sysc";
@@ -3357,7 +3354,6 @@ target-module@1e000 { /* 0x4881e000, ap 93 2c.0 */ target-module@20000 { /* 0x48820000, ap 5 08.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer5"; reg = <0x20000 0x4>, <0x20010 0x4>; reg-names = "rev", "sysc";
@@ -3385,7 +3381,6 @@ timer5: timer@0 { target-module@22000 { /* 0x48822000, ap 7 24.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer6"; reg = <0x22000 0x4>, <0x22010 0x4>; reg-names = "rev", "sysc";
@@ -3413,7 +3408,6 @@ timer6: timer@0 { target-module@24000 { /* 0x48824000, ap 9 26.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer7"; reg = <0x24000 0x4>, <0x24010 0x4>; reg-names = "rev", "sysc";
@@ -3441,7 +3435,6 @@ timer7: timer@0 { target-module@26000 { /* 0x48826000, ap 11 0c.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer8"; reg = <0x26000 0x4>, <0x26010 0x4>; reg-names = "rev", "sysc";
@@ -3469,7 +3462,6 @@ timer8: timer@0 { target-module@28000 { /* 0x48828000, ap 13 16.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer13"; reg = <0x28000 0x4>, <0x28010 0x4>; reg-names = "rev", "sysc";
@@ -3497,7 +3489,6 @@ timer13: timer@0 { target-module@2a000 { /* 0x4882a000, ap 15 10.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer14"; reg = <0x2a000 0x4>, <0x2a010 0x4>; reg-names = "rev", "sysc";
@@ -3525,7 +3516,6 @@ timer14: timer@0 { target-module@2c000 { /* 0x4882c000, ap 17 02.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer15"; reg = <0x2c000 0x4>, <0x2c010 0x4>; reg-names = "rev", "sysc";
@@ -3553,7 +3543,6 @@ timer15: timer@0 { target-module@2e000 { /* 0x4882e000, ap 19 14.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer16"; reg = <0x2e000 0x4>, <0x2e010 0x4>; reg-names = "rev", "sysc";
@@ -4453,7 +4442,6 @@ segment@20000 { /* 0x4ae20000 */ target-module@0 { /* 0x4ae20000, ap 19 08.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer12"; reg = <0x0 0x4>, <0x10 0x4>; reg-names = "rev", "sysc";
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +0 -295
324 lines not on this page · raw message
Signature · 1 line
2.24.0
Re: [PATCH 9/9] ARM: OMAP2+: Drop legacy platform data for dra7 timers except timer1 to 4
Quoted 439 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.
Cc Keerthy <[email protected]>Cc Tero Kristo <[email protected]>Signed-off-by Tony Lindgren <[email protected]>--- arch/arm/boot/dts/dra7-l4.dtsi | 12 - arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 295 ---------------------- 2 files changed, 307 deletions(-)arch/arm/boot/dts/dra7-l4.dtsi +0
-12@@ -1233,7 +1233,6 @@ timer4: timer@0 { target-module@3e000 { /* 0x4803e000, ap 11 56.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer9"; reg = <0x3e000 0x4>, <0x3e010 0x4>; reg-names = "rev", "sysc";@@ -1842,7 +1841,6 @@ i2c5: i2c@0 { target-module@86000 { /* 0x48086000, ap 41 5e.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer10"; reg = <0x86000 0x4>, <0x86010 0x4>; reg-names = "rev", "sysc";@@ -1870,7 +1868,6 @@ timer10: timer@0 { target-module@88000 { /* 0x48088000, ap 43 66.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer11"; reg = <0x88000 0x4>, <0x88010 0x4>; reg-names = "rev", "sysc";@@ -3357,7 +3354,6 @@ target-module@1e000 { /* 0x4881e000, ap 93 2c.0 */ target-module@20000 { /* 0x48820000, ap 5 08.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer5"; reg = <0x20000 0x4>, <0x20010 0x4>; reg-names = "rev", "sysc";@@ -3385,7 +3381,6 @@ timer5: timer@0 { target-module@22000 { /* 0x48822000, ap 7 24.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer6"; reg = <0x22000 0x4>, <0x22010 0x4>; reg-names = "rev", "sysc";@@ -3413,7 +3408,6 @@ timer6: timer@0 { target-module@24000 { /* 0x48824000, ap 9 26.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer7"; reg = <0x24000 0x4>, <0x24010 0x4>; reg-names = "rev", "sysc";@@ -3441,7 +3435,6 @@ timer7: timer@0 { target-module@26000 { /* 0x48826000, ap 11 0c.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer8"; reg = <0x26000 0x4>, <0x26010 0x4>; reg-names = "rev", "sysc";@@ -3469,7 +3462,6 @@ timer8: timer@0 { target-module@28000 { /* 0x48828000, ap 13 16.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer13"; reg = <0x28000 0x4>, <0x28010 0x4>; reg-names = "rev", "sysc";@@ -3497,7 +3489,6 @@ timer13: timer@0 { target-module@2a000 { /* 0x4882a000, ap 15 10.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer14"; reg = <0x2a000 0x4>, <0x2a010 0x4>; reg-names = "rev", "sysc";@@ -3525,7 +3516,6 @@ timer14: timer@0 { target-module@2c000 { /* 0x4882c000, ap 17 02.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer15"; reg = <0x2c000 0x4>, <0x2c010 0x4>; reg-names = "rev", "sysc";@@ -3553,7 +3543,6 @@ timer15: timer@0 { target-module@2e000 { /* 0x4882e000, ap 19 14.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer16"; reg = <0x2e000 0x4>, <0x2e010 0x4>; reg-names = "rev", "sysc";@@ -4453,7 +4442,6 @@ segment@20000 { /* 0x4ae20000 */ target-module@0 { /* 0x4ae20000, ap 19 08.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer12"; reg = <0x0 0x4>, <0x10 0x4>; reg-names = "rev", "sysc";arch/arm/mach-omap2/omap_hwmod_7xx_data.c +0
-292@@ -1157,185 +1157,6 @@ static struct omap_hwmod dra7xx_timer4_hwmod = { }, }; -/* timer5 */ -static struct omap_hwmod dra7xx_timer5_hwmod = { - .name ="timer5" , - .class = &dra7xx_timer_hwmod_class, - .clkdm_name ="ipu_clkdm" , - .main_clk ="timer5_gfclk_mux" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_IPU_TIMER5_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_IPU_TIMER5_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* timer6 */ -static struct omap_hwmod dra7xx_timer6_hwmod = { - .name ="timer6" , - .class = &dra7xx_timer_hwmod_class, - .clkdm_name ="ipu_clkdm" , - .main_clk ="timer6_gfclk_mux" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_IPU_TIMER6_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_IPU_TIMER6_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* timer7 */ -static struct omap_hwmod dra7xx_timer7_hwmod = { - .name ="timer7" , - .class = &dra7xx_timer_hwmod_class, - .clkdm_name ="ipu_clkdm" , - .main_clk ="timer7_gfclk_mux" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_IPU_TIMER7_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_IPU_TIMER7_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* timer8 */ -static struct omap_hwmod dra7xx_timer8_hwmod = { - .name ="timer8" , - .class = &dra7xx_timer_hwmod_class, - .clkdm_name ="ipu_clkdm" , - .main_clk ="timer8_gfclk_mux" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_IPU_TIMER8_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_IPU_TIMER8_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* timer9 */ -static struct omap_hwmod dra7xx_timer9_hwmod = { - .name ="timer9" , - .class = &dra7xx_timer_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .main_clk ="timer9_gfclk_mux" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_L4PER_TIMER9_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_L4PER_TIMER9_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* timer10 */ -static struct omap_hwmod dra7xx_timer10_hwmod = { - .name ="timer10" , - .class = &dra7xx_timer_1ms_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .main_clk ="timer10_gfclk_mux" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_L4PER_TIMER10_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_L4PER_TIMER10_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* timer11 */ -static struct omap_hwmod dra7xx_timer11_hwmod = { - .name ="timer11" , - .class = &dra7xx_timer_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .main_clk ="timer11_gfclk_mux" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_L4PER_TIMER11_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_L4PER_TIMER11_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* timer12 */ -static struct omap_hwmod dra7xx_timer12_hwmod = { - .name ="timer12" , - .class = &dra7xx_timer_hwmod_class, - .clkdm_name ="wkupaon_clkdm" , - .main_clk ="secure_32k_clk_src_ck" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_WKUPAON_TIMER12_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_WKUPAON_TIMER12_CONTEXT_OFFSET , - }, - }, -}; - -/* timer13 */ -static struct omap_hwmod dra7xx_timer13_hwmod = { - .name ="timer13" , - .class = &dra7xx_timer_hwmod_class, - .clkdm_name ="l4per3_clkdm" , - .main_clk ="timer13_gfclk_mux" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_L4PER3_TIMER13_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_L4PER3_TIMER13_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* timer14 */ -static struct omap_hwmod dra7xx_timer14_hwmod = { - .name ="timer14" , - .class = &dra7xx_timer_hwmod_class, - .clkdm_name ="l4per3_clkdm" , - .main_clk ="timer14_gfclk_mux" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_L4PER3_TIMER14_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_L4PER3_TIMER14_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* timer15 */ -static struct omap_hwmod dra7xx_timer15_hwmod = { - .name ="timer15" , - .class = &dra7xx_timer_hwmod_class, - .clkdm_name ="l4per3_clkdm" , - .main_clk ="timer15_gfclk_mux" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_L4PER3_TIMER15_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_L4PER3_TIMER15_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* timer16 */ -static struct omap_hwmod dra7xx_timer16_hwmod = { - .name ="timer16" , - .class = &dra7xx_timer_hwmod_class, - .clkdm_name ="l4per3_clkdm" , - .main_clk ="timer16_gfclk_mux" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_L4PER3_TIMER16_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_L4PER3_TIMER16_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; -/* * 'usb_otg_ss' class * @@ -1818,102 +1639,6 @@ static struct omap_hwmod_ocp_if dra7xx_l4_per1__timer4 = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -/* l4_per3 -> timer5 */ -static struct omap_hwmod_ocp_if dra7xx_l4_per3__timer5 = { - .master = &dra7xx_l4_per3_hwmod, - .slave = &dra7xx_timer5_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per3 -> timer6 */ -static struct omap_hwmod_ocp_if dra7xx_l4_per3__timer6 = { - .master = &dra7xx_l4_per3_hwmod, - .slave = &dra7xx_timer6_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per3 -> timer7 */ -static struct omap_hwmod_ocp_if dra7xx_l4_per3__timer7 = { - .master = &dra7xx_l4_per3_hwmod, - .slave = &dra7xx_timer7_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per3 -> timer8 */ -static struct omap_hwmod_ocp_if dra7xx_l4_per3__timer8 = { - .master = &dra7xx_l4_per3_hwmod, - .slave = &dra7xx_timer8_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per1 -> timer9 */ -static struct omap_hwmod_ocp_if dra7xx_l4_per1__timer9 = { - .master = &dra7xx_l4_per1_hwmod, - .slave = &dra7xx_timer9_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per1 -> timer10 */ -static struct omap_hwmod_ocp_if dra7xx_l4_per1__timer10 = { - .master = &dra7xx_l4_per1_hwmod, - .slave = &dra7xx_timer10_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per1 -> timer11 */ -static struct omap_hwmod_ocp_if dra7xx_l4_per1__timer11 = { - .master = &dra7xx_l4_per1_hwmod, - .slave = &dra7xx_timer11_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_wkup -> timer12 */ -static struct omap_hwmod_ocp_if dra7xx_l4_wkup__timer12 = { - .master = &dra7xx_l4_wkup_hwmod, - .slave = &dra7xx_timer12_hwmod, - .clk ="wkupaon_iclk_mux" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per3 -> timer13 */ -static struct omap_hwmod_ocp_if dra7xx_l4_per3__timer13 = { - .master = &dra7xx_l4_per3_hwmod, - .slave = &dra7xx_timer13_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per3 -> timer14 */ -static struct omap_hwmod_ocp_if dra7xx_l4_per3__timer14 = { - .master = &dra7xx_l4_per3_hwmod, - .slave = &dra7xx_timer14_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per3 -> timer15 */ -static struct omap_hwmod_ocp_if dra7xx_l4_per3__timer15 = { - .master = &dra7xx_l4_per3_hwmod, - .slave = &dra7xx_timer15_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per3 -> timer16 */ -static struct omap_hwmod_ocp_if dra7xx_l4_per3__timer16 = { - .master = &dra7xx_l4_per3_hwmod, - .slave = &dra7xx_timer16_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; -/* l4_per3 -> usb_otg_ss1 */ static struct omap_hwmod_ocp_if dra7xx_l4_per3__usb_otg_ss1 = { .master = &dra7xx_l4_per3_hwmod,@@ -2045,17 +1770,6 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { &dra7xx_l4_per1__timer2, &dra7xx_l4_per1__timer3, &dra7xx_l4_per1__timer4, - &dra7xx_l4_per3__timer5, - &dra7xx_l4_per3__timer6, - &dra7xx_l4_per3__timer7, - &dra7xx_l4_per3__timer8, - &dra7xx_l4_per1__timer9, - &dra7xx_l4_per1__timer10, - &dra7xx_l4_per1__timer11, - &dra7xx_l4_per3__timer13, - &dra7xx_l4_per3__timer14, - &dra7xx_l4_per3__timer15, - &dra7xx_l4_per3__timer16, &dra7xx_l4_per3__usb_otg_ss1, &dra7xx_l4_per3__usb_otg_ss2, &dra7xx_l4_per3__usb_otg_ss3,@@ -2069,12 +1783,6 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { NULL, }; -/* GP-only hwmod links */ -static struct omap_hwmod_ocp_if *dra7xx_gp_hwmod_ocp_ifs[]__initdata = { - &dra7xx_l4_wkup__timer12, -NULL , -}; -/* SoC variant specific hwmod links */ static struct omap_hwmod_ocp_if *dra76x_hwmod_ocp_ifs[]__initdata = { &dra7xx_l4_per3__usb_otg_ss4,
arch/arm/mach-omap2/omap_hwmod_7xx_data.c int __init dra7xx_hwmod_init(void) · line 2129
Quoted 6 lines
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +0
-3@@ -2124,8 +1832,5 @@ int __init dra7xx_hwmod_init(void) } } -if (!ret &&omap_type () ==OMAP2_DEVICE_TYPE_GP ) - ret =omap_hwmod_register_links (dra7xx_gp_hwmod_ocp_ifs); -
Maybe I'm missing it but how is this logic getting replicated when using ti,sync? We runtime detect here if we are on an HS device and if so let the secure world manage these device's pm/clocks, without this the non-secure side managment will be unconditional.
Andrew
Quoted 3 lines
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +0
-0return ret; }
Re: [PATCH 9/9] ARM: OMAP2+: Drop legacy platform data for dra7 timers except timer1 to 4
Quoted 443 lines · Andrew F. Davis
Quoted 442 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.
Cc Keerthy <[email protected]>Cc Tero Kristo <[email protected]>Signed-off-by Tony Lindgren <[email protected]>--- arch/arm/boot/dts/dra7-l4.dtsi | 12 - arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 295 ---------------------- 2 files changed, 307 deletions(-)arch/arm/boot/dts/dra7-l4.dtsi +0
-12@@ -1233,7 +1233,6 @@ timer4: timer@0 { target-module@3e000 { /* 0x4803e000, ap 11 56.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer9"; reg = <0x3e000 0x4>, <0x3e010 0x4>; reg-names = "rev", "sysc";@@ -1842,7 +1841,6 @@ i2c5: i2c@0 { target-module@86000 { /* 0x48086000, ap 41 5e.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer10"; reg = <0x86000 0x4>, <0x86010 0x4>; reg-names = "rev", "sysc";@@ -1870,7 +1868,6 @@ timer10: timer@0 { target-module@88000 { /* 0x48088000, ap 43 66.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer11"; reg = <0x88000 0x4>, <0x88010 0x4>; reg-names = "rev", "sysc";@@ -3357,7 +3354,6 @@ target-module@1e000 { /* 0x4881e000, ap 93 2c.0 */ target-module@20000 { /* 0x48820000, ap 5 08.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer5"; reg = <0x20000 0x4>, <0x20010 0x4>; reg-names = "rev", "sysc";@@ -3385,7 +3381,6 @@ timer5: timer@0 { target-module@22000 { /* 0x48822000, ap 7 24.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer6"; reg = <0x22000 0x4>, <0x22010 0x4>; reg-names = "rev", "sysc";@@ -3413,7 +3408,6 @@ timer6: timer@0 { target-module@24000 { /* 0x48824000, ap 9 26.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer7"; reg = <0x24000 0x4>, <0x24010 0x4>; reg-names = "rev", "sysc";@@ -3441,7 +3435,6 @@ timer7: timer@0 { target-module@26000 { /* 0x48826000, ap 11 0c.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer8"; reg = <0x26000 0x4>, <0x26010 0x4>; reg-names = "rev", "sysc";@@ -3469,7 +3462,6 @@ timer8: timer@0 { target-module@28000 { /* 0x48828000, ap 13 16.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer13"; reg = <0x28000 0x4>, <0x28010 0x4>; reg-names = "rev", "sysc";@@ -3497,7 +3489,6 @@ timer13: timer@0 { target-module@2a000 { /* 0x4882a000, ap 15 10.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer14"; reg = <0x2a000 0x4>, <0x2a010 0x4>; reg-names = "rev", "sysc";@@ -3525,7 +3516,6 @@ timer14: timer@0 { target-module@2c000 { /* 0x4882c000, ap 17 02.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer15"; reg = <0x2c000 0x4>, <0x2c010 0x4>; reg-names = "rev", "sysc";@@ -3553,7 +3543,6 @@ timer15: timer@0 { target-module@2e000 { /* 0x4882e000, ap 19 14.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer16"; reg = <0x2e000 0x4>, <0x2e010 0x4>; reg-names = "rev", "sysc";@@ -4453,7 +4442,6 @@ segment@20000 { /* 0x4ae20000 */ target-module@0 { /* 0x4ae20000, ap 19 08.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; - ti,hwmods = "timer12"; reg = <0x0 0x4>, <0x10 0x4>; reg-names = "rev", "sysc";arch/arm/mach-omap2/omap_hwmod_7xx_data.c +0
-292@@ -1157,185 +1157,6 @@ static struct omap_hwmod dra7xx_timer4_hwmod = { }, }; -/* timer5 */ -static struct omap_hwmod dra7xx_timer5_hwmod = { - .name ="timer5" , - .class = &dra7xx_timer_hwmod_class, - .clkdm_name ="ipu_clkdm" , - .main_clk ="timer5_gfclk_mux" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_IPU_TIMER5_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_IPU_TIMER5_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* timer6 */ -static struct omap_hwmod dra7xx_timer6_hwmod = { - .name ="timer6" , - .class = &dra7xx_timer_hwmod_class, - .clkdm_name ="ipu_clkdm" , - .main_clk ="timer6_gfclk_mux" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_IPU_TIMER6_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_IPU_TIMER6_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* timer7 */ -static struct omap_hwmod dra7xx_timer7_hwmod = { - .name ="timer7" , - .class = &dra7xx_timer_hwmod_class, - .clkdm_name ="ipu_clkdm" , - .main_clk ="timer7_gfclk_mux" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_IPU_TIMER7_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_IPU_TIMER7_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* timer8 */ -static struct omap_hwmod dra7xx_timer8_hwmod = { - .name ="timer8" , - .class = &dra7xx_timer_hwmod_class, - .clkdm_name ="ipu_clkdm" , - .main_clk ="timer8_gfclk_mux" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_IPU_TIMER8_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_IPU_TIMER8_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* timer9 */ -static struct omap_hwmod dra7xx_timer9_hwmod = { - .name ="timer9" , - .class = &dra7xx_timer_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .main_clk ="timer9_gfclk_mux" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_L4PER_TIMER9_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_L4PER_TIMER9_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* timer10 */ -static struct omap_hwmod dra7xx_timer10_hwmod = { - .name ="timer10" , - .class = &dra7xx_timer_1ms_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .main_clk ="timer10_gfclk_mux" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_L4PER_TIMER10_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_L4PER_TIMER10_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* timer11 */ -static struct omap_hwmod dra7xx_timer11_hwmod = { - .name ="timer11" , - .class = &dra7xx_timer_hwmod_class, - .clkdm_name ="l4per_clkdm" , - .main_clk ="timer11_gfclk_mux" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_L4PER_TIMER11_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_L4PER_TIMER11_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* timer12 */ -static struct omap_hwmod dra7xx_timer12_hwmod = { - .name ="timer12" , - .class = &dra7xx_timer_hwmod_class, - .clkdm_name ="wkupaon_clkdm" , - .main_clk ="secure_32k_clk_src_ck" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_WKUPAON_TIMER12_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_WKUPAON_TIMER12_CONTEXT_OFFSET , - }, - }, -}; - -/* timer13 */ -static struct omap_hwmod dra7xx_timer13_hwmod = { - .name ="timer13" , - .class = &dra7xx_timer_hwmod_class, - .clkdm_name ="l4per3_clkdm" , - .main_clk ="timer13_gfclk_mux" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_L4PER3_TIMER13_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_L4PER3_TIMER13_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* timer14 */ -static struct omap_hwmod dra7xx_timer14_hwmod = { - .name ="timer14" , - .class = &dra7xx_timer_hwmod_class, - .clkdm_name ="l4per3_clkdm" , - .main_clk ="timer14_gfclk_mux" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_L4PER3_TIMER14_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_L4PER3_TIMER14_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* timer15 */ -static struct omap_hwmod dra7xx_timer15_hwmod = { - .name ="timer15" , - .class = &dra7xx_timer_hwmod_class, - .clkdm_name ="l4per3_clkdm" , - .main_clk ="timer15_gfclk_mux" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_L4PER3_TIMER15_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_L4PER3_TIMER15_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; - -/* timer16 */ -static struct omap_hwmod dra7xx_timer16_hwmod = { - .name ="timer16" , - .class = &dra7xx_timer_hwmod_class, - .clkdm_name ="l4per3_clkdm" , - .main_clk ="timer16_gfclk_mux" , - .prcm = { - .omap4 = { - .clkctrl_offs =DRA7XX_CM_L4PER3_TIMER16_CLKCTRL_OFFSET , - .context_offs =DRA7XX_RM_L4PER3_TIMER16_CONTEXT_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, -}; -/* * 'usb_otg_ss' class * @@ -1818,102 +1639,6 @@ static struct omap_hwmod_ocp_if dra7xx_l4_per1__timer4 = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -/* l4_per3 -> timer5 */ -static struct omap_hwmod_ocp_if dra7xx_l4_per3__timer5 = { - .master = &dra7xx_l4_per3_hwmod, - .slave = &dra7xx_timer5_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per3 -> timer6 */ -static struct omap_hwmod_ocp_if dra7xx_l4_per3__timer6 = { - .master = &dra7xx_l4_per3_hwmod, - .slave = &dra7xx_timer6_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per3 -> timer7 */ -static struct omap_hwmod_ocp_if dra7xx_l4_per3__timer7 = { - .master = &dra7xx_l4_per3_hwmod, - .slave = &dra7xx_timer7_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per3 -> timer8 */ -static struct omap_hwmod_ocp_if dra7xx_l4_per3__timer8 = { - .master = &dra7xx_l4_per3_hwmod, - .slave = &dra7xx_timer8_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per1 -> timer9 */ -static struct omap_hwmod_ocp_if dra7xx_l4_per1__timer9 = { - .master = &dra7xx_l4_per1_hwmod, - .slave = &dra7xx_timer9_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per1 -> timer10 */ -static struct omap_hwmod_ocp_if dra7xx_l4_per1__timer10 = { - .master = &dra7xx_l4_per1_hwmod, - .slave = &dra7xx_timer10_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per1 -> timer11 */ -static struct omap_hwmod_ocp_if dra7xx_l4_per1__timer11 = { - .master = &dra7xx_l4_per1_hwmod, - .slave = &dra7xx_timer11_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_wkup -> timer12 */ -static struct omap_hwmod_ocp_if dra7xx_l4_wkup__timer12 = { - .master = &dra7xx_l4_wkup_hwmod, - .slave = &dra7xx_timer12_hwmod, - .clk ="wkupaon_iclk_mux" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per3 -> timer13 */ -static struct omap_hwmod_ocp_if dra7xx_l4_per3__timer13 = { - .master = &dra7xx_l4_per3_hwmod, - .slave = &dra7xx_timer13_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per3 -> timer14 */ -static struct omap_hwmod_ocp_if dra7xx_l4_per3__timer14 = { - .master = &dra7xx_l4_per3_hwmod, - .slave = &dra7xx_timer14_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per3 -> timer15 */ -static struct omap_hwmod_ocp_if dra7xx_l4_per3__timer15 = { - .master = &dra7xx_l4_per3_hwmod, - .slave = &dra7xx_timer15_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4_per3 -> timer16 */ -static struct omap_hwmod_ocp_if dra7xx_l4_per3__timer16 = { - .master = &dra7xx_l4_per3_hwmod, - .slave = &dra7xx_timer16_hwmod, - .clk ="l3_iclk_div" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; -/* l4_per3 -> usb_otg_ss1 */ static struct omap_hwmod_ocp_if dra7xx_l4_per3__usb_otg_ss1 = { .master = &dra7xx_l4_per3_hwmod,@@ -2045,17 +1770,6 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { &dra7xx_l4_per1__timer2, &dra7xx_l4_per1__timer3, &dra7xx_l4_per1__timer4, - &dra7xx_l4_per3__timer5, - &dra7xx_l4_per3__timer6, - &dra7xx_l4_per3__timer7, - &dra7xx_l4_per3__timer8, - &dra7xx_l4_per1__timer9, - &dra7xx_l4_per1__timer10, - &dra7xx_l4_per1__timer11, - &dra7xx_l4_per3__timer13, - &dra7xx_l4_per3__timer14, - &dra7xx_l4_per3__timer15, - &dra7xx_l4_per3__timer16, &dra7xx_l4_per3__usb_otg_ss1, &dra7xx_l4_per3__usb_otg_ss2, &dra7xx_l4_per3__usb_otg_ss3,@@ -2069,12 +1783,6 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { NULL, }; -/* GP-only hwmod links */ -static struct omap_hwmod_ocp_if *dra7xx_gp_hwmod_ocp_ifs[]__initdata = { - &dra7xx_l4_wkup__timer12, -NULL , -}; -/* SoC variant specific hwmod links */ static struct omap_hwmod_ocp_if *dra76x_hwmod_ocp_ifs[]__initdata = { &dra7xx_l4_per3__usb_otg_ss4,@@ -2124,8 +1832,5 @@ int __init dra7xx_hwmod_init(void) } }
Quoted 9 lines
arch/arm/mach-omap2/omap_hwmod_7xx_data.c int __init dra7xx_hwmod_init(void) · line 2129
Quoted 3 lines
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +0
-3-if (!ret &&omap_type () ==OMAP2_DEVICE_TYPE_GP ) - ret =omap_hwmod_register_links (dra7xx_gp_hwmod_ocp_ifs); -Maybe I'm missing it but how is this logic getting replicated when using ti,sync? We runtime detect here if we are on an HS device and if so let the secure world manage these device's pm/clocks, without this the non-secure side managment will be unconditional.
This is handled by the clkctrl driver itself. timer12 is marked as NON-SEC device supported only, so it doesn't get registered on HS chips.
I guess the lack of the clock fails the ti-sysc part of the registration logic also. Tony?
-Tero
--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Tony Lindgren
maintainerRe: [PATCH 9/9] ARM: OMAP2+: Drop legacy platform data for dra7 timers except timer1 to 4
Quoted 9 lines · Tero Kristo
Quoted 8 lines · Andrew F. Davis
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.
...
Quoted 25 lines
Quoted 16 lines
Quoted 16 lines
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +0
-7@@ -2069,12 +1783,6 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { NULL, }; -/* GP-only hwmod links */ -static struct omap_hwmod_ocp_if *dra7xx_gp_hwmod_ocp_ifs[]__initdata = { - &dra7xx_l4_wkup__timer12, -NULL , -}; -/* SoC variant specific hwmod links */ static struct omap_hwmod_ocp_if *dra76x_hwmod_ocp_ifs[]__initdata = { &dra7xx_l4_per3__usb_otg_ss4,@@ -2124,8 +1832,5 @@ int __init dra7xx_hwmod_init(void) } } -if (!ret &&omap_type () ==OMAP2_DEVICE_TYPE_GP )Quoted 8 lines
arch/arm/mach-omap2/omap_hwmod_7xx_data.c int __init dra7xx_hwmod_init(void) · line 2129
Quoted 2 lines
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +0
-2- ret =omap_hwmod_register_links (dra7xx_gp_hwmod_ocp_ifs); -Maybe I'm missing it but how is this logic getting replicated when using ti,sync? We runtime detect here if we are on an HS device and if so let the secure world manage these device's pm/clocks, without this the non-secure side managment will be unconditional.
Quoted 5 lines
This is handled by the clkctrl driver itself. timer12 is marked as NON-SEC device supported only, so it doesn't get registered on HS chips.
I guess the lack of the clock fails the ti-sysc part of the registration logic also. Tony?
Yes it should bail out with a clock error. To avoid an error for that in dmesg the timer needs to be tagged with status = "disabled" though.
For drivers, we have soc_device_match() to use that should work for detecting SoCs type on boot. Maybe cat /sys/bus/soc/devices/soc0/type to confirm this as I don't think we're currently using it for detecting HS SoCs anywhere.
Regards,
Tony
Quoted 11 lines · Tony Lindgren
Hi all,
This series updates l4-abe devices and non-system timers to probe with ti-sysc.
After this series we now have l4-abe instances with all devices probing with dts data and ti-sysc driver. So for omap4 and 5, l4-abe can now be used to experiment with adding genpd support to
drivers/soc/ti/omap_prm.cto power down the abe domain when not in use :)Note that we cannot yet probe system timers with ti-sysc.
Hi Tony,
Boot tested on DRA72 & DRA76.
I believe this series does not impact am4/3 but still Tested for RTC+DDR mode and DS0 mode on AM437x. Tested for DS0 on am335x-evm & am335x-beagle-bone-black.
FWIW
- Keerthy
Quoted 41 lines
Regards,
Tony
Tony Lindgren (9):
ARM: OMAP2+: Drop legacy platform data for omap4 aess
ARM: OMAP2+: Drop legacy platform data for omap4 dmic
ARM: OMAP2+: Drop legacy platform data for omap4 mcpdm
ARM: OMAP2+: Drop legacy platform data for omap5 dmic
ARM: OMAP2+: Drop legacy platform data for omap5 mcpdm
ARM: OMAP2+: Drop legacy platform data for omap4 timers except timer1
ARM: OMAP2+: Drop legacy platform data for omap5 timers except timer1
ARM: OMAP2+: Drop legacy platform data for am3 and am4 timers except
timer1 and 2
ARM: OMAP2+: Drop legacy platform data for dra7 timers except timer1
to 4arch/arm/boot/dts/am33xx-l4.dtsi | 5 - arch/arm/boot/dts/am437x-l4.dtsi | 9 - arch/arm/boot/dts/dra7-l4.dtsi | 12 - arch/arm/boot/dts/omap4-l4-abe.dtsi | 7 - arch/arm/boot/dts/omap4-l4.dtsi | 6 - arch/arm/boot/dts/omap5-l4-abe.dtsi | 6 - arch/arm/boot/dts/omap5-l4.dtsi | 6 - arch/arm/mach-omap2/omap_hwmod.c | 18 - arch/arm/mach-omap2/omap_hwmod.h | 3 - .../omap_hwmod_33xx_43xx_common_data.h | 10 - .../omap_hwmod_33xx_43xx_interconnect_data.c | 40 -- .../omap_hwmod_33xx_43xx_ipblock_data.c | 70 --- arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 5 - arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 89 ---- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 421 ------------------ arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 357 --------------- arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 295 ------------ arch/arm/mach-omap2/omap_hwmod_reset.c | 24 - include/sound/aess.h | 53 --- 19 files changed, 1436 deletions(-) delete mode 100644 include/sound/aess.h