These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm / boot / dts / am335x-evmsk.dts

diff --git a/kernel/arch/arm/boot/dts/am335x-evmsk.dts b/kernel/arch/arm/boot/dts/am335x-evmsk.dts
index 156d05e..89442e9 100644 (file)
--- a/kernel/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/kernel/arch/arm/boot/dts/am335x-evmsk.dts
@@ -141,14 +141,26 @@
        };
 
        sound {
-               compatible = "ti,da830-evm-audio";
-               ti,model = "AM335x-EVMSK";
-               ti,audio-codec = <&tlv320aic3106>;
-               ti,mcasp-controller = <&mcasp1>;
-               ti,codec-clock-rate = <24000000>;
-               ti,audio-routing =
-                       "Headphone Jack",       "HPLOUT",
-                       "Headphone Jack",       "HPROUT";
+               compatible = "simple-audio-card";
+               simple-audio-card,name = "AM335x-EVMSK";
+               simple-audio-card,widgets =
+                       "Headphone", "Headphone Jack";
+               simple-audio-card,routing =
+                       "Headphone Jack",       "HPLOUT",
+                       "Headphone Jack",       "HPROUT";
+               simple-audio-card,format = "dsp_b";
+               simple-audio-card,bitclock-master = <&sound_master>;
+               simple-audio-card,frame-master = <&sound_master>;
+               simple-audio-card,bitclock-inversion;
+
+               simple-audio-card,cpu {
+                       sound-dai = <&mcasp1>;
+               };
+
+               sound_master: simple-audio-card,codec {
+                       sound-dai = <&tlv320aic3106>;
+                       system-clock-frequency = <24000000>;
+               };
        };
 
        panel {
@@ -396,6 +408,15 @@
                >;
        };
 
+       mcasp1_pins_sleep: mcasp1_pins_sleep {
+               pinctrl-single,pins = <
+                       0x10c (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       0x108 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       0x144 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+               >;
+       };
+
        mmc2_pins: pinmux_mmc2_pins {
                pinctrl-single,pins = <
                        0x74 (PIN_INPUT_PULLUP | MUX_MODE7) /* gpmc_wpn.gpio0_31 */
@@ -462,6 +483,7 @@
        };
 
        tlv320aic3106: tlv320aic3106@1b {
+               #sound-dai-cells = <0>;
                compatible = "ti,tlv320aic3106";
                reg = <0x1b>;
                status = "okay";
@@ -625,7 +647,7 @@
        bus-width = <4>;
        pinctrl-names = "default";
        pinctrl-0 = <&mmc1_pins>;
-       cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
+       cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
 };
 
 &sham {
@@ -661,19 +683,21 @@
 };
 
 &mcasp1 {
-               pinctrl-names = "default";
-               pinctrl-0 = <&mcasp1_pins>;
+       #sound-dai-cells = <0>;
+       pinctrl-names = "default", "sleep";
+       pinctrl-0 = <&mcasp1_pins>;
+       pinctrl-1 = <&mcasp1_pins_sleep>;
 
-               status = "okay";
+       status = "okay";
 
-               op-mode = <0>;          /* MCASP_IIS_MODE */
-               tdm-slots = <2>;
-               /* 4 serializers */
-               serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
-                       0 0 1 2
-               >;
-               tx-num-evt = <32>;
-               rx-num-evt = <32>;
+       op-mode = <0>;          /* MCASP_IIS_MODE */
+       tdm-slots = <2>;
+       /* 4 serializers */
+       serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
+               0 0 1 2
+       >;
+       tx-num-evt = <32>;
+       rx-num-evt = <32>;
 };
 
 &tscadc {