Merge branch 'for-linville' of git://github.com/kvalo/ath

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / exynos4x12.dtsi

diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi
index 5c412aa147382fb44ba6be6333f5d08485d28b5f..c4a9306f8529ab84ce3836781d1795b83c735e15 100644 (file)
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@ -31,6 +31,12 @@
                mshc0 = &mshc_0;
        };
 
+       pmu {
+               compatible = "arm,cortex-a9-pmu";
+               interrupt-parent = <&combiner>;
+               interrupts = <2 2>, <3 2>, <18 2>, <19 2>;
+       };
+
        pd_isp: isp-power-domain@10023CA0 {
                compatible = "samsung,exynos4210-pd";
                reg = <0x10023CA0 0x20>;
@@ -47,7 +53,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 {
@@ -62,6 +68,14 @@
                };
        };
 
+       combiner: interrupt-controller@10440000 {
+               interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>,
+                            <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>,
+                            <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>,
+                            <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>,
+                            <0 107 0>, <0 108 0>, <0 48 0>, <0 42 0>;
+       };
+
        pinctrl_0: pinctrl@11400000 {
                compatible = "samsung,exynos4x12-pinctrl";
                reg = <0x11400000 0x1000>;
@@ -80,6 +94,18 @@
                };
        };
 
+       adc: adc@126C0000 {
+               compatible = "samsung,exynos-adc-v1";
+               reg = <0x126C0000 0x100>, <0x10020718 0x4>;
+               interrupt-parent = <&combiner>;
+               interrupts = <10 3>;
+               clocks = <&clock CLK_TSADC>;
+               clock-names = "adc";
+               #io-channel-cells = <1>;
+               io-channel-ranges;
+               status = "disabled";
+       };
+
        pinctrl_2: pinctrl@03860000 {
                compatible = "samsung,exynos4x12-pinctrl";
                reg = <0x03860000 0x1000>;
@@ -97,13 +123,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 +172,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 +182,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 +192,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 +224,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 +239,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";
        };