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

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / vf610-twr.dts

diff --git a/arch/arm/boot/dts/vf610-twr.dts b/arch/arm/boot/dts/vf610-twr.dts
index e3a3805c2236a7075772a99e146cdba0811922bd..7dd1d6ede5258e9b45c384bd2384428b0e8a7818 100644 (file)
--- a/arch/arm/boot/dts/vf610-twr.dts
+++ b/arch/arm/boot/dts/vf610-twr.dts
@@ -34,6 +34,64 @@
                };
        };
 
+       regulators {
+               compatible = "simple-bus";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               reg_3p3v: regulator@0 {
+                       compatible = "regulator-fixed";
+                       reg = <0>;
+                       regulator-name = "3P3V";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       regulator-always-on;
+               };
+
+               reg_vcc_3v3_mcu: regulator@1 {
+                       compatible = "regulator-fixed";
+                       reg = <1>;
+                       regulator-name = "vcc_3v3_mcu";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+               };
+       };
+
+       sound {
+               compatible = "simple-audio-card";
+               simple-audio-card,format = "i2s";
+               simple-audio-card,widgets =
+                       "Microphone", "Microphone Jack",
+                       "Headphone", "Headphone Jack",
+                       "Speaker", "Speaker Ext",
+                       "Line", "Line In Jack";
+               simple-audio-card,routing =
+                       "MIC_IN", "Microphone Jack",
+                       "Microphone Jack", "Mic Bias",
+                       "LINE_IN", "Line In Jack",
+                       "Headphone Jack", "HP_OUT",
+                       "Speaker Ext", "LINE_OUT";
+
+               simple-audio-card,cpu {
+                       sound-dai = <&sai2>;
+                       master-clkdir-out;
+                       frame-master;
+                       bitclock-master;
+               };
+
+               simple-audio-card,codec {
+                       sound-dai = <&codec>;
+                       frame-master;
+                       bitclock-master;
+               };
+       };
+};
+
+&adc0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_adc0_ad5>;
+       vref-supply = <&reg_vcc_3v3_mcu>;
+       status = "okay";
 };
 
 &dspi0 {
@@ -72,10 +130,25 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_i2c0>;
        status = "okay";
+
+       codec: sgtl5000@0a {
+              #sound-dai-cells = <0>;
+              compatible = "fsl,sgtl5000";
+              reg = <0x0a>;
+              VDDA-supply = <&reg_3p3v>;
+              VDDIO-supply = <&reg_3p3v>;
+              clocks = <&clks VF610_CLK_SAI2>;
+       };
 };
 
 &iomuxc {
        vf610-twr {
+               pinctrl_adc0_ad5: adc0ad5grp {
+                       fsl,pins = <
+                               VF610_PAD_PTC30__ADC0_SE5               0xa1
+                       >;
+               };
+
                pinctrl_dspi0: dspi0grp {
                        fsl,pins = <
                                VF610_PAD_PTB19__DSPI0_CS0              0x1182
@@ -121,6 +194,18 @@
                        >;
                };
 
+               pinctrl_sai2: sai2grp {
+                       fsl,pins = <
+                               VF610_PAD_PTA16__SAI2_TX_BCLK           0x02ed
+                               VF610_PAD_PTA18__SAI2_TX_DATA           0x02ee
+                               VF610_PAD_PTA19__SAI2_TX_SYNC           0x02ed
+                               VF610_PAD_PTA21__SAI2_RX_BCLK           0x02ed
+                               VF610_PAD_PTA22__SAI2_RX_DATA           0x02ed
+                               VF610_PAD_PTA23__SAI2_RX_SYNC           0x02ed
+                               VF610_PAD_PTB18__EXT_AUDIO_MCLK         0x02ed
+                       >;
+               };
+
                pinctrl_uart1: uart1grp {
                        fsl,pins = <
                                VF610_PAD_PTB4__UART1_TX                0x21a2
@@ -130,6 +215,13 @@
        };
 };
 
+&sai2 {
+       #sound-dai-cells = <0>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_sai2>;
+       status = "okay";
+};
+
 &uart1 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_uart1>;