Merge tag 'scsi-postmerge' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / iwg20d-q7-common.dtsi

diff --git a/arch/arm/boot/dts/iwg20d-q7-common.dtsi b/arch/arm/boot/dts/iwg20d-q7-common.dtsi
index efd8af9242d12fcfc909d33bd99e8729acf2cfee..66954aaf2c47009d716370ad37d8b0314f06403d 100644 (file)
--- a/arch/arm/boot/dts/iwg20d-q7-common.dtsi
+++ b/arch/arm/boot/dts/iwg20d-q7-common.dtsi
@@ -8,9 +8,33 @@
  * kind, whether express or implied.
  */
 
+/*
+ * SSI-SGTL5000
+ *
+ * This command is required when Playback/Capture
+ *
+ *      amixer set "DVC Out" 100%
+ *      amixer set "DVC In" 100%
+ *
+ * You can use Mute
+ *
+ *      amixer set "DVC Out Mute" on
+ *      amixer set "DVC In Mute" on
+ *
+ * You can use Volume Ramp
+ *
+ *      amixer set "DVC Out Ramp Up Rate"   "0.125 dB/64 steps"
+ *      amixer set "DVC Out Ramp Down Rate" "0.125 dB/512 steps"
+ *      amixer set "DVC Out Ramp" on
+ *      aplay xxx.wav &
+ *      amixer set "DVC Out"  80%  // Volume Down
+ *      amixer set "DVC Out" 100%  // Volume Up
+ */
+
 / {
        aliases {
                serial0 = &scif0;
+               serial3 = &scifb1;
                ethernet0 = &avb;
        };
 
@@ -19,6 +43,36 @@
                stdout-path = "serial0:115200n8";
        };
 
+       audio_clock: audio_clock {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <26000000>;
+       };
+
+       reg_1p5v: 1p5v {
+               compatible = "regulator-fixed";
+               regulator-name = "1P5V";
+               regulator-min-microvolt = <1500000>;
+               regulator-max-microvolt = <1500000>;
+               regulator-always-on;
+       };
+
+       rsnd_sgtl5000: sound {
+               compatible = "simple-audio-card";
+
+               simple-audio-card,format = "i2s";
+               simple-audio-card,bitclock-master = <&sndcodec>;
+               simple-audio-card,frame-master = <&sndcodec>;
+
+               sndcpu: simple-audio-card,cpu {
+                       sound-dai = <&rcar_sound>;
+               };
+
+               sndcodec: simple-audio-card,codec {
+                       sound-dai = <&sgtl5000>;
+               };
+       };
+
        vcc_sdhi1: regulator-vcc-sdhi1 {
                compatible = "regulator-fixed";
 
@@ -58,6 +112,13 @@
        };
 };
 
+&can0 {
+       pinctrl-0 = <&can0_pins>;
+       pinctrl-names = "default";
+
+       status = "okay";
+};
+
 &hsusb {
        status = "okay";
        pinctrl-0 = <&usb0_pins>;
@@ -75,6 +136,16 @@
                compatible = "ti,bq32000";
                reg = <0x68>;
        };
+
+       sgtl5000: codec@a {
+               compatible = "fsl,sgtl5000";
+               #sound-dai-cells = <0>;
+               reg = <0x0a>;
+               clocks = <&audio_clock>;
+               VDDA-supply = <&reg_3p3v>;
+               VDDIO-supply = <&reg_3p3v>;
+               VDDD-supply = <&reg_1p5v>;
+       };
 };
 
 &pci0 {
@@ -88,7 +159,20 @@
        pinctrl-names = "default";
 };
 
+&pcie_bus_clk {
+       clock-frequency = <100000000>;
+};
+
+&pciec {
+       status = "okay";
+};
+
 &pfc {
+       can0_pins: can0 {
+               groups = "can0_data_d";
+               function = "can0";
+       };
+
        avb_pins: avb {
                groups = "avb_mdio", "avb_gmii";
                function = "avb";
@@ -104,6 +188,11 @@
                function = "scif0";
        };
 
+       scifb1_pins: scifb1 {
+               groups = "scifb1_data_d", "scifb1_ctrl";
+               function = "scifb1";
+       };
+
        sdhi1_pins: sd1 {
                groups = "sdhi1_data4", "sdhi1_ctrl";
                function = "sdhi1";
@@ -116,6 +205,11 @@
                power-source = <1800>;
        };
 
+       sound_pins: sound {
+               groups = "ssi0129_ctrl", "ssi0_data", "ssi1_data";
+               function = "ssi";
+       };
+
        usb0_pins: usb0 {
                groups = "usb0";
                function = "usb0";
@@ -127,6 +221,22 @@
        };
 };
 
+&rcar_sound {
+       pinctrl-0 = <&sound_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+
+       /* Single DAI */
+       #sound-dai-cells = <0>;
+
+       rcar_sound,dai {
+               dai0 {
+                       playback = <&ssi1 &src3 &dvc1>;
+                       capture = <&ssi0 &src2 &dvc0>;
+               };
+       };
+};
+
 &scif0 {
        pinctrl-0 = <&scif0_pins>;
        pinctrl-names = "default";
@@ -134,6 +244,14 @@
        status = "okay";
 };
 
+&scifb1 {
+       pinctrl-0 = <&scifb1_pins>;
+       pinctrl-names = "default";
+
+       uart-has-rtscts;
+       status = "okay";
+};
+
 &sdhi1 {
        pinctrl-0 = <&sdhi1_pins>;
        pinctrl-1 = <&sdhi1_pins_uhs>;
@@ -147,6 +265,10 @@
        status = "okay";
 };
 
+&ssi1 {
+       shared-pin;
+};
+
 &usbphy {
        status = "okay";
 };