diff options
author | Mark Brown <broonie@kernel.org> | 2020-07-31 19:54:03 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-07-31 19:54:03 +0100 |
commit | 84569f329f7fcb40b7b1860f273b2909dabf2a2b (patch) | |
tree | cd332fbb2947f20cc06e3b80da75b189c8ac624e /arch/arm | |
parent | c8f7dbdbaa15c700ea02abf92b8d9bda2e91050b (diff) | |
parent | 8e34f1e867b572f1e20b5250c2897fe5f041c99f (diff) | |
download | linux-84569f329f7fcb40b7b1860f273b2909dabf2a2b.tar.bz2 |
Merge remote-tracking branch 'asoc/for-5.9' into asoc-next
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/motorola-mapphone-common.dtsi | 4 |
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", |