ARM: dts: use macros in clock bindings for exynos4

The patch replaces magic numbers with macros defined in DT header
in exynos4 clock bindings.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

3 files changed, 63 insertions, 53 deletions

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 08452e183b57..28b5ec79f339 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -19,6 +19,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <dt-bindings/clock/exynos4.h>
 #include "skeleton.dtsi"
 
 / {
@@ -119,7 +120,7 @@
                         compatible = "samsung,exynos4210-fimc";
                         reg = <0x11800000 0x1000>;
                         interrupts = <0 84 0>;
-                        clocks = <&clock 256>, <&clock 128>;
+                        clocks = <&clock CLK_FIMC0>, <&clock CLK_SCLK_FIMC0>;
                         clock-names = "fimc", "sclk_fimc";
                         samsung,power-domain = <&pd_cam>;
                         samsung,sysreg = <&sys_reg>;
@@ -130,7 +131,7 @@
                         compatible = "samsung,exynos4210-fimc";
                         reg = <0x11810000 0x1000>;
                         interrupts = <0 85 0>;
-                        clocks = <&clock 257>, <&clock 129>;
+                        clocks = <&clock CLK_FIMC1>, <&clock CLK_SCLK_FIMC1>;
                         clock-names = "fimc", "sclk_fimc";
                         samsung,power-domain = <&pd_cam>;
                         samsung,sysreg = <&sys_reg>;
@@ -141,7 +142,7 @@
                         compatible = "samsung,exynos4210-fimc";
                         reg = <0x11820000 0x1000>;
                         interrupts = <0 86 0>;
-                        clocks = <&clock 258>, <&clock 130>;
+                        clocks = <&clock CLK_FIMC2>, <&clock CLK_SCLK_FIMC2>;
                         clock-names = "fimc", "sclk_fimc";
                         samsung,power-domain = <&pd_cam>;
                         samsung,sysreg = <&sys_reg>;
@@ -152,7 +153,7 @@
                         compatible = "samsung,exynos4210-fimc";
                         reg = <0x11830000 0x1000>;
                         interrupts = <0 87 0>;
-                        clocks = <&clock 259>, <&clock 131>;
+                        clocks = <&clock CLK_FIMC3>, <&clock CLK_SCLK_FIMC3>;
                         clock-names = "fimc", "sclk_fimc";
                         samsung,power-domain = <&pd_cam>;
                         samsung,sysreg = <&sys_reg>;
@@ -163,7 +164,7 @@
                         compatible = "samsung,exynos4210-csis";
                         reg = <0x11880000 0x4000>;
                         interrupts = <0 78 0>;
-                        clocks = <&clock 260>, <&clock 134>;
+                        clocks = <&clock CLK_CSIS0>, <&clock CLK_SCLK_CSIS0>;
                         clock-names = "csis", "sclk_csis";
                         bus-width = <4>;
                         samsung,power-domain = <&pd_cam>;
@@ -178,7 +179,7 @@
                         compatible = "samsung,exynos4210-csis";
                         reg = <0x11890000 0x4000>;
                         interrupts = <0 80 0>;
-                        clocks = <&clock 261>, <&clock 135>;
+                        clocks = <&clock CLK_CSIS1>, <&clock CLK_SCLK_CSIS1>;
                         clock-names = "csis", "sclk_csis";
                         bus-width = <2>;
                         samsung,power-domain = <&pd_cam>;
@@ -194,7 +195,7 @@
                 compatible = "samsung,s3c2410-wdt";
                 reg = <0x10060000 0x100>;
                 interrupts = <0 43 0>;
-                clocks = <&clock 345>;
+                clocks = <&clock CLK_WDT>;
                 clock-names = "watchdog";
                 status = "disabled";
         };
@@ -203,7 +204,7 @@
                 compatible = "samsung,s3c6410-rtc";
                 reg = <0x10070000 0x100>;
                 interrupts = <0 44 0>, <0 45 0>;
-                clocks = <&clock 346>;
+                clocks = <&clock CLK_RTC>;
                 clock-names = "rtc";
                 status = "disabled";
         };
@@ -212,7 +213,7 @@
                 compatible = "samsung,s5pv210-keypad";
                 reg = <0x100A0000 0x100>;
                 interrupts = <0 109 0>;
-                clocks = <&clock 347>;
+                clocks = <&clock CLK_KEYIF>;
                 clock-names = "keypad";
                 status = "disabled";
         };
@@ -221,7 +222,7 @@
                 compatible = "samsung,exynos4210-sdhci";
                 reg = <0x12510000 0x100>;
                 interrupts = <0 73 0>;
-                clocks = <&clock 297>, <&clock 145>;
+                clocks = <&clock CLK_SDMMC0>, <&clock CLK_SCLK_MMC0>;
                 clock-names = "hsmmc", "mmc_busclk.2";
                 status = "disabled";
         };
@@ -230,7 +231,7 @@
                 compatible = "samsung,exynos4210-sdhci";
                 reg = <0x12520000 0x100>;
                 interrupts = <0 74 0>;
-                clocks = <&clock 298>, <&clock 146>;
+                clocks = <&clock CLK_SDMMC1>, <&clock CLK_SCLK_MMC1>;
                 clock-names = "hsmmc", "mmc_busclk.2";
                 status = "disabled";
         };
@@ -239,7 +240,7 @@
                 compatible = "samsung,exynos4210-sdhci";
                 reg = <0x12530000 0x100>;
                 interrupts = <0 75 0>;
-                clocks = <&clock 299>, <&clock 147>;
+                clocks = <&clock CLK_SDMMC2>, <&clock CLK_SCLK_MMC2>;
                 clock-names = "hsmmc", "mmc_busclk.2";
                 status = "disabled";
         };
@@ -248,7 +249,7 @@
                 compatible = "samsung,exynos4210-sdhci";
                 reg = <0x12540000 0x100>;
                 interrupts = <0 76 0>;
-                clocks = <&clock 300>, <&clock 148>;
+                clocks = <&clock CLK_SDMMC3>, <&clock CLK_SCLK_MMC3>;
                 clock-names = "hsmmc", "mmc_busclk.2";
                 status = "disabled";
         };
@@ -257,7 +258,7 @@
                 compatible = "samsung,exynos4210-ehci";
                 reg = <0x12580000 0x100>;
                 interrupts = <0 70 0>;
-                clocks = <&clock 304>;
+                clocks = <&clock CLK_USB_HOST>;
                 clock-names = "usbhost";
                 status = "disabled";
         };
@@ -266,7 +267,7 @@
                 compatible = "samsung,exynos4210-ohci";
                 reg = <0x12590000 0x100>;
                 interrupts = <0 70 0>;
-                clocks = <&clock 304>;
+                clocks = <&clock CLK_USB_HOST>;
                 clock-names = "usbhost";
                 status = "disabled";
         };
@@ -276,7 +277,7 @@
                 reg = <0x13400000 0x10000>;
                 interrupts = <0 94 0>;
                 samsung,power-domain = <&pd_mfc>;
-                clocks = <&clock 273>;
+                clocks = <&clock CLK_MFC>;
                 clock-names = "mfc";
                 status = "disabled";
         };
@@ -285,7 +286,7 @@
                 compatible = "samsung,exynos4210-uart";
                 reg = <0x13800000 0x100>;
                 interrupts = <0 52 0>;
-                clocks = <&clock 312>, <&clock 151>;
+                clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>;
                 clock-names = "uart", "clk_uart_baud0";
                 status = "disabled";
         };
@@ -294,7 +295,7 @@
                 compatible = "samsung,exynos4210-uart";
                 reg = <0x13810000 0x100>;
                 interrupts = <0 53 0>;
-                clocks = <&clock 313>, <&clock 152>;
+                clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>;
                 clock-names = "uart", "clk_uart_baud0";
                 status = "disabled";
         };
@@ -303,7 +304,7 @@
                 compatible = "samsung,exynos4210-uart";
                 reg = <0x13820000 0x100>;
                 interrupts = <0 54 0>;
-                clocks = <&clock 314>, <&clock 153>;
+                clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>;
                 clock-names = "uart", "clk_uart_baud0";
                 status = "disabled";
         };
@@ -312,7 +313,7 @@
                 compatible = "samsung,exynos4210-uart";
                 reg = <0x13830000 0x100>;
                 interrupts = <0 55 0>;
-                clocks = <&clock 315>, <&clock 154>;
+                clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>;
                 clock-names = "uart", "clk_uart_baud0";
                 status = "disabled";
         };
@@ -323,7 +324,7 @@
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x13860000 0x100>;
                 interrupts = <0 58 0>;
-                clocks = <&clock 317>;
+                clocks = <&clock CLK_I2C0>;
                 clock-names = "i2c";
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c0_bus>;
@@ -336,7 +337,7 @@
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x13870000 0x100>;
                 interrupts = <0 59 0>;
-                clocks = <&clock 318>;
+                clocks = <&clock CLK_I2C1>;
                 clock-names = "i2c";
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2c1_bus>;
@@ -349,7 +350,7 @@
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x13880000 0x100>;
                 interrupts = <0 60 0>;
-                clocks = <&clock 319>;
+                clocks = <&clock CLK_I2C2>;
                 clock-names = "i2c";
                 status = "disabled";
         };
@@ -360,7 +361,7 @@
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x13890000 0x100>;
                 interrupts = <0 61 0>;
-                clocks = <&clock 320>;
+                clocks = <&clock CLK_I2C3>;
                 clock-names = "i2c";
                 status = "disabled";
         };
@@ -371,7 +372,7 @@
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x138A0000 0x100>;
                 interrupts = <0 62 0>;
-                clocks = <&clock 321>;
+                clocks = <&clock CLK_I2C4>;
                 clock-names = "i2c";
                 status = "disabled";
         };
@@ -382,7 +383,7 @@
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x138B0000 0x100>;
                 interrupts = <0 63 0>;
-                clocks = <&clock 322>;
+                clocks = <&clock CLK_I2C5>;
                 clock-names = "i2c";
                 status = "disabled";
         };
@@ -393,7 +394,7 @@
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x138C0000 0x100>;
                 interrupts = <0 64 0>;
-                clocks = <&clock 323>;
+                clocks = <&clock CLK_I2C6>;
                 clock-names = "i2c";
                 status = "disabled";
         };
@@ -404,7 +405,7 @@
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x138D0000 0x100>;
                 interrupts = <0 65 0>;
-                clocks = <&clock 324>;
+                clocks = <&clock CLK_I2C7>;
                 clock-names = "i2c";
                 status = "disabled";
         };
@@ -417,7 +418,7 @@
                 dma-names = "tx", "rx";
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 327>, <&clock 159>;
+                clocks = <&clock CLK_SPI0>, <&clock CLK_SCLK_SPI0>;
                 clock-names = "spi", "spi_busclk0";
                 pinctrl-names = "default";
                 pinctrl-0 = <&spi0_bus>;
@@ -432,7 +433,7 @@
                 dma-names = "tx", "rx";
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 328>, <&clock 160>;
+                clocks = <&clock CLK_SPI1>, <&clock CLK_SCLK_SPI1>;
                 clock-names = "spi", "spi_busclk0";
                 pinctrl-names = "default";
                 pinctrl-0 = <&spi1_bus>;
@@ -447,7 +448,7 @@
                 dma-names = "tx", "rx";
                 #address-cells = <1>;
                 #size-cells = <0>;
-                clocks = <&clock 329>, <&clock 161>;
+                clocks = <&clock CLK_SPI2>, <&clock CLK_SCLK_SPI2>;
                 clock-names = "spi", "spi_busclk0";
                 pinctrl-names = "default";
                 pinctrl-0 = <&spi2_bus>;
@@ -458,7 +459,7 @@
                 compatible = "samsung,exynos4210-pwm";
                 reg = <0x139D0000 0x1000>;
                 interrupts = <0 37 0>, <0 38 0>, <0 39 0>, <0 40 0>, <0 41 0>;
-                clocks = <&clock 336>;
+                clocks = <&clock CLK_PWM>;
                 clock-names = "timers";
                 #pwm-cells = <2>;
                 status = "disabled";
@@ -475,7 +476,7 @@
                         compatible = "arm,pl330", "arm,primecell";
                         reg = <0x12680000 0x1000>;
                         interrupts = <0 35 0>;
-                        clocks = <&clock 292>;
+                        clocks = <&clock CLK_PDMA0>;
                         clock-names = "apb_pclk";
                         #dma-cells = <1>;
                         #dma-channels = <8>;
@@ -486,7 +487,7 @@
                         compatible = "arm,pl330", "arm,primecell";
                         reg = <0x12690000 0x1000>;
                         interrupts = <0 36 0>;
-                        clocks = <&clock 293>;
+                        clocks = <&clock CLK_PDMA1>;
                         clock-names = "apb_pclk";
                         #dma-cells = <1>;
                         #dma-channels = <8>;
@@ -497,7 +498,7 @@
                         compatible = "arm,pl330", "arm,primecell";
                         reg = <0x12850000 0x1000>;
                         interrupts = <0 34 0>;
-                        clocks = <&clock 279>;
+                        clocks = <&clock CLK_MDMA>;
                         clock-names = "apb_pclk";
                         #dma-cells = <1>;
                         #dma-channels = <8>;
@@ -511,7 +512,7 @@
                 reg = <0x11c00000 0x20000>;
                 interrupt-names = "fifo", "vsync", "lcd_sys";
                 interrupts = <11 0>, <11 1>, <11 2>;
-                clocks = <&clock 140>, <&clock 283>;
+                clocks = <&clock CLK_SCLK_FIMD0>, <&clock CLK_FIMD0>;
                 clock-names = "sclk_fimd", "fimd";
                 samsung,power-domain = <&pd_lcd0>;
                 status = "disabled";
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index 48ecd7a755ab..cb0e768dc6d4 100644
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -53,7 +53,7 @@
                 reg = <0x10050000 0x800>;
                 interrupt-parent = <&mct_map>;
                 interrupts = <0>, <1>, <2>, <3>, <4>, <5>;
-                clocks = <&clock 3>, <&clock 344>;
+                clocks = <&clock CLK_FIN_PLL>, <&clock CLK_MCT>;
                 clock-names = "fin_pll", "mct";
 
                 mct_map: mct-map {
@@ -109,7 +109,7 @@
                 interrupt-parent = <&combiner>;
                 reg = <0x100C0000 0x100>;
                 interrupts = <2 4>;
-                clocks = <&clock 383>;
+                clocks = <&clock CLK_TMU_APBIF>;
                 clock-names = "tmu_apbif";
                 status = "disabled";
         };
@@ -118,13 +118,14 @@
                 compatible = "samsung,s5pv210-g2d";
                 reg = <0x12800000 0x1000>;
                 interrupts = <0 89 0>;
-                clocks = <&clock 177>, <&clock 277>;
+                clocks = <&clock CLK_SCLK_FIMG2D>, <&clock CLK_G2D>;
                 clock-names = "sclk_fimg2d", "fimg2d";
                 status = "disabled";
         };
 
         camera {
-                clocks = <&clock 132>, <&clock 133>, <&clock 351>, <&clock 352>;
+                clocks = <&clock CLK_SCLK_CAM0>, <&clock CLK_SCLK_CAM1>,
+                         <&clock CLK_PIXELASYNCM0>, <&clock CLK_PIXELASYNCM1>;
                 clock-names = "sclk_cam0", "sclk_cam1", "pxl_async0", "pxl_async1";
 
                 fimc_0: fimc@11800000 {
diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi
index 5c412aa14738..e0eb6bb64c34 100644
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@ -47,7 +47,7 @@
                 reg = <0x10050000 0x800>;
                 interrupt-parent = <&mct_map>;
                 interrupts = <0>, <1>, <2>, <3>, <4>;
-                clocks = <&clock 3>, <&clock 344>;
+                clocks = <&clock CLK_FIN_PLL>, <&clock CLK_MCT>;
                 clock-names = "fin_pll", "mct";
 
                 mct_map: mct-map {
@@ -97,13 +97,14 @@
                 compatible = "samsung,exynos4212-g2d";
                 reg = <0x10800000 0x1000>;
                 interrupts = <0 89 0>;
-                clocks = <&clock 177>, <&clock 277>;
+                clocks = <&clock CLK_SCLK_FIMG2D>, <&clock CLK_G2D>;
                 clock-names = "sclk_fimg2d", "fimg2d";
                 status = "disabled";
         };
 
         camera {
-                clocks = <&clock 132>, <&clock 133>, <&clock 351>, <&clock 352>;
+                clocks = <&clock CLK_SCLK_CAM0>, <&clock CLK_SCLK_CAM1>,
+                         <&clock CLK_PIXELASYNCM0>, <&clock CLK_PIXELASYNCM1>;
                 clock-names = "sclk_cam0", "sclk_cam1", "pxl_async0", "pxl_async1";
 
                 fimc_0: fimc@11800000 {
@@ -145,7 +146,7 @@
                         reg = <0x12390000 0x1000>;
                         interrupts = <0 105 0>;
                         samsung,power-domain = <&pd_isp>;
-                        clocks = <&clock 353>;
+                        clocks = <&clock CLK_FIMC_LITE0>;
                         clock-names = "flite";
                         status = "disabled";
                 };
@@ -155,7 +156,7 @@
                         reg = <0x123A0000 0x1000>;
                         interrupts = <0 106 0>;
                         samsung,power-domain = <&pd_isp>;
-                        clocks = <&clock 354>;
+                        clocks = <&clock CLK_FIMC_LITE1>;
                         clock-names = "flite";
                         status = "disabled";
                 };
@@ -165,12 +166,19 @@
                         reg = <0x12000000 0x260000>;
                         interrupts = <0 90 0>, <0 95 0>;
                         samsung,power-domain = <&pd_isp>;
-                        clocks = <&clock 353>, <&clock 354>, <&clock 355>,
-                                <&clock 356>, <&clock 17>, <&clock 357>,
-                                <&clock 358>, <&clock 359>, <&clock 360>,
-                                <&clock 450>,<&clock 451>, <&clock 452>,
-                                <&clock 453>, <&clock 176>, <&clock 13>,
-                                <&clock 454>, <&clock 395>, <&clock 455>;
+                        clocks = <&clock CLK_FIMC_LITE0>,
+                                 <&clock CLK_FIMC_LITE1>, <&clock CLK_PPMUISPX>,
+                                 <&clock CLK_PPMUISPMX>,
+                                 <&clock CLK_MOUT_MPLL_USER_T>,
+                                 <&clock CLK_FIMC_ISP>, <&clock CLK_FIMC_DRC>,
+                                 <&clock CLK_FIMC_FD>, <&clock CLK_MCUISP>,
+                                 <&clock CLK_DIV_ISP0>,<&clock CLK_DIV_ISP1>,
+                                 <&clock CLK_DIV_MCUISP0>,
+                                 <&clock CLK_DIV_MCUISP1>,
+                                 <&clock CLK_SCLK_UART_ISP>,
+                                 <&clock CLK_ACLK200>, <&clock CLK_DIV_ACLK200>,
+                                 <&clock CLK_ACLK400_MCUISP>,
+                                 <&clock CLK_DIV_ACLK400_MCUISP>;
                         clock-names = "lite0", "lite1", "ppmuispx",
                                       "ppmuispmx", "mpll", "isp",
                                       "drc", "fd", "mcuisp",
@@ -190,7 +198,7 @@
                         i2c1_isp: i2c-isp@12140000 {
                                 compatible = "samsung,exynos4212-i2c-isp";
                                 reg = <0x12140000 0x100>;
-                                clocks = <&clock 370>;
+                                clocks = <&clock CLK_I2C1_ISP>;
                                 clock-names = "i2c_isp";
                                 #address-cells = <1>;
                                 #size-cells = <0>;
@@ -205,7 +213,7 @@
                 #address-cells = <1>;
                 #size-cells = <0>;
                 fifo-depth = <0x80>;
-                clocks = <&clock 301>, <&clock 149>;
+                clocks = <&clock CLK_SDMMC4>, <&clock CLK_SCLK_MMC4>;
                 clock-names = "biu", "ciu";
                 status = "disabled";
         };