ASoC: Use proper DT compatible string for Hardkernel Odroid boards

The Odroid boards are manufactured by Hardkernel, not Samsung. New compatible
string entries are added, with "hardkernel," instead of "samsung," vendor
prefix. Support for the old compatible strings is going to be removed after
some time.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/Documentation/devicetree/bindings/sound/samsung,odroid.txt b/Documentation/devicetree/bindings/sound/samsung,odroid.txt
index 625b1b18fd027b110f9bcef0ddae383c5e710925..f35a2694eb04debab1b00a5115bd92695dd0eded 100644 (file)
--- a/Documentation/devicetree/bindings/sound/samsung,odroid.txt
+++ b/Documentation/devicetree/bindings/sound/samsung,odroid.txt
@@ -2,8 +2,8 @@ Samsung Exynos Odroid XU3/XU4 audio complex with MAX98090 codec
 
 Required properties:
 
- - compatible - "samsung,odroidxu3-audio" - for Odroid XU3 board,
-               "samsung,odroidxu4-audio" - for Odroid XU4 board
+ - compatible - "hardkernel,odroid-xu3-audio" - for Odroid XU3 board,
+               "hardkernel,odroid-xu4-audio" - for Odroid XU4 board
  - model - the user-visible name of this sound complex
  - clocks - should contain entries matching clock names in the clock-names
     property
@@ -35,7 +35,7 @@ Required sub-nodes:
 Example:
 
 sound {
-       compatible = "samsung,odroidxu3-audio";
+       compatible = "hardkernel,odroid-xu3-audio";
        model = "Odroid-XU3";
        samsung,audio-routing =
                "Headphone Jack", "HPL",

diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c
index 44b6de5a331aeb0e9b21b4c67697baff3b0f31d7..92d750806d1d7c2068cf8a65c36ccfe3667f65f2 100644 (file)
--- a/sound/soc/samsung/odroid.c
+++ b/sound/soc/samsung/odroid.c
@@ -213,8 +213,10 @@ static int odroid_audio_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id odroid_audio_of_match[] = {
+       { .compatible   = "hardkernel,odroid-xu3-audio" },
+       { .compatible   = "hardkernel,odroid-xu4-audio" },
        { .compatible   = "samsung,odroid-xu3-audio" },
-       { .compatible   = "samsung,odroid-xu4-audio"},
+       { .compatible   = "samsung,odroid-xu4-audio" },
        { },
 };
 MODULE_DEVICE_TABLE(of, odroid_audio_of_match);