From: Krzysztof Kozlowski <krzk@kernel.org>
To: Sylwester Nawrocki <s.nawrocki@samsung.com>
Cc: robh+dt@kernel.org, devicetree@vger.kernel.org,
linux-samsung-soc@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, b.zolnierkie@samsung.com,
m.szyprowski@samsung.com
Subject: Re: [PATCH] ARM: dts: exynos: Use dedicated DT bindings for Odroid X/X2, U3
Date: Sun, 13 May 2018 14:24:12 +0200 [thread overview]
Message-ID: <20180513122412.shxdxtxt2phb46l5@kozik-lap> (raw)
In-Reply-To: <20180511080947.3057-1-s.nawrocki@samsung.com>
On Fri, May 11, 2018 at 10:09:47AM +0200, Sylwester Nawrocki wrote:
> Use dedicated Odroid audio subsystem DT bindings instead of the simple-card.
> This adds support for audio on the HDMI interface.
How about changing the subject to "Add suppor for audio over HDMI for
Odroid X/X2/U3"?
>
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> ---
> arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 33 ++++++++++++++-----------
> arch/arm/boot/dts/exynos4412-odroidu3.dts | 7 +++---
> arch/arm/boot/dts/exynos4412-odroidx.dts | 7 +++---
> 3 files changed, 27 insertions(+), 20 deletions(-)
>
> diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
> index d7ad07fd48f9..bad08e70358a 100644
> --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
> +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
> @@ -37,20 +37,12 @@
> };
>
> sound: sound {
> - compatible = "simple-audio-card";
> -
> - simple-audio-card,format = "i2s";
> - simple-audio-card,bitclock-master = <&link0_codec>;
> - simple-audio-card,frame-master = <&link0_codec>;
> -
> - simple-audio-card,cpu {
> + cpu {
> sound-dai = <&i2s0 0>;
> - system-clock-frequency = <19200000>;
> };
>
> - link0_codec: simple-audio-card,codec {
> - sound-dai = <&max98090>;
> - clocks = <&i2s0 CLK_I2S_CDCLK>;
> + codec {
> + sound-dai = <&hdmi>, <&max98090>;
> };
> };
>
> @@ -142,14 +134,25 @@
> pinctrl-0 = <>;
> };
>
> +&clock {
> + assigned-clocks = <&clock CLK_FOUT_EPLL>;
> + assigned-clock-rates = <45158401>;
> +};
> +
> &clock_audss {
> assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>,
> <&clock_audss EXYNOS_MOUT_I2S>,
> <&clock_audss EXYNOS_DOUT_SRP>,
> - <&clock_audss EXYNOS_DOUT_AUD_BUS>;
> + <&clock_audss EXYNOS_DOUT_AUD_BUS>,
> + <&clock_audss EXYNOS_DOUT_I2S>;
> +
> assigned-clock-parents = <&clock CLK_FOUT_EPLL>,
> - <&clock_audss EXYNOS_MOUT_AUDSS>;
> - assigned-clock-rates = <0>, <0>, <192000000>, <19200000>;
> + <&clock_audss EXYNOS_MOUT_AUDSS>;
> +
> + assigned-clock-rates = <0>, <0>,
> + <196608001>,
> + <(196608001 / 2)>,
> + <(196608001 / 8)>;
> };
>
> &cpu0 {
> @@ -498,6 +501,8 @@
> pinctrl-0 = <&i2s0_bus>;
> pinctrl-names = "default";
> status = "okay";
> + assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>;
> + assigned-clock-parents = <&clock_audss EXYNOS_SCLK_I2S>;
> };
>
> &mixer {
> diff --git a/arch/arm/boot/dts/exynos4412-odroidu3.dts b/arch/arm/boot/dts/exynos4412-odroidu3.dts
> index bdcd4523cc1c..7a94a423097d 100644
> --- a/arch/arm/boot/dts/exynos4412-odroidu3.dts
> +++ b/arch/arm/boot/dts/exynos4412-odroidu3.dts
> @@ -113,11 +113,12 @@
> };
>
> &sound {
> - simple-audio-card,name = "Odroid-U3";
> - simple-audio-card,widgets =
> + compatible = "hardkernel,odroid-xu4-audio";
The compatible is the same for all users using DTSI so it could be moved
to the exynos4412-odroid-common.dtsi itself.
Best regards,
Krzysztof
> + model = "Odroid-U3";
> + samsung,audio-widgets =
> "Headphone", "Headphone Jack",
> "Speakers", "Speakers";
> - simple-audio-card,routing =
> + samsung,audio-routing =
> "Headphone Jack", "HPL",
> "Headphone Jack", "HPR",
> "Headphone Jack", "MICBIAS",
> diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts
> index 2dff129bc2ad..f0d5037f3a5d 100644
> --- a/arch/arm/boot/dts/exynos4412-odroidx.dts
> +++ b/arch/arm/boot/dts/exynos4412-odroidx.dts
> @@ -97,12 +97,13 @@
> };
>
> &sound {
> - simple-audio-card,name = "Odroid-X";
> - simple-audio-card,widgets =
> + compatible = "hardkernel,odroid-xu4-audio";
> + model = "Odroid-X";
> + samsung,audio-widgets =
> "Headphone", "Headphone Jack",
> "Microphone", "Mic Jack",
> "Microphone", "DMIC";
> - simple-audio-card,routing =
> + samsung,audio-routing =
> "Headphone Jack", "HPL",
> "Headphone Jack", "HPR",
> "IN1", "Mic Jack",
> --
> 2.14.2
>
WARNING: multiple messages have this Message-ID (diff)
From: krzk@kernel.org (Krzysztof Kozlowski)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: dts: exynos: Use dedicated DT bindings for Odroid X/X2, U3
Date: Sun, 13 May 2018 14:24:12 +0200 [thread overview]
Message-ID: <20180513122412.shxdxtxt2phb46l5@kozik-lap> (raw)
In-Reply-To: <20180511080947.3057-1-s.nawrocki@samsung.com>
On Fri, May 11, 2018 at 10:09:47AM +0200, Sylwester Nawrocki wrote:
> Use dedicated Odroid audio subsystem DT bindings instead of the simple-card.
> This adds support for audio on the HDMI interface.
How about changing the subject to "Add suppor for audio over HDMI for
Odroid X/X2/U3"?
>
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> ---
> arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 33 ++++++++++++++-----------
> arch/arm/boot/dts/exynos4412-odroidu3.dts | 7 +++---
> arch/arm/boot/dts/exynos4412-odroidx.dts | 7 +++---
> 3 files changed, 27 insertions(+), 20 deletions(-)
>
> diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
> index d7ad07fd48f9..bad08e70358a 100644
> --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
> +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
> @@ -37,20 +37,12 @@
> };
>
> sound: sound {
> - compatible = "simple-audio-card";
> -
> - simple-audio-card,format = "i2s";
> - simple-audio-card,bitclock-master = <&link0_codec>;
> - simple-audio-card,frame-master = <&link0_codec>;
> -
> - simple-audio-card,cpu {
> + cpu {
> sound-dai = <&i2s0 0>;
> - system-clock-frequency = <19200000>;
> };
>
> - link0_codec: simple-audio-card,codec {
> - sound-dai = <&max98090>;
> - clocks = <&i2s0 CLK_I2S_CDCLK>;
> + codec {
> + sound-dai = <&hdmi>, <&max98090>;
> };
> };
>
> @@ -142,14 +134,25 @@
> pinctrl-0 = <>;
> };
>
> +&clock {
> + assigned-clocks = <&clock CLK_FOUT_EPLL>;
> + assigned-clock-rates = <45158401>;
> +};
> +
> &clock_audss {
> assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>,
> <&clock_audss EXYNOS_MOUT_I2S>,
> <&clock_audss EXYNOS_DOUT_SRP>,
> - <&clock_audss EXYNOS_DOUT_AUD_BUS>;
> + <&clock_audss EXYNOS_DOUT_AUD_BUS>,
> + <&clock_audss EXYNOS_DOUT_I2S>;
> +
> assigned-clock-parents = <&clock CLK_FOUT_EPLL>,
> - <&clock_audss EXYNOS_MOUT_AUDSS>;
> - assigned-clock-rates = <0>, <0>, <192000000>, <19200000>;
> + <&clock_audss EXYNOS_MOUT_AUDSS>;
> +
> + assigned-clock-rates = <0>, <0>,
> + <196608001>,
> + <(196608001 / 2)>,
> + <(196608001 / 8)>;
> };
>
> &cpu0 {
> @@ -498,6 +501,8 @@
> pinctrl-0 = <&i2s0_bus>;
> pinctrl-names = "default";
> status = "okay";
> + assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>;
> + assigned-clock-parents = <&clock_audss EXYNOS_SCLK_I2S>;
> };
>
> &mixer {
> diff --git a/arch/arm/boot/dts/exynos4412-odroidu3.dts b/arch/arm/boot/dts/exynos4412-odroidu3.dts
> index bdcd4523cc1c..7a94a423097d 100644
> --- a/arch/arm/boot/dts/exynos4412-odroidu3.dts
> +++ b/arch/arm/boot/dts/exynos4412-odroidu3.dts
> @@ -113,11 +113,12 @@
> };
>
> &sound {
> - simple-audio-card,name = "Odroid-U3";
> - simple-audio-card,widgets =
> + compatible = "hardkernel,odroid-xu4-audio";
The compatible is the same for all users using DTSI so it could be moved
to the exynos4412-odroid-common.dtsi itself.
Best regards,
Krzysztof
> + model = "Odroid-U3";
> + samsung,audio-widgets =
> "Headphone", "Headphone Jack",
> "Speakers", "Speakers";
> - simple-audio-card,routing =
> + samsung,audio-routing =
> "Headphone Jack", "HPL",
> "Headphone Jack", "HPR",
> "Headphone Jack", "MICBIAS",
> diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts
> index 2dff129bc2ad..f0d5037f3a5d 100644
> --- a/arch/arm/boot/dts/exynos4412-odroidx.dts
> +++ b/arch/arm/boot/dts/exynos4412-odroidx.dts
> @@ -97,12 +97,13 @@
> };
>
> &sound {
> - simple-audio-card,name = "Odroid-X";
> - simple-audio-card,widgets =
> + compatible = "hardkernel,odroid-xu4-audio";
> + model = "Odroid-X";
> + samsung,audio-widgets =
> "Headphone", "Headphone Jack",
> "Microphone", "Mic Jack",
> "Microphone", "DMIC";
> - simple-audio-card,routing =
> + samsung,audio-routing =
> "Headphone Jack", "HPL",
> "Headphone Jack", "HPR",
> "IN1", "Mic Jack",
> --
> 2.14.2
>
next prev parent reply other threads:[~2018-05-13 12:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20180511081032epcas2p30f381cf699cb7524d9a143390e9c74b5@epcas2p3.samsung.com>
2018-05-11 8:09 ` [PATCH] ARM: dts: exynos: Use dedicated DT bindings for Odroid X/X2, U3 Sylwester Nawrocki
2018-05-11 8:09 ` Sylwester Nawrocki
2018-05-13 12:24 ` Krzysztof Kozlowski [this message]
2018-05-13 12:24 ` Krzysztof Kozlowski
2018-05-14 8:01 ` Sylwester Nawrocki
2018-05-14 8:01 ` Sylwester Nawrocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180513122412.shxdxtxt2phb46l5@kozik-lap \
--to=krzk@kernel.org \
--cc=b.zolnierkie@samsung.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=robh+dt@kernel.org \
--cc=s.nawrocki@samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.