| Message ID | 1492795191-31298-8-git-send-email-s.nawrocki@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Apr 21, 2017 at 07:19:51PM +0200, Sylwester Nawrocki wrote: > The new sound card DT binding is used for Odroid XU3 in order > to properly support the HDMI audio path. > Clocks configuration is changed so the I2S controller is now the bit > and the frame clock master with EPLL as the root clock source. > > Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> > --- > arch/arm/boot/dts/exynos4.dtsi | 1 + > arch/arm/boot/dts/exynos5420.dtsi | 1 + > arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 59 ++++++++++++++++++----- > 3 files changed, 48 insertions(+), 13 deletions(-) > > diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi > index 18def1c..f3dcb7f 100644 > --- a/arch/arm/boot/dts/exynos4.dtsi > +++ b/arch/arm/boot/dts/exynos4.dtsi > @@ -761,6 +761,7 @@ > phy = <&hdmi_i2c_phy>; > power-domains = <&pd_tv>; > samsung,syscon-phandle = <&pmu_system_controller>; > + #sound-dai-cells = <0>; > status = "disabled"; > }; > > diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi > index 7dc9dc8..c7d29b6 100644 > --- a/arch/arm/boot/dts/exynos5420.dtsi > +++ b/arch/arm/boot/dts/exynos5420.dtsi > @@ -618,6 +618,7 @@ > samsung,syscon-phandle = <&pmu_system_controller>; > status = "disabled"; > power-domains = <&disp_pd>; > + #sound-dai-cells = <0>; > }; > > hdmiphy: hdmiphy@145D0000 { > diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi > index 9493923..84703f7 100644 > --- a/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi > +++ b/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi > @@ -11,15 +11,17 @@ > * published by the Free Software Foundation. > */ > > +#include <dt-bindings/sound/samsung-i2s.h> > + > / { > sound: sound { > - compatible = "simple-audio-card"; > + compatible = "samsung,odroid-xu3-audio"; > + model = "Odroid-XU3"; > > - simple-audio-card,name = "Odroid-XU3"; > - simple-audio-card,widgets = > + samsung,audio-widgets = > "Headphone", "Headphone Jack", > "Speakers", "Speakers"; > - simple-audio-card,routing = > + samsung,audio-routing = > "Headphone Jack", "HPL", > "Headphone Jack", "HPR", > "Headphone Jack", "MICBIAS", > @@ -27,22 +29,51 @@ > "Speakers", "SPKL", > "Speakers", "SPKR"; > > - simple-audio-card,format = "i2s"; > - simple-audio-card,bitclock-master = <&link0_codec>; > - simple-audio-card,frame-master = <&link0_codec>; > + clocks = <&clock CLK_FOUT_EPLL>, <&i2s0 CLK_I2S_RCLK_SRC>; > + clock-names = "epll", "i2s_rclk"; > > - 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>; > }; > }; > }; > > +&clock_audss { > + assigned-clocks = <&clock_audss EXYNOS_DOUT_SRP>, > + <&clock CLK_FOUT_EPLL>; > + assigned-clock-rates = <(196608000 / 256)>, > + <196608000>; > +}; > + > +&sound { > + assigned-clocks = <&clock CLK_MOUT_EPLL>, > + <&clock CLK_MOUT_MAU_EPLL>, > + <&clock CLK_MOUT_USER_MAU_EPLL>, > + <&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_I2S>; > + > + assigned-clock-parents = <&clock CLK_FOUT_EPLL>, > + <&clock CLK_MOUT_EPLL>, > + <&clock CLK_MOUT_MAU_EPLL>, > + <&clock CLK_MAU_EPLL>, > + <&clock_audss EXYNOS_MOUT_AUDSS>; > + > + assigned-clock-rates = <0>, > + <0>, > + <0>, > + <0>, > + <0>, > + <196608000>, > + <(196608000 / 2)>, > + <196608000>; > +}; Unless there is clear reson not to, I would prefer to put nodes sorted alphabetically. It helps avoiding conflicts and bring some logic. Beside that, looks good for me. You mentioned that DTS will be going in with next iteration. Sounds fine with me. Best regards, Krzysztof
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index 18def1c..f3dcb7f 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -761,6 +761,7 @@ phy = <&hdmi_i2c_phy>; power-domains = <&pd_tv>; samsung,syscon-phandle = <&pmu_system_controller>; + #sound-dai-cells = <0>; status = "disabled"; }; diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index 7dc9dc8..c7d29b6 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -618,6 +618,7 @@ samsung,syscon-phandle = <&pmu_system_controller>; status = "disabled"; power-domains = <&disp_pd>; + #sound-dai-cells = <0>; }; hdmiphy: hdmiphy@145D0000 { diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi index 9493923..84703f7 100644 --- a/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi +++ b/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi @@ -11,15 +11,17 @@ * published by the Free Software Foundation. */ +#include <dt-bindings/sound/samsung-i2s.h> + / { sound: sound { - compatible = "simple-audio-card"; + compatible = "samsung,odroid-xu3-audio"; + model = "Odroid-XU3"; - simple-audio-card,name = "Odroid-XU3"; - simple-audio-card,widgets = + samsung,audio-widgets = "Headphone", "Headphone Jack", "Speakers", "Speakers"; - simple-audio-card,routing = + samsung,audio-routing = "Headphone Jack", "HPL", "Headphone Jack", "HPR", "Headphone Jack", "MICBIAS", @@ -27,22 +29,51 @@ "Speakers", "SPKL", "Speakers", "SPKR"; - simple-audio-card,format = "i2s"; - simple-audio-card,bitclock-master = <&link0_codec>; - simple-audio-card,frame-master = <&link0_codec>; + clocks = <&clock CLK_FOUT_EPLL>, <&i2s0 CLK_I2S_RCLK_SRC>; + clock-names = "epll", "i2s_rclk"; - 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>; }; }; }; +&clock_audss { + assigned-clocks = <&clock_audss EXYNOS_DOUT_SRP>, + <&clock CLK_FOUT_EPLL>; + assigned-clock-rates = <(196608000 / 256)>, + <196608000>; +}; + +&sound { + assigned-clocks = <&clock CLK_MOUT_EPLL>, + <&clock CLK_MOUT_MAU_EPLL>, + <&clock CLK_MOUT_USER_MAU_EPLL>, + <&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_I2S>; + + assigned-clock-parents = <&clock CLK_FOUT_EPLL>, + <&clock CLK_MOUT_EPLL>, + <&clock CLK_MOUT_MAU_EPLL>, + <&clock CLK_MAU_EPLL>, + <&clock_audss EXYNOS_MOUT_AUDSS>; + + assigned-clock-rates = <0>, + <0>, + <0>, + <0>, + <0>, + <196608000>, + <(196608000 / 2)>, + <196608000>; +}; + &hsi2c_5 { status = "okay"; max98090: max98090@10 { @@ -58,4 +89,6 @@ &i2s0 { status = "okay"; + assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>; + assigned-clock-parents = <&clock_audss EXYNOS_SCLK_I2S>; };
The new sound card DT binding is used for Odroid XU3 in order to properly support the HDMI audio path. Clocks configuration is changed so the I2S controller is now the bit and the frame clock master with EPLL as the root clock source. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> --- arch/arm/boot/dts/exynos4.dtsi | 1 + arch/arm/boot/dts/exynos5420.dtsi | 1 + arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 59 ++++++++++++++++++----- 3 files changed, 48 insertions(+), 13 deletions(-)