浏览代码

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>
Sylwester Nawrocki 7 年之前
父节点
当前提交
d9e575127b
共有 2 个文件被更改,包括 6 次插入4 次删除
  1. 3 3
      Documentation/devicetree/bindings/sound/samsung,odroid.txt
  2. 3 1
      sound/soc/samsung/odroid.c

+ 3 - 3
Documentation/devicetree/bindings/sound/samsung,odroid.txt

@@ -2,8 +2,8 @@ Samsung Exynos Odroid XU3/XU4 audio complex with MAX98090 codec
 
 
 Required properties:
 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
  - model - the user-visible name of this sound complex
  - clocks - should contain entries matching clock names in the clock-names
  - clocks - should contain entries matching clock names in the clock-names
     property
     property
@@ -35,7 +35,7 @@ Required sub-nodes:
 Example:
 Example:
 
 
 sound {
 sound {
-	compatible = "samsung,odroidxu3-audio";
+	compatible = "hardkernel,odroid-xu3-audio";
 	model = "Odroid-XU3";
 	model = "Odroid-XU3";
 	samsung,audio-routing =
 	samsung,audio-routing =
 		"Headphone Jack", "HPL",
 		"Headphone Jack", "HPL",

+ 3 - 1
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[] = {
 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-xu3-audio" },
-	{ .compatible	= "samsung,odroid-xu4-audio"},
+	{ .compatible	= "samsung,odroid-xu4-audio" },
 	{ },
 	{ },
 };
 };
 MODULE_DEVICE_TABLE(of, odroid_audio_of_match);
 MODULE_DEVICE_TABLE(of, odroid_audio_of_match);