1 files changed, 67 insertions, 10 deletions

diff --git a/arch/arm/dts/sun6i-a31s-sina31s.dts b/arch/arm/dts/sun6i-a31s-sina31s.dts
index 6ead2f5c84..da0ccf5a2c 100644
--- a/arch/arm/dts/sun6i-a31s-sina31s.dts
+++ b/arch/arm/dts/sun6i-a31s-sina31s.dts
@@ -53,6 +53,17 @@
                 stdout-path = "serial0:115200n8";
         };
 
+        hdmi-connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_con_in: endpoint {
+                                remote-endpoint = <&hdmi_out_con>;
+                        };
+                };
+        };
+
         leds {
                 compatible = "gpio-leds";
                 pinctrl-names = "default";
@@ -63,6 +74,35 @@
                         gpios = <&pio 7 13 GPIO_ACTIVE_HIGH>; /* PH13 */
                 };
         };
+
+        sound {
+                compatible = "simple-audio-card";
+                simple-audio-card,name = "On-board SPDIF";
+                simple-audio-card,cpu {
+                        sound-dai = <&spdif>;
+                };
+
+                simple-audio-card,codec {
+                        sound-dai = <&spdif_out>;
+                };
+        };
+
+        spdif_out: spdif-out {
+                #sound-dai-cells = <0>;
+                compatible = "linux,spdif-dit";
+        };
+};
+
+&codec {
+        allwinner,audio-routing =
+                "Line Out", "LINEOUT",
+                "MIC1", "Mic",
+                "Mic",  "MBIAS";
+        status = "okay";
+};
+
+&de {
+        status = "okay";
 };
 
 &ehci0 {
@@ -87,6 +127,16 @@
         };
 };
 
+&hdmi {
+        status = "okay";
+};
+
+&hdmi_out {
+        hdmi_out_con: endpoint {
+                remote-endpoint = <&hdmi_con_in>;
+        };
+};
+
 &ir {
         pinctrl-names = "default";
         pinctrl-0 = <&ir_pins_a>;
@@ -117,8 +167,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_sina31s>;
         vmmc-supply = <&reg_dcdc1>;
         bus-width = <4>;
-        cd-gpios = <&pio 0 4 GPIO_ACTIVE_HIGH>; /* PA4 */
-        cd-inverted;
+        cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
         status = "okay";
 };
 
@@ -128,17 +177,14 @@
 
 &pio {
         led_pin_sina31s: led_pin@0 {
-                allwinner,pins = "PH13";
-                allwinner,function = "gpio_out";
-                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+                pins = "PH13";
+                function = "gpio_out";
         };
 
         mmc0_cd_pin_sina31s: mmc0_cd_pin@0 {
-                allwinner,pins = "PA4";
-                allwinner,function = "gpio_in";
-                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-                allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+                pins = "PA4";
+                function = "gpio_in";
+                bias-pull-up;
         };
 };
 
@@ -148,6 +194,17 @@
         regulator-name = "vcc-gmac-phy";
 };
 
+&spdif {
+        pinctrl-names = "default";
+        pinctrl-0 = <&spdif_pins_a>;
+        status = "okay";
+};
+
+&usb_otg {
+        dr_mode = "peripheral";
+        status = "okay";
+};
+
 &usbphy {
         status = "okay";
 };