arm: dts: rk3288-android: enable built-in hdmi and rt5640 sound

This patch use one cpudai->multicodecs card for built-in hdmi and
external codec which share the same i2s controller.

Change-Id: Ib56d7f10b6739b1c26ec8946470b9f0cd7215979
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

diff --git a/arch/arm/boot/dts/rk3288-android.dtsi b/arch/arm/boot/dts/rk3288-android.dtsi
index d3a3ebb467f26c15c9c713f052e5adabd9d77889..88a915e207a43ccd27d9ea0360b9b3a77c437aa6 100644 (file)
--- a/arch/arm/boot/dts/rk3288-android.dtsi
+++ b/arch/arm/boot/dts/rk3288-android.dtsi
@@ -257,6 +257,23 @@
                clock-names = "clk_nandc", "hclk_nandc";
                status = "disabled";
        };
+
+       hdmi_analog_sound: hdmi-analog-sound {
+               status = "disabled";
+               compatible = "rockchip,rk3288-hdmi-analog",
+                               "rockchip,rk3368-hdmi-analog";
+               rockchip,cpu = <&i2s>;
+               rockchip,codec = <&rt5640>, <&hdmi>;
+               rockchip,widgets =
+                       "Microphone", "Microphone Jack",
+                       "Headphone", "Headphone Jack";
+               rockchip,routing =
+                       "MIC1", "Microphone Jack",
+                       "MIC2", "Microphone Jack",
+                       "Microphone Jack", "micbias1",
+                       "Headphone Jack", "HPOL",
+                       "Headphone Jack", "HPOR";
+       };
 };
 
 &edp_panel {

diff --git a/arch/arm/boot/dts/rk3288-evb-act8846-edp.dts b/arch/arm/boot/dts/rk3288-evb-act8846-edp.dts
index cfa8c382df49781eb8b94115637912470ab271a3..5f5fb3277bb5554aef60e208729809f506d203c2 100644 (file)
--- a/arch/arm/boot/dts/rk3288-evb-act8846-edp.dts
+++ b/arch/arm/boot/dts/rk3288-evb-act8846-edp.dts
@@ -96,6 +96,10 @@
        mali-supply = <&vdd_gpu>;
 };
 
+&hdmi_analog_sound {
+       status = "okay";
+};
+
 &i2c0 {
        clock-frequency = <400000>;
 

diff --git a/arch/arm/boot/dts/rk3288-evb-rk808.dts b/arch/arm/boot/dts/rk3288-evb-rk808.dts
index f1347219b906aa35aa0947fdd2c7b2ee7b2c5171..0d5aec924cc7b76c28c101ace318798fe887ec28 100644 (file)
--- a/arch/arm/boot/dts/rk3288-evb-rk808.dts
+++ b/arch/arm/boot/dts/rk3288-evb-rk808.dts
@@ -73,6 +73,10 @@
        cpu0-supply = <&vdd_cpu>;
 };
 
+&hdmi_analog_sound {
+       status = "okay";
+};
+
 &i2c0 {
        clock-frequency = <400000>;
 

diff --git a/arch/arm/boot/dts/rk3288-evb-rk818-edp.dts b/arch/arm/boot/dts/rk3288-evb-rk818-edp.dts
index 8215545f168306c3ccf897ede678a483845e2557..7f9bcb657fe6eee3a844ebde624ff13510da7f70 100644 (file)
--- a/arch/arm/boot/dts/rk3288-evb-rk818-edp.dts
+++ b/arch/arm/boot/dts/rk3288-evb-rk818-edp.dts
@@ -130,6 +130,10 @@
        mali-supply = <&vdd_gpu>;
 };
 
+&hdmi_analog_sound {
+       status = "okay";
+};
+
 &i2c0 {
        clock-frequency = <400000>;
 

diff --git a/arch/arm/boot/dts/rk3288-evb-rk818-mipi.dts b/arch/arm/boot/dts/rk3288-evb-rk818-mipi.dts
index 9e58f7833f49ba5ef3a23f18adafdc976854f27a..5b55531ca4aaee616301b9f0a7e53bd0c3b0a13a 100644 (file)
--- a/arch/arm/boot/dts/rk3288-evb-rk818-mipi.dts
+++ b/arch/arm/boot/dts/rk3288-evb-rk818-mipi.dts
@@ -92,6 +92,10 @@
        mali-supply = <&vdd_gpu>;
 };
 
+&hdmi_analog_sound {
+       status = "okay";
+};
+
 &i2c0 {
        clock-frequency = <400000>;
 

diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi
index 3e1f38168292b17efe3b60891557b49aae8733fc..f8284cc5f78a9109b6ab831348b831280ea2c35f 100644 (file)
--- a/arch/arm/boot/dts/rk3288-evb.dtsi
+++ b/arch/arm/boot/dts/rk3288-evb.dtsi
@@ -59,7 +59,8 @@
                };
        };
 
-       sound {
+       sound: sound {
+               status = "disabled";
                compatible = "simple-audio-card";
                simple-audio-card,format = "i2s";
                simple-audio-card,name = "rockchip,rt5640-codec";