ASoC: rsrc-card: remove board specific compatible

rsrc-card has board specific compatible (= lager/koelsh), but these were
created as 1st prototype, and it is used in my test environment only.
Now normal user can use generic compatible (= renesas,rsrc-card).
Removing these board specific compatible doesn't breake compatibility.
This patch remove these.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt b/Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt
index 255ece3043adc42decf1ede321618321057d3dd8..f148bf27723b009de9ed41fca61203a7fb9bb537 100644 (file)
--- a/Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt
+++ b/Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt
@@ -4,11 +4,8 @@ Renesas Sampling Rate Convert Sound Card specifies audio DAI connections of SoC
 
 Required properties:
 
-- compatible                           : "renesas,rsrc-card{,<board>}"
-                                         Examples with boards are:
-                                           - "renesas,rsrc-card"
-                                           - "renesas,rsrc-card,lager"
-                                           - "renesas,rsrc-card,koelsch"
+- compatible                           : "renesas,rsrc-card"
+
 Optional properties:
 
 - card_name                            : User specified audio sound card name, one string

diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c
index 16dc13e0bec9e237a5dbaafec26818a4de05ec82..ce9f91143f1fe0f0ace197300f85717e997663cf 100644 (file)
--- a/sound/soc/sh/rcar/rsrc-card.c
+++ b/sound/soc/sh/rcar/rsrc-card.c
@@ -28,20 +28,7 @@ struct rsrc_card_of_data {
        int num_routes;
 };
 
-static const struct snd_soc_dapm_route routes_ssi0_ak4642[] = {
-       {"ak4642 Playback", NULL, "DAI0 Playback"},
-       {"DAI0 Capture", NULL, "ak4642 Capture"},
-};
-
-static const struct rsrc_card_of_data routes_of_ssi0_ak4642 = {
-       .prefix         = "ak4642",
-       .routes         = routes_ssi0_ak4642,
-       .num_routes     = ARRAY_SIZE(routes_ssi0_ak4642),
-};
-
 static const struct of_device_id rsrc_card_of_match[] = {
-       { .compatible = "renesas,rsrc-card,lager",      .data = &routes_of_ssi0_ak4642 },
-       { .compatible = "renesas,rsrc-card,koelsch",    .data = &routes_of_ssi0_ak4642 },
        { .compatible = "renesas,rsrc-card", },
        {},
 };