| Message ID | 20180307174625.16597-1-s.nawrocki@samsung.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d9e575127b4169061d94c9982c4f0e8aae208c78 |
| Headers | show |
On Wed, Mar 07, 2018 at 06:46:25PM +0100, Sylwester Nawrocki wrote: > 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> > --- > Documentation/devicetree/bindings/sound/samsung,odroid.txt | 6 +++--- > sound/soc/samsung/odroid.c | 4 +++- > 2 files changed, 6 insertions(+), 4 deletions(-) Reviewed-by: Rob Herring <robh@kernel.org>
On Wed, Mar 07, 2018 at 06:46:25PM +0100, Sylwester Nawrocki wrote: > 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. Acked-by: Mark Brown <broonie@kernel.org>
On Wed, Mar 7, 2018 at 6:46 PM, Sylwester Nawrocki <s.nawrocki@samsung.com> wrote: > 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> > --- > Documentation/devicetree/bindings/sound/samsung,odroid.txt | 6 +++--- > sound/soc/samsung/odroid.c | 4 +++- > 2 files changed, 6 insertions(+), 4 deletions(-) Acked-by: Krzysztof Kozlowski <krzk@kernel.org> Best regards, Krzysztof
On 03/08/2018 11:40 AM, Mark Brown wrote: > On Wed, Mar 07, 2018 at 06:46:25PM +0100, Sylwester Nawrocki wrote: >> 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. > > Acked-by: Mark Brown <broonie@kernel.org> Mark, I thought this can be applied through ASoC tree for 4.17-rc1 and then I would post related dts patch for subsequent kernel release.
diff --git a/Documentation/devicetree/bindings/sound/samsung,odroid.txt b/Documentation/devicetree/bindings/sound/samsung,odroid.txt index 625b1b18fd02..f35a2694eb04 100644 --- 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 44b6de5a331a..92d750806d1d 100644 --- 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);
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> --- Documentation/devicetree/bindings/sound/samsung,odroid.txt | 6 +++--- sound/soc/samsung/odroid.c | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-)