Merge tag 'exynos-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene...

[cascardo/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 d5fa1bc..84f77c2 100644 (file)
--- a/arch/arm/boot/dts/exynos5440.dtsi
+++ b/arch/arm/boot/dts/exynos5440.dtsi
@@ -9,6 +9,7 @@
  * published by the Free Software Foundation.
 */
 
+#include <dt-bindings/clock/exynos5440.h>
 #include "skeleton.dtsi"
 
 / {
@@ -105,7 +106,7 @@
                compatible = "samsung,exynos4210-uart";
                reg = <0xB0000 0x1000>;
                interrupts = <0 2 0>;
-               clocks = <&clock 21>, <&clock 21>;
+               clocks = <&clock CLK_B_125>, <&clock CLK_B_125>;
                clock-names = "uart", "clk_uart_baud0";
        };
 
@@ -113,7 +114,7 @@
                compatible = "samsung,exynos4210-uart";
                reg = <0xC0000 0x1000>;
                interrupts = <0 3 0>;
-               clocks = <&clock 21>, <&clock 21>;
+               clocks = <&clock CLK_B_125>, <&clock CLK_B_125>;
                clock-names = "uart", "clk_uart_baud0";
        };
 
@@ -125,7 +126,7 @@
                #size-cells = <0>;
                samsung,spi-src-clk = <0>;
                num-cs = <1>;
-               clocks = <&clock 21>, <&clock 16>;
+               clocks = <&clock CLK_B_125>, <&clock CLK_SPI_BAUD>;
                clock-names = "spi", "spi_busclk0";
        };
 
@@ -161,7 +162,7 @@
                interrupts = <0 5 0>;
                #address-cells = <1>;
                #size-cells = <0>;
-               clocks = <&clock 21>;
+               clocks = <&clock CLK_B_125>;
                clock-names = "i2c";
        };
 
@@ -171,7 +172,7 @@
                interrupts = <0 6 0>;
                #address-cells = <1>;
                #size-cells = <0>;
-               clocks = <&clock 21>;
+               clocks = <&clock CLK_B_125>;
                clock-names = "i2c";
        };
 
@@ -179,7 +180,7 @@
                compatible = "samsung,s3c2410-wdt";
                reg = <0x110000 0x1000>;
                interrupts = <0 1 0>;
-               clocks = <&clock 21>;
+               clocks = <&clock CLK_B_125>;
                clock-names = "watchdog";
        };
 
@@ -190,7 +191,7 @@
                interrupts = <0 31 4>;
                interrupt-names = "macirq";
                phy-mode = "sgmii";
-               clocks = <&clock 25>;
+               clocks = <&clock CLK_GMAC0>;
                clock-names = "stmmaceth";
        };
 
@@ -206,7 +207,7 @@
                compatible = "samsung,s3c6410-rtc";
                reg = <0x130000 0x1000>;
                interrupts = <0 17 0>, <0 16 0>;
-               clocks = <&clock 21>;
+               clocks = <&clock CLK_B_125>;
                clock-names = "rtc";
        };
 
@@ -214,7 +215,7 @@
                compatible = "samsung,exynos5440-tmu";
                reg = <0x160118 0x230>, <0x160368 0x10>;
                interrupts = <0 58 0>;
-               clocks = <&clock 21>;
+               clocks = <&clock CLK_B_125>;
                clock-names = "tmu_apbif";
        };
 
@@ -222,7 +223,7 @@
                compatible = "samsung,exynos5440-tmu";
                reg = <0x16011C 0x230>, <0x160368 0x10>;
                interrupts = <0 58 0>;
-               clocks = <&clock 21>;
+               clocks = <&clock CLK_B_125>;
                clock-names = "tmu_apbif";
        };
 
@@ -230,7 +231,7 @@
                compatible = "samsung,exynos5440-tmu";
                reg = <0x160120 0x230>, <0x160368 0x10>;
                interrupts = <0 58 0>;
-               clocks = <&clock 21>;
+               clocks = <&clock CLK_B_125>;
                clock-names = "tmu_apbif";
        };
 
@@ -238,7 +239,7 @@
                compatible = "snps,exynos5440-ahci";
                reg = <0x210000 0x10000>;
                interrupts = <0 30 0>;
-               clocks = <&clock 23>;
+               clocks = <&clock CLK_SATA>;
                clock-names = "sata";
        };
 
@@ -246,7 +247,7 @@
                compatible = "samsung,exynos5440-ohci";
                reg = <0x220000 0x1000>;
                interrupts = <0 29 0>;
-               clocks = <&clock 24>;
+               clocks = <&clock CLK_USB>;
                clock-names = "usbhost";
        };
 
@@ -254,7 +255,7 @@
                compatible = "samsung,exynos5440-ehci";
                reg = <0x221000 0x1000>;
                interrupts = <0 29 0>;
-               clocks = <&clock 24>;
+               clocks = <&clock CLK_USB>;
                clock-names = "usbhost";
        };
 
@@ -264,7 +265,7 @@
                        0x270000 0x1000
                        0x271000 0x40>;
                interrupts = <0 20 0>, <0 21 0>, <0 22 0>;
-               clocks = <&clock 28>, <&clock 27>;
+               clocks = <&clock CLK_PR0_250_O>, <&clock CLK_PB0_250_O>;
                clock-names = "pcie", "pcie_bus";
                #address-cells = <3>;
                #size-cells = <2>;
@@ -285,7 +286,7 @@
                        0x272000 0x1000
                        0x271040 0x40>;
                interrupts = <0 23 0>, <0 24 0>, <0 25 0>;
-               clocks = <&clock 29>, <&clock 27>;
+               clocks = <&clock CLK_PR1_250_O>, <&clock CLK_PB0_250_O>;
                clock-names = "pcie", "pcie_bus";
                #address-cells = <3>;
                #size-cells = <2>;