7 files changed, 24 insertions, 9 deletions

diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
index 608d17454179..5892a9f7622f 100644
--- a/arch/arm/boot/dts/exynos3250.dtsi
+++ b/arch/arm/boot/dts/exynos3250.dtsi
@@ -168,6 +168,9 @@
                         interrupt-controller;
                         #interrupt-cells = <3>;
                         interrupt-parent = <&gic>;
+                        clock-names = "clkout8";
+                        clocks = <&cmu CLK_FIN_PLL>;
+                        #clock-cells = <1>;
                 };
 
                 mipi_phy: video-phy {
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index b44f03ef3b27..dc6fa6fe83f1 100644
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -23,7 +23,7 @@
         };
 
         chosen {
-                bootargs = "console=ttySAC2,115200";
+                stdout-path = "serial2:115200n8";
         };
 
         gpio_keys {
diff --git a/arch/arm/boot/dts/exynos5422-odroid-core.dtsi b/arch/arm/boot/dts/exynos5422-odroid-core.dtsi
index bf09eab90f8a..9b0bccb77be5 100644
--- a/arch/arm/boot/dts/exynos5422-odroid-core.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroid-core.dtsi
@@ -36,6 +36,11 @@
         };
 };
 
+&adc {
+        vdd-supply = <&ldo4_reg>;
+        status = "okay";
+};
+
 &bus_wcore {
         devfreq-events = <&nocp_mem0_0>, <&nocp_mem0_1>,
                         <&nocp_mem1_0>, <&nocp_mem1_1>;
diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
index e84544b220b9..51a843bd65ed 100644
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
@@ -24,7 +24,9 @@
                         "Headphone Jack", "MICBIAS",
                         "IN1", "Headphone Jack",
                         "Speakers", "SPKL",
-                        "Speakers", "SPKR";
+                        "Speakers", "SPKR",
+                        "I2S Playback", "Mixer DAI TX",
+                        "HiFi Playback", "Mixer DAI TX";
 
                 assigned-clocks = <&clock CLK_MOUT_EPLL>,
                                 <&clock CLK_MOUT_MAU_EPLL>,
@@ -51,7 +53,7 @@
                                 <196608000>;
 
                 cpu {
-                        sound-dai = <&i2s0 0>;
+                        sound-dai = <&i2s0 0>, <&i2s0 1>;
                 };
                 codec {
                         sound-dai = <&hdmi>, <&max98090>;
diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
index b299e541cac0..5f195ad7e467 100644
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@ -362,11 +362,6 @@
         };
 };
 
-&adc {
-        vdd-supply = <&ldo4_reg>;
-        status = "okay";
-};
-
 &hdmi {
         status = "okay";
         ddc = <&i2c_2>;
diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts b/arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts
index 0db935f2b836..c19b5a51ca44 100644
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts
@@ -18,6 +18,14 @@
         compatible = "hardkernel,odroid-xu3-lite", "samsung,exynos5800", "samsung,exynos5";
 };
 
+&arm_a7_pmu {
+        status = "disabled";
+};
+
+&arm_a15_pmu {
+        status = "disabled";
+};
+
 &pwm {
         /*
          * PWM 0 -- fan
diff --git a/arch/arm/boot/dts/exynos5422-odroidxu4.dts b/arch/arm/boot/dts/exynos5422-odroidxu4.dts
index 122174ea9e0a..892d389d6d09 100644
--- a/arch/arm/boot/dts/exynos5422-odroidxu4.dts
+++ b/arch/arm/boot/dts/exynos5422-odroidxu4.dts
@@ -33,6 +33,8 @@
                 compatible = "samsung,odroid-xu3-audio";
                 model = "Odroid-XU4";
 
+                samsung,audio-routing = "I2S Playback", "Mixer DAI TX";
+
                 assigned-clocks = <&clock CLK_MOUT_EPLL>,
                                 <&clock CLK_MOUT_MAU_EPLL>,
                                 <&clock CLK_MOUT_USER_MAU_EPLL>,
@@ -58,7 +60,7 @@
                                 <196608000>;
 
                 cpu {
-                        sound-dai = <&i2s0 0>;
+                        sound-dai = <&i2s0 0>, <&i2s0 1>;
                 };
 
                 codec {