Skip to content

Commit 989286f

Browse files
olofjolofj
committed
Merge tag 'omap-for-v5.10/ti-sysc-drop-pdata-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc
Add initial genpd support for omaps to drop more platform data We now drop legacy platform data for RTC on am3, am4 and dra7. And we add initial genpd support for PRM (Power and Reset Manager) and use it to drop legacy platform data for am3 sgx and omap4/5 l4_abe interconnect instance. * tag 'omap-for-v5.10/ti-sysc-drop-pdata-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Drop legacy platform data for dra7 rtcss ARM: OMAP2+: Drop legacy platform data for am3 and am4 rtc soc: ti: pm33xx: Simplify RTC usage to prepare to drop platform data ARM: dts: Configure omap4 and 5 l4_abe for genpd and drop platform data ARM: dts: Configure am3 and am4 sgx for genpd and drop platform data soc: ti: omap-prm: Configure omap4 and 5 l4_abe power domain soc: ti: omap-prm: Configure sgx power domain for am3 and am4 soc: ti: omap-prm: Add basic power domain support dt-bindings: omap: Update PRM binding for genpd Link: https://lore.kernel.org/r/pull-1599132307-761202@atomide.com-2 Signed-off-by: Olof Johansson <olof@lixom.net>
2 parents 63e850f + 0d7ce5c commit 989286f

24 files changed

Lines changed: 345 additions & 268 deletions

‎Documentation/devicetree/bindings/arm/omap/prm-inst.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@ Required properties:
1818
(base address and length)
1919

2020
Optional properties:
21+
- #power-domain-cells: Should be 0 if the instance is a power domain provider.
2122
- #reset-cells: Should be 1 if the PRM instance in question supports resets.
2223

2324
Example:
2425

2526
prm_dsp2: prm@1b00 {
2627
compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
2728
reg = <0x1b00 0x40>;
29+
#power-domain-cells = <0>;
2830
#reset-cells = <1>;
2931
};

‎arch/arm/boot/dts/am33xx-l4.dtsi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,6 @@
425425

426426
target-module@3e000 { /* 0x44e3e000, ap 35 60.0 */
427427
compatible = "ti,sysc-omap4-simple", "ti,sysc";
428-
ti,hwmods = "rtc";
429428
reg = <0x3e074 0x4>,
430429
<0x3e078 0x4>;
431430
reg-names = "rev", "sysc";

‎arch/arm/boot/dts/am33xx.dtsi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,7 @@
578578
<SYSC_IDLE_SMART>;
579579
clocks = <&gfx_l3_clkctrl AM3_GFX_L3_GFX_CLKCTRL 0>;
580580
clock-names = "fck";
581+
power-domains = <&prm_gfx>;
581582
resets = <&prm_gfx 0>;
582583
reset-names = "rstctrl";
583584
#address-cells = <1>;
@@ -617,6 +618,7 @@
617618
prm_gfx: prm@1100 {
618619
compatible = "ti,am3-prm-inst", "ti,omap-prm-inst";
619620
reg = <0x1100 0x100>;
621+
#power-domain-cells = <0>;
620622
#reset-cells = <1>;
621623
};
622624
};

‎arch/arm/boot/dts/am4372.dtsi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,7 @@
517517
<SYSC_IDLE_SMART>;
518518
clocks = <&gfx_l3_clkctrl AM4_GFX_L3_GFX_CLKCTRL 0>;
519519
clock-names = "fck";
520+
power-domains = <&prm_gfx>;
520521
resets = <&prm_gfx 0>;
521522
reset-names = "rstctrl";
522523
#address-cells = <1>;
@@ -533,6 +534,7 @@
533534
prm_gfx: prm@400 {
534535
compatible = "ti,am4-prm-inst", "ti,omap-prm-inst";
535536
reg = <0x400 0x100>;
537+
#power-domain-cells = <0>;
536538
#reset-cells = <1>;
537539
};
538540

‎arch/arm/boot/dts/am437x-l4.dtsi‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,9 +409,8 @@
409409
ranges = <0x0 0x39000 0x1000>;
410410
};
411411

412-
target-module@3e000 { /* 0x44e3e000, ap 34 60.0 */
412+
rtc_target: target-module@3e000 { /* 0x44e3e000, ap 34 60.0 */
413413
compatible = "ti,sysc-omap4-simple", "ti,sysc";
414-
ti,hwmods = "rtc";
415414
reg = <0x3e074 0x4>,
416415
<0x3e078 0x4>;
417416
reg-names = "rev", "sysc";

‎arch/arm/boot/dts/am43x-epos-evm.dts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -833,6 +833,10 @@
833833
status = "okay";
834834
};
835835

836+
&rtc_target {
837+
status = "disabled";
838+
};
839+
836840
&tscadc {
837841
status = "okay";
838842

‎arch/arm/boot/dts/dra7-l4.dtsi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3561,7 +3561,6 @@
35613561

35623562
rtctarget: target-module@38000 { /* 0x48838000, ap 29 12.0 */
35633563
compatible = "ti,sysc-omap4-simple", "ti,sysc";
3564-
ti,hwmods = "rtcss";
35653564
reg = <0x38074 0x4>,
35663565
<0x38078 0x4>;
35673566
reg-names = "rev", "sysc";

‎arch/arm/boot/dts/omap4-l4-abe.dtsi‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
&l4_abe { /* 0x40100000 */
2-
compatible = "ti,omap4-l4-abe", "simple-bus";
2+
compatible = "ti,omap4-l4-abe", "simple-pm-bus";
33
reg = <0x40100000 0x400>,
44
<0x40100400 0x400>;
55
reg-names = "la", "ap";
6+
power-domains = <&prm_abe>;
7+
/* OMAP4_L4_ABE_CLKCTRL is read-only */
68
#address-cells = <1>;
79
#size-cells = <1>;
810
ranges = <0x00000000 0x40100000 0x100000>, /* segment 0 */
911
<0x49000000 0x49000000 0x100000>;
1012
segment@0 { /* 0x40100000 */
11-
compatible = "simple-bus";
13+
compatible = "simple-pm-bus";
1214
#address-cells = <1>;
1315
#size-cells = <1>;
1416
ranges =

‎arch/arm/boot/dts/omap4.dtsi‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -658,6 +658,12 @@
658658
#reset-cells = <1>;
659659
};
660660

661+
prm_abe: prm@500 {
662+
compatible = "ti,omap4-prm-inst", "ti,omap-prm-inst";
663+
reg = <0x500 0x100>;
664+
#power-domain-cells = <0>;
665+
};
666+
661667
prm_core: prm@700 {
662668
compatible = "ti,omap4-prm-inst", "ti,omap-prm-inst";
663669
reg = <0x700 0x100>;

‎arch/arm/boot/dts/omap5-l4-abe.dtsi‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
&l4_abe { /* 0x40100000 */
2-
compatible = "ti,omap5-l4-abe", "simple-bus";
2+
compatible = "ti,omap5-l4-abe", "simple-pm-bus";
33
reg = <0x40100000 0x400>,
44
<0x40100400 0x400>;
55
reg-names = "la", "ap";
6+
power-domains = <&prm_abe>;
7+
/* OMAP5_L4_ABE_CLKCTRL is read-only */
68
#address-cells = <1>;
79
#size-cells = <1>;
810
ranges = <0x00000000 0x40100000 0x100000>, /* segment 0 */
911
<0x49000000 0x49000000 0x100000>;
1012
segment@0 { /* 0x40100000 */
11-
compatible = "simple-bus";
13+
compatible = "simple-pm-bus";
1214
#address-cells = <1>;
1315
#size-cells = <1>;
1416
ranges =

0 commit comments

Comments
 (0)