Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-microblaze.git] / arch / arm / boot / dts / am4372.dtsi

diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index 65c4334..564900b 100644 (file)
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -64,6 +64,27 @@
                interrupt-parent = <&gic>;
        };
 
+       scu: scu@48240000 {
+               compatible = "arm,cortex-a9-scu";
+               reg = <0x48240000 0x100>;
+       };
+
+       global_timer: timer@48240200 {
+               compatible = "arm,cortex-a9-global-timer";
+               reg = <0x48240200 0x100>;
+               interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-parent = <&gic>;
+               clocks = <&dpll_mpu_m2_ck>;
+       };
+
+       local_timer: timer@48240600 {
+               compatible = "arm,cortex-a9-twd-timer";
+               reg = <0x48240600 0x100>;
+               interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-parent = <&gic>;
+               clocks = <&dpll_mpu_m2_ck>;
+       };
+
        l2-cache-controller@48242000 {
                compatible = "arm,pl310-cache";
                reg = <0x48242000 0x1000>;
@@ -100,6 +121,7 @@
                        prcm: prcm@1f0000 {
                                compatible = "ti,am4-prcm";
                                reg = <0x1f0000 0x11000>;
+                               interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
 
                                prcm_clocks: clocks {
                                        #address-cells = <1>;
@@ -330,7 +352,8 @@
                };
 
                rtc: rtc@44e3e000 {
-                       compatible = "ti,am3352-rtc", "ti,da830-rtc";
+                       compatible = "ti,am4372-rtc", "ti,am3352-rtc",
+                                    "ti,da830-rtc";
                        reg = <0x44e3e000 0x1000>;
                        interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH
                                      GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
@@ -549,8 +572,11 @@
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ti,hwmods = "cpgmac0";
-                       clocks = <&cpsw_125mhz_gclk>, <&cpsw_cpts_rft_clk>;
-                       clock-names = "fck", "cpts";
+                       clocks = <&cpsw_125mhz_gclk>, <&cpsw_cpts_rft_clk>,
+                                <&dpll_clksel_mac_clk>;
+                       clock-names = "fck", "cpts", "50mclk";
+                       assigned-clocks = <&dpll_clksel_mac_clk>;
+                       assigned-clock-rates = <50000000>;
                        status = "disabled";
                        cpdma_channels = <8>;
                        ale_entries = <1024>;