Merge commit 'v3.9-rc5' into next/clk-exynos

[karo-tx-linux.git] / arch / arm / boot / dts / exynos5440.dtsi

diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi
index 9a99755920c04e52f58b29bb5ca684606d6d55e6..c374a31e9c3d59b86dcd79491e655c45499937fb 100644 (file)
--- a/arch/arm/boot/dts/exynos5440.dtsi
+++ b/arch/arm/boot/dts/exynos5440.dtsi
@@ -16,6 +16,12 @@
 
        interrupt-parent = <&gic>;
 
+       clock: clock-controller@0x160000 {
+               compatible = "samsung,exynos5440-clock";
+               reg = <0x160000 0x1000>;
+               #clock-cells = <1>;
+       };
+
        gic:interrupt-controller@2E0000 {
                compatible = "arm,cortex-a15-gic";
                #interrupt-cells = <3>;
@@ -24,55 +30,51 @@
        };
 
        cpus {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
                cpu@0 {
                        compatible = "arm,cortex-a15";
-                       timer {
-                               compatible = "arm,armv7-timer";
-                               interrupts = <1 13 0xf08>;
-                               clock-frequency = <1000000>;
-                       };
+                       reg = <0>;
                };
                cpu@1 {
                        compatible = "arm,cortex-a15";
-                       timer {
-                               compatible = "arm,armv7-timer";
-                               interrupts = <1 14 0xf08>;
-                               clock-frequency = <1000000>;
-                       };
+                       reg = <1>;
                };
                cpu@2 {
                        compatible = "arm,cortex-a15";
-                       timer {
-                               compatible = "arm,armv7-timer";
-                               interrupts = <1 14 0xf08>;
-                               clock-frequency = <1000000>;
-                       };
+                       reg = <2>;
                };
                cpu@3 {
                        compatible = "arm,cortex-a15";
-                       timer {
-                               compatible = "arm,armv7-timer";
-                               interrupts = <1 14 0xf08>;
-                               clock-frequency = <1000000>;
-                       };
+                       reg = <3>;
                };
        };
 
-       common {
-               compatible = "samsung,exynos5440";
-
+       timer {
+               compatible = "arm,cortex-a15-timer",
+                            "arm,armv7-timer";
+               interrupts = <1 13 0xf08>,
+                            <1 14 0xf08>,
+                            <1 11 0xf08>,
+                            <1 10 0xf08>;
+               clock-frequency = <50000000>;
        };
 
        serial@B0000 {
                compatible = "samsung,exynos4210-uart";
                reg = <0xB0000 0x1000>;
                interrupts = <0 2 0>;
+               clocks = <&clock 21>, <&clock 21>;
+               clock-names = "uart", "clk_uart_baud0";
        };
 
        serial@C0000 {
                compatible = "samsung,exynos4210-uart";
                reg = <0xC0000 0x1000>;
                interrupts = <0 3 0>;
+               clocks = <&clock 21>, <&clock 21>;
+               clock-names = "uart", "clk_uart_baud0";
        };
 
        spi {
@@ -83,6 +85,8 @@
                rx-dma-channel = <&pdma0 4>; /* preliminary */
                #address-cells = <1>;
                #size-cells = <0>;
+               clocks = <&clock 21>, <&clock 16>;
+               clock-names = "spi", "spi_busclk0";
        };
 
        pinctrl {
@@ -110,25 +114,31 @@
        };
 
        i2c@F0000 {
-               compatible = "samsung,s3c2440-i2c";
+               compatible = "samsung,exynos5440-i2c";
                reg = <0xF0000 0x1000>;
                interrupts = <0 5 0>;
                #address-cells = <1>;
                #size-cells = <0>;
+               clocks = <&clock 21>;
+               clock-names = "i2c";
        };
 
        i2c@100000 {
-               compatible = "samsung,s3c2440-i2c";
+               compatible = "samsung,exynos5440-i2c";
                reg = <0x100000 0x1000>;
                interrupts = <0 6 0>;
                #address-cells = <1>;
                #size-cells = <0>;
+               clocks = <&clock 21>;
+               clock-names = "i2c";
        };
 
        watchdog {
                compatible = "samsung,s3c2410-wdt";
                reg = <0x110000 0x1000>;
                interrupts = <0 1 0>;
+               clocks = <&clock 21>;
+               clock-names = "watchdog";
        };
 
        amba {
@@ -142,6 +152,8 @@
                        compatible = "arm,pl330", "arm,primecell";
                        reg = <0x120000 0x1000>;
                        interrupts = <0 34 0>;
+                       clocks = <&clock 21>;
+                       clock-names = "apb_pclk";
                        #dma-cells = <1>;
                        #dma-channels = <8>;
                        #dma-requests = <32>;
@@ -151,6 +163,8 @@
                        compatible = "arm,pl330", "arm,primecell";
                        reg = <0x121000 0x1000>;
                        interrupts = <0 35 0>;
+                       clocks = <&clock 21>;
+                       clock-names = "apb_pclk";
                        #dma-cells = <1>;
                        #dma-channels = <8>;
                        #dma-requests = <32>;
@@ -161,5 +175,7 @@
                compatible = "samsung,s3c6410-rtc";
                reg = <0x130000 0x1000>;
                interrupts = <0 17 0>, <0 16 0>;
+               clocks = <&clock 21>;
+               clock-names = "rtc";
        };
 };