Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[pandora-kernel.git] / arch / arm / boot / dts / exynos5250.dtsi

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 54a35e6..964158c 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -17,8 +17,10 @@
  * published by the Free Software Foundation.
 */
 
-/include/ "skeleton.dtsi"
-/include/ "exynos5250-pinctrl.dtsi"
+#include "skeleton.dtsi"
+#include "exynos5250-pinctrl.dtsi"
+
+#include <dt-bindings/clk/exynos-audss-clk.h>
 
 / {
        compatible = "samsung,exynos5250";
@@ -72,6 +74,12 @@
                #clock-cells = <1>;
        };
 
+       clock_audss: audss-clock-controller@3810000 {
+               compatible = "samsung,exynos5250-audss-clock";
+               reg = <0x03810000 0x0C>;
+               #clock-cells = <1>;
+       };
+
        gic:interrupt-controller@10481000 {
                compatible = "arm,cortex-a15-gic", "arm,cortex-a9-gic";
                #interrupt-cells = <3>;
@@ -451,6 +459,10 @@
                        &pdma0 9
                        &pdma0 8>;
                dma-names = "tx", "rx", "tx-sec";
+               clocks = <&clock_audss EXYNOS_I2S_BUS>,
+                       <&clock_audss EXYNOS_I2S_BUS>,
+                       <&clock_audss EXYNOS_SCLK_I2S>;
+               clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
                samsung,supports-6ch;
                samsung,supports-rstclr;
                samsung,supports-secdai;
@@ -465,6 +477,8 @@
                dmas = <&pdma1 12
                        &pdma1 11>;
                dma-names = "tx", "rx";
+               clocks = <&clock 307>, <&clock 157>;
+               clock-names = "iis", "i2s_opclk0";
                pinctrl-names = "default";
                pinctrl-0 = <&i2s1_bus>;
        };
@@ -475,6 +489,8 @@
                dmas = <&pdma0 12
                        &pdma0 11>;
                dma-names = "tx", "rx";
+               clocks = <&clock 308>, <&clock 158>;
+               clock-names = "iis", "i2s_opclk0";
                pinctrl-names = "default";
                pinctrl-0 = <&i2s2_bus>;
        };