aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Cross <xobs@kosagi.com>2014-06-06 12:31:19 +0800
committerSean Cross <xobs@kosagi.com>2014-06-06 12:31:19 +0800
commit40aa4fe52259d72028b753d3917a20ba4cdc9245 (patch)
tree66e56bcc36790945d6496c0497d92f7b7e596cfd
parent6482109320752d79da78f76514c3251ef08a6bf1 (diff)
downloadnovena-linux-3.14-rc4-es8328.tar.gz
novena-linux-3.14-rc4-es8328.tar.bz2
novena-linux-3.14-rc4-es8328.zip
dts: Refactor code and fix audio route mapping3.14-rc4-es8328
-rw-r--r--arch/arm/boot/dts/imx6qdl-novena.dtsi17
1 files changed, 12 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-novena.dtsi b/arch/arm/boot/dts/imx6qdl-novena.dtsi
index 770284d097b..1b760905113 100644
--- a/arch/arm/boot/dts/imx6qdl-novena.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-novena.dtsi
@@ -131,13 +131,20 @@
ssi-controller = <&ssi1>;
audio-codec = <&codec>;
jack-gpio = <&gpio5 15 0>;
- audio-routing =
- "MIC_IN", "Mic Jack",
- "Mic Jack", "Mic Bias",
- "Headphone Jack", "HP_OUT",
- "Ext Spk", "SPK_OUT";
+ audio-routing =
+ /* Format: [Sink], [Source], */
+ "Speaker", "LOUT2",
+ "Speaker", "ROUT2",
+ "Speaker", "audio-amp",
+ "Headphone", "ROUT1",
+ "Headphone", "LOUT1",
+ "LIN1", "Mic Bias",
+ "Mic Bias", "Mic Bias Gen",
+ "Mic bias Gen", "Mic Jack";
mux-int-port = <1>;
mux-ext-port = <3>;
+ codec-supply = <&reg_audio_codec>;
+ audio-amp-supply = <&reg_audio_amp>;
};
};