Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / r8a7745-iwg22d-sodimm.dts

diff --git a/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts b/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
index 52153ec..a4058f4 100644 (file)
--- a/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
+++ b/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
@@ -8,6 +8,29 @@
  * 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
+ */
+
 /dts-v1/;
 #include "r8a7745-iwg22m.dtsi"
 
@@ -16,13 +39,35 @@
        compatible = "iwave,g22d", "iwave,g22m", "renesas,r8a7745";
 
        aliases {
-               serial0 = &scif4;
                ethernet0 = &avb;
+               serial3 = &scif4;
+               serial5 = &hscif1;
        };
 
        chosen {
                bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
-               stdout-path = "serial0:115200n8";
+               stdout-path = "serial3:115200n8";
+       };
+
+       audio_clock: audio_clock {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <26000000>;
+       };
+
+       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>;
+               };
        };
 
        vccq_sdhi0: regulator-vccq-sdhi0 {
@@ -39,53 +84,139 @@
        };
 };
 
-&pfc {
-       scif4_pins: scif4 {
-               groups = "scif4_data_b";
-               function = "scif4";
+&avb {
+       pinctrl-0 = <&avb_pins>;
+       pinctrl-names = "default";
+
+       phy-handle = <&phy3>;
+       phy-mode = "gmii";
+       renesas,no-ether-link;
+       status = "okay";
+
+       phy3: ethernet-phy@3 {
+       /*
+        * On some older versions of the platform (before R4.0) the phy address
+        * may be 1 or 3. The address is fixed to 3 for R4.0 onwards.
+        */
+               reg = <3>;
+               micrel,led-mode = <1>;
        };
+};
+
+&can0 {
+       pinctrl-0 = <&can0_pins>;
+       pinctrl-names = "default";
+
+       status = "okay";
+};
+
+&hscif1 {
+       pinctrl-0 = <&hscif1_pins>;
+       pinctrl-names = "default";
 
+       uart-has-rtscts;
+       status = "okay";
+};
+
+&hsusb {
+       status = "okay";
+       pinctrl-0 = <&usb0_pins>;
+       pinctrl-names = "default";
+};
+
+&i2c5 {
+       pinctrl-0 = <&i2c5_pins>;
+       pinctrl-names = "default";
+
+       status = "okay";
+       clock-frequency = <400000>;
+
+       sgtl5000: codec@a {
+               compatible = "fsl,sgtl5000";
+               #sound-dai-cells = <0>;
+               reg = <0x0a>;
+               clocks = <&audio_clock>;
+               VDDA-supply = <&reg_3p3v>;
+               VDDIO-supply = <&reg_3p3v>;
+       };
+};
+
+&pci1 {
+       status = "okay";
+       pinctrl-0 = <&usb1_pins>;
+       pinctrl-names = "default";
+};
+
+&pfc {
        avb_pins: avb {
                groups = "avb_mdio", "avb_gmii";
                function = "avb";
        };
 
+       can0_pins: can0 {
+               groups = "can0_data";
+               function = "can0";
+       };
+
+       hscif1_pins: hscif1 {
+               groups = "hscif1_data", "hscif1_ctrl";
+               function = "hscif1";
+       };
+
+       i2c5_pins: i2c5 {
+               groups = "i2c5_b";
+               function = "i2c5";
+       };
+
+       scif4_pins: scif4 {
+               groups = "scif4_data_b";
+               function = "scif4";
+       };
+
        sdhi0_pins: sd0 {
                groups = "sdhi0_data4", "sdhi0_ctrl";
                function = "sdhi0";
                power-source = <3300>;
        };
 
+       sound_pins: sound {
+               groups = "ssi34_ctrl", "ssi3_data", "ssi4_data";
+               function = "ssi";
+       };
+
+       usb0_pins: usb0 {
+               groups = "usb0";
+               function = "usb0";
+       };
+
        usb1_pins: usb1 {
                groups = "usb1";
                function = "usb1";
        };
 };
 
-&scif4 {
-       pinctrl-0 = <&scif4_pins>;
+&rcar_sound {
+       pinctrl-0 = <&sound_pins>;
        pinctrl-names = "default";
-
        status = "okay";
+
+       /* Single DAI */
+
+       #sound-dai-cells = <0>;
+
+       rcar_sound,dai {
+               dai0 {
+                       playback = <&ssi3 &src3 &dvc0>;
+                       capture = <&ssi4 &src4 &dvc1>;
+               };
+       };
 };
 
-&avb {
-       pinctrl-0 = <&avb_pins>;
+&scif4 {
+       pinctrl-0 = <&scif4_pins>;
        pinctrl-names = "default";
 
-       phy-handle = <&phy3>;
-       phy-mode = "gmii";
-       renesas,no-ether-link;
        status = "okay";
-
-       phy3: ethernet-phy@3 {
-       /*
-        * On some older versions of the platform (before R4.0) the phy address
-        * may be 1 or 3. The address is fixed to 3 for R4.0 onwards.
-        */
-               reg = <3>;
-               micrel,led-mode = <1>;
-       };
 };
 
 &sdhi0 {
@@ -98,10 +229,8 @@
        status = "okay";
 };
 
-&pci1 {
-       status = "okay";
-       pinctrl-0 = <&usb1_pins>;
-       pinctrl-names = "default";
+&ssi4 {
+       shared-pin;
 };
 
 &usbphy {