summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShengjiu Wang <shengjiu.wang@freescale.com>2015-04-13 14:24:38 +0800
committerguoyin.chen <guoyin.chen@freescale.com>2015-05-08 17:26:23 +0800
commit23022233c47a2110138c8773e34eacd20bb2c3f7 (patch)
tree7cfc6461d42f02876ed5f0fd2763424458edc65f
parentb73dd681d9bab02977ad42072670211928b7d8a8 (diff)
MLK-10646: ARM: dts: Add independent dts for hdmi audio and wm8960 audio
wm8960, hdmi can't be used together for they use same SAI interface. Which is hardware limitation. Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
-rw-r--r--arch/arm/boot/dts/imx7d-sdb-hdmi-audio.dts20
-rw-r--r--arch/arm/boot/dts/imx7d-sdb-wm8960.dts20
2 files changed, 40 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx7d-sdb-hdmi-audio.dts b/arch/arm/boot/dts/imx7d-sdb-hdmi-audio.dts
new file mode 100644
index 000000000000..221fdd0750d1
--- /dev/null
+++ b/arch/arm/boot/dts/imx7d-sdb-hdmi-audio.dts
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "imx7d-sdb.dts"
+
+/ {
+ sound {
+ status = "disabled";
+ };
+
+ sound-hdmi {
+ status = "okay";
+ };
+};
+
diff --git a/arch/arm/boot/dts/imx7d-sdb-wm8960.dts b/arch/arm/boot/dts/imx7d-sdb-wm8960.dts
new file mode 100644
index 000000000000..d9f38298f154
--- /dev/null
+++ b/arch/arm/boot/dts/imx7d-sdb-wm8960.dts
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "imx7d-sdb.dts"
+
+/ {
+ sound {
+ status = "okay";
+ };
+
+ sound-hdmi {
+ status = "disabled";
+ };
+};
+