Hi,
On Fri, Jun 19, 2020 at 02:33:36PM +0900, Kuninori Morimoto wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
>
> Audio Graph Card is using "audio-graph-card" prefix instead of
> "simple-graph-card", and moreover "widgets / routing" doesn't need it.
> This patch removes unsupported "simple-graph-card" prefix from
> motorola-mapphone-common.dtsi and vendor-prefixes.yaml.
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
> ---
Reviewed-by: Sebastian Reichel <sebastian.reichel@xxxxxxxxxxxxx>
-- Sebastian
> Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 +-
> arch/arm/boot/dts/motorola-mapphone-common.dtsi | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> index 9aeab66be85f..147afcfe81fe 100644
> --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> @@ -20,7 +20,7 @@ patternProperties:
> "^(keypad|m25p|max8952|max8997|max8998|mpmc),.*": true
> "^(pinctrl-single|#pinctrl-single|PowerPC),.*": true
> "^(pl022|pxa-mmc|rcar_sound|rotary-encoder|s5m8767|sdhci),.*": true
> - "^(simple-audio-card|simple-graph-card|st-plgpio|st-spics|ts),.*": true
> + "^(simple-audio-card|st-plgpio|st-spics|ts),.*": true
>
> # Keep list in alphabetical order.
> "^abilis,.*":
> 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 @@ soundcard {
> 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",
> --
> 2.25.1
>
Attachment:
signature.asc
Description: PGP signature
