diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-04-28 09:41:28 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-28 09:41:28 -0400 |
commit | b48e5aa6bc2eacf1f1b54bb6845963c8731f450f (patch) | |
tree | 656f466d3ce50e525be66a6c3a1b73b5ce93bd67 | |
parent | 6945248f34b95330700f3d2632608457abaddb18 (diff) | |
parent | 3d90bc051361c6f867df494d838d4fe1215d475a (diff) |
Merge tag 'sti-dt-for-v4.7b-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti into next/dt
Merge "STi DT updates for v4.7 #1" from Maxime Coquelin:
Highlights:
-----------
- Add CPUFreq support to STiH407 family
- Add Mailbox nodes to STiH407 family
- Add RemoteProc nodes to STiH407 family
- Use 'reserved-memory' for DMA memory on STiH407
- Use the LPC timer as a clocksource
* tag 'sti-dt-for-v4.7b-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti:
ARM: dts: STi: STih407: Switch LPC mode from RTC to Clocksource
ARM: dts: STiH407: Move over to using the 'reserved-memory' API for obtaining DMA memory
ARM: dts: STiH407: Add nodes for RemoteProc
ARM: dts: STi: stih407-family: Add nodes for Mailbox
ARM: dts: STi: STiH407: Provide CPU with a means to look-up Major number
ARM: dts: STi: STiH407: Link CPU with its voltage supply
ARM: dts: STi: STiH407: Provide CPU with clocking information
ARM: dts: STi: STiH407: Provide generic (safe) DVFS configuration
-rw-r--r-- | arch/arm/boot/dts/stih407-family.dtsi | 126 |
1 files changed, 125 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi index 81f81214cdf9..ad8ba10764a3 100644 --- a/arch/arm/boot/dts/stih407-family.dtsi +++ b/arch/arm/boot/dts/stih407-family.dtsi | |||
@@ -15,6 +15,36 @@ | |||
15 | #address-cells = <1>; | 15 | #address-cells = <1>; |
16 | #size-cells = <1>; | 16 | #size-cells = <1>; |
17 | 17 | ||
18 | reserved-memory { | ||
19 | #address-cells = <1>; | ||
20 | #size-cells = <1>; | ||
21 | ranges; | ||
22 | |||
23 | gp0_reserved: rproc@40000000 { | ||
24 | compatible = "shared-dma-pool"; | ||
25 | reg = <0x40000000 0x01000000>; | ||
26 | no-map; | ||
27 | }; | ||
28 | |||
29 | gp1_reserved: rproc@41000000 { | ||
30 | compatible = "shared-dma-pool"; | ||
31 | reg = <0x41000000 0x01000000>; | ||
32 | no-map; | ||
33 | }; | ||
34 | |||
35 | audio_reserved: rproc@42000000 { | ||
36 | compatible = "shared-dma-pool"; | ||
37 | reg = <0x42000000 0x01000000>; | ||
38 | no-map; | ||
39 | }; | ||
40 | |||
41 | dmu_reserved: rproc@43000000 { | ||
42 | compatible = "shared-dma-pool"; | ||
43 | reg = <0x43000000 0x01000000>; | ||
44 | no-map; | ||
45 | }; | ||
46 | }; | ||
47 | |||
18 | cpus { | 48 | cpus { |
19 | #address-cells = <1>; | 49 | #address-cells = <1>; |
20 | #size-cells = <0>; | 50 | #size-cells = <0>; |
@@ -22,15 +52,35 @@ | |||
22 | device_type = "cpu"; | 52 | device_type = "cpu"; |
23 | compatible = "arm,cortex-a9"; | 53 | compatible = "arm,cortex-a9"; |
24 | reg = <0>; | 54 | reg = <0>; |
55 | |||
25 | /* u-boot puts hpen in SBC dmem at 0xa4 offset */ | 56 | /* u-boot puts hpen in SBC dmem at 0xa4 offset */ |
26 | cpu-release-addr = <0x94100A4>; | 57 | cpu-release-addr = <0x94100A4>; |
58 | |||
59 | /* kHz uV */ | ||
60 | operating-points = <1500000 0 | ||
61 | 1200000 0 | ||
62 | 800000 0 | ||
63 | 500000 0>; | ||
64 | |||
65 | clocks = <&clk_m_a9>; | ||
66 | clock-names = "cpu"; | ||
67 | clock-latency = <100000>; | ||
68 | cpu0-supply = <&pwm_regulator>; | ||
69 | st,syscfg = <&syscfg_core 0x8e0>; | ||
27 | }; | 70 | }; |
28 | cpu@1 { | 71 | cpu@1 { |
29 | device_type = "cpu"; | 72 | device_type = "cpu"; |
30 | compatible = "arm,cortex-a9"; | 73 | compatible = "arm,cortex-a9"; |
31 | reg = <1>; | 74 | reg = <1>; |
75 | |||
32 | /* u-boot puts hpen in SBC dmem at 0xa4 offset */ | 76 | /* u-boot puts hpen in SBC dmem at 0xa4 offset */ |
33 | cpu-release-addr = <0x94100A4>; | 77 | cpu-release-addr = <0x94100A4>; |
78 | |||
79 | /* kHz uV */ | ||
80 | operating-points = <1500000 0 | ||
81 | 1200000 0 | ||
82 | 800000 0 | ||
83 | 500000 0>; | ||
34 | }; | 84 | }; |
35 | }; | 85 | }; |
36 | 86 | ||
@@ -534,7 +584,7 @@ | |||
534 | reg = <0x8788000 0x1000>; | 584 | reg = <0x8788000 0x1000>; |
535 | interrupts = <GIC_SPI 130 IRQ_TYPE_EDGE_RISING>; | 585 | interrupts = <GIC_SPI 130 IRQ_TYPE_EDGE_RISING>; |
536 | clocks = <&clk_s_d3_flexgen CLK_LPC_1>; | 586 | clocks = <&clk_s_d3_flexgen CLK_LPC_1>; |
537 | st,lpc-mode = <ST_LPC_MODE_RTC>; | 587 | st,lpc-mode = <ST_LPC_MODE_CLKSRC>; |
538 | }; | 588 | }; |
539 | 589 | ||
540 | sata0: sata@9b20000 { | 590 | sata0: sata@9b20000 { |
@@ -694,5 +744,79 @@ | |||
694 | clocks = <&clk_sysin>; | 744 | clocks = <&clk_sysin>; |
695 | status = "okay"; | 745 | status = "okay"; |
696 | }; | 746 | }; |
747 | |||
748 | mailbox0: mailbox@8f00000 { | ||
749 | compatible = "st,stih407-mailbox"; | ||
750 | reg = <0x8f00000 0x1000>; | ||
751 | interrupts = <GIC_SPI 1 IRQ_TYPE_NONE>; | ||
752 | #mbox-cells = <2>; | ||
753 | mbox-name = "a9"; | ||
754 | status = "okay"; | ||
755 | }; | ||
756 | |||
757 | mailbox1: mailbox@8f01000 { | ||
758 | compatible = "st,stih407-mailbox"; | ||
759 | reg = <0x8f01000 0x1000>; | ||
760 | #mbox-cells = <2>; | ||
761 | mbox-name = "st231_gp_1"; | ||
762 | status = "okay"; | ||
763 | }; | ||
764 | |||
765 | mailbox2: mailbox@8f02000 { | ||
766 | compatible = "st,stih407-mailbox"; | ||
767 | reg = <0x8f02000 0x1000>; | ||
768 | #mbox-cells = <2>; | ||
769 | mbox-name = "st231_gp_0"; | ||
770 | status = "okay"; | ||
771 | }; | ||
772 | |||
773 | mailbox3: mailbox@8f03000 { | ||
774 | compatible = "st,stih407-mailbox"; | ||
775 | reg = <0x8f03000 0x1000>; | ||
776 | #mbox-cells = <2>; | ||
777 | mbox-name = "st231_audio_video"; | ||
778 | status = "okay"; | ||
779 | }; | ||
780 | |||
781 | st231_gp0: remote-processor { | ||
782 | compatible = "st,st231-rproc"; | ||
783 | memory-region = <&gp0_reserved>; | ||
784 | resets = <&softreset STIH407_ST231_GP0_SOFTRESET>; | ||
785 | reset-names = "sw_reset"; | ||
786 | clocks = <&clk_s_c0_flexgen CLK_ST231_GP_0>; | ||
787 | clock-frequency = <600000000>; | ||
788 | st,syscfg = <&syscfg_core 0x22c>; | ||
789 | }; | ||
790 | |||
791 | |||
792 | st231_gp1: remote-processor { | ||
793 | compatible = "st,st231-rproc"; | ||
794 | memory-region = <&gp1_reserved>; | ||
795 | resets = <&softreset STIH407_ST231_GP1_SOFTRESET>; | ||
796 | reset-names = "sw_reset"; | ||
797 | clocks = <&clk_s_c0_flexgen CLK_ST231_GP_1>; | ||
798 | clock-frequency = <600000000>; | ||
799 | st,syscfg = <&syscfg_core 0x220>; | ||
800 | }; | ||
801 | |||
802 | st231_audio: remote-processor { | ||
803 | compatible = "st,st231-rproc"; | ||
804 | memory-region = <&audio_reserved>; | ||
805 | resets = <&softreset STIH407_ST231_AUD_SOFTRESET>; | ||
806 | reset-names = "sw_reset"; | ||
807 | clocks = <&clk_s_c0_flexgen CLK_ST231_AUD_0>; | ||
808 | clock-frequency = <600000000>; | ||
809 | st,syscfg = <&syscfg_core 0x228>; | ||
810 | }; | ||
811 | |||
812 | st231_dmu: remote-processor { | ||
813 | compatible = "st,st231-rproc"; | ||
814 | memory-region = <&dmu_reserved>; | ||
815 | resets = <&softreset STIH407_ST231_DMU_SOFTRESET>; | ||
816 | reset-names = "sw_reset"; | ||
817 | clocks = <&clk_s_c0_flexgen CLK_ST231_DMU>; | ||
818 | clock-frequency = <600000000>; | ||
819 | st,syscfg = <&syscfg_core 0x224>; | ||
820 | }; | ||
697 | }; | 821 | }; |
698 | }; | 822 | }; |