ARM: dts: motorola-mapphone-common: remove unneeded "simple-graph-card"

ARM: dts: motorola-mapphone-common: remove unneeded "simple-graph-card"

[Kuninori Morimoto]

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

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@renesas.com>
---
 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

Re: ARM: dts: motorola-mapphone-common: remove unneeded "simple-graph-card"

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 2236 bytes --]

Hi,

On Fri, Jun 19, 2020 at 02:33:36PM +0900, Kuninori Morimoto wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> 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@renesas.com>
> ---

Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>

-- 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 #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: ARM: dts: motorola-mapphone-common: remove unneeded "simple-graph-card"

[Tony Lindgren]

* Sebastian Reichel <sebastian.reichel@collabora.com> [200619 11:37]:
> Hi,
> 
> On Fri, Jun 19, 2020 at 02:33:36PM +0900, Kuninori Morimoto wrote:
> > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > 
> > 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@renesas.com>
> > ---
> 
> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>

Probably best to merge this along with the other asoc patches:

Acked-by: Tony Lindgren <tony@atomide.com>

Re: ARM: dts: motorola-mapphone-common: remove unneeded "simple-graph-card"

[Mark Brown]

On 19 Jun 2020 14:33:36 +0900, Kuninori Morimoto wrote:
> 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.

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ARM: dts: motorola-mapphone-common: remove unneeded "simple-graph-card"
      commit: eb83aa46dcb8198708787b969eee1ba0e5ca0be7

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark