Merge tag 'aspeed-5.4-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / arch / arm64 / boot / dts / allwinner / sun50i-h6-beelink-gs1.dts

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
index 0dc33c90dd60e567ab4b6412adfac43dd2c69872..1d05d570142fa020be2ab84fec87c6f615bc5d4b 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
@@ -25,6 +25,7 @@ chosen {
        connector {
                compatible = "hdmi-connector";
                type = "a";
+               ddc-en-gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */
 
                port {
                        hdmi_con_in: endpoint {
@@ -51,6 +52,24 @@ reg_vcc5v: vcc5v {
                regulator-max-microvolt = <5000000>;
                regulator-always-on;
        };
+
+       sound-spdif {
+               compatible = "simple-audio-card";
+               simple-audio-card,name = "sun50i-h6-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";
+       };
 };
 
 &de {
@@ -232,6 +251,10 @@ sw {
        };
 };
 
+&r_ir {
+       status = "okay";
+};
+
 &r_pio {
        /*
         * PL0 and PL1 are used for PMIC I2C
@@ -243,6 +266,10 @@ &r_pio {
        vcc-pm-supply = <&reg_aldo1>;
 };
 
+&spdif {
+       status = "okay";
+};
+
 &uart0 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart0_ph_pins>;