summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-07-31 20:54:03 +0200
committerMark Brown <broonie@kernel.org>2020-07-31 20:54:03 +0200
commit84569f329f7fcb40b7b1860f273b2909dabf2a2b (patch)
treecd332fbb2947f20cc06e3b80da75b189c8ac624e /arch
parentMerge remote-tracking branch 'asoc/for-5.8' into asoc-linus (diff)
parentMerge series "ASoC: core: Two step component registration" from Cezary Rojews... (diff)
downloadlinux-84569f329f7fcb40b7b1860f273b2909dabf2a2b.tar.xz
linux-84569f329f7fcb40b7b1860f273b2909dabf2a2b.zip
Merge remote-tracking branch 'asoc/for-5.9' into asoc-next
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/motorola-mapphone-common.dtsi4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/motorola-mapphone-common.dtsi b/arch/arm/boot/dts/motorola-mapphone-common.dtsi
index 06fbffa81636..1990239cc6af 100644
--- a/arch/arm/boot/dts/motorola-mapphone-common.dtsi
+++ b/arch/arm/boot/dts/motorola-mapphone-common.dtsi
@@ -140,13 +140,13 @@
compatible = "audio-graph-card";
label = "Droid 4 Audio";
- simple-graph-card,widgets =
+ widgets =
"Speaker", "Earpiece",
"Speaker", "Loudspeaker",
"Headphone", "Headphone Jack",
"Microphone", "Internal Mic";
- simple-graph-card,routing =
+ routing =
"Earpiece", "EP",
"Loudspeaker", "SPKR",
"Headphone Jack", "HSL",