Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / exynos4412-galaxy-s3.dtsi

diff --git a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
index 53b3ca3effabd59d58b8e97728c0011169341222..89ed81fb348dadfbfa75283fcb012db645045b88 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
+++ b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
@@ -33,7 +33,7 @@
                };
        };
 
-       lcd_vdd3_reg: voltage-regulator-7 {
+       lcd_vdd3_reg: voltage-regulator-10 {
                compatible = "regulator-fixed";
                regulator-name = "LCD_VDD_2.2V";
                regulator-min-microvolt = <2200000>;
@@ -42,7 +42,7 @@
                enable-active-high;
        };
 
-       ps_als_reg: voltage-regulator-8 {
+       ps_als_reg: voltage-regulator-11 {
                compatible = "regulator-fixed";
                regulator-name = "LED_A_3.0V";
                regulator-min-microvolt = <3000000>;
@@ -171,6 +171,44 @@
        status = "okay";
 };
 
+&sound {
+       samsung,audio-routing =
+               "HP", "HPOUT1L",
+               "HP", "HPOUT1R",
+
+               "SPK", "SPKOUTLN",
+               "SPK", "SPKOUTLP",
+               "SPK", "SPKOUTRN",
+               "SPK", "SPKOUTRP",
+
+               "RCV", "HPOUT2N",
+               "RCV", "HPOUT2P",
+
+               "HDMI", "LINEOUT1N",
+               "HDMI", "LINEOUT1P",
+
+               "LINE", "LINEOUT2N",
+               "LINE", "LINEOUT2P",
+
+               "IN1LP", "MICBIAS1",
+               "IN1LN", "MICBIAS1",
+               "Main Mic", "MICBIAS1",
+
+               "IN1RP", "Sub Mic",
+               "IN1RN", "Sub Mic",
+
+               "IN2LP:VXRN", "MICBIAS2",
+               "Headset Mic", "MICBIAS2",
+
+               "IN2RN", "FM In",
+               "IN2RP:VXRP", "FM In";
+};
+
+&submic_bias_reg {
+       gpio = <&gpf2 0 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
+};
+
 &touchkey_reg {
        gpio = <&gpm0 0 GPIO_ACTIVE_HIGH>;
        status = "okay";