From: Krzysztof Kozlowski <krzk@kernel.org>
To: Sylwester Nawrocki <s.nawrocki@samsung.com>
Cc: kgene@kernel.org, devicetree@vger.kernel.org,
linux-samsung-soc@vger.kernel.org, jcsing.lee@samsung.com,
linux-arm-kernel@lists.infradead.org,
"Bartłomiej Żołnierkiewicz" <b.zolnierkie@samsung.com>,
"Marek Szyprowski" <m.szyprowski@samsung.com>
Subject: Re: [PATCH 2/2] ARM: dts: exynos: Add support for HDMI audio on exynos5433-tm2
Date: Tue, 6 Feb 2018 14:14:45 +0100 [thread overview]
Message-ID: <CAJKOXPef+8UvinoK-9j6tPMgNavMw1K1BhLuibD5FomjRC9Sbg@mail.gmail.com> (raw)
In-Reply-To: <20180205172110.9897-2-s.nawrocki@samsung.com>
On Mon, Feb 5, 2018 at 6:21 PM, Sylwester Nawrocki
<s.nawrocki@samsung.com> wrote:
> This patch updates the sound node of the exynos5433-tm2 board
> and adds clock tree configuration in order to support HDMI sound.
>
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> ---
> .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 67 ++++++++++++++++++++--
> arch/arm64/boot/dts/exynos/exynos5433.dtsi | 1 +
> 2 files changed, 64 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
> index a77462da4a36..37fb477a2d23 100644
> --- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
> +++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
> @@ -14,6 +14,7 @@
> #include <dt-bindings/gpio/gpio.h>
> #include <dt-bindings/input/input.h>
> #include <dt-bindings/interrupt-controller/irq.h>
> +#include <dt-bindings/sound/samsung-i2s.h>
>
> / {
> aliases {
> @@ -112,8 +113,8 @@
>
> sound {
> compatible = "samsung,tm2-audio";
> - audio-codec = <&wm5110>;
> - i2s-controller = <&i2s0>;
> + audio-codec = <&wm5110>, <&hdmi>;
> + i2s-controller = <&i2s0 0>, <&i2s1 0>;
> audio-amplifier = <&max98504>;
> mic-bias-gpios = <&gpr3 2 GPIO_ACTIVE_HIGH>;
> model = "wm5110";
> @@ -216,9 +217,63 @@
> status = "okay";
> };
>
> +&cmu_top {
> + assigned-clocks = <&cmu_top CLK_FOUT_AUD_PLL>;
> + assigned-clock-rates = <(196608009 + 1)>;
> +};
> +
> &cmu_aud {
> - assigned-clocks = <&cmu_aud CLK_MOUT_AUD_PLL_USER>;
> - assigned-clock-parents = <&cmu_top CLK_FOUT_AUD_PLL>;
> + assigned-clocks = <&cmu_aud CLK_MOUT_AUD_PLL_USER>,
> + <&cmu_aud CLK_MOUT_SCLK_AUD_I2S>,
> + <&cmu_aud CLK_MOUT_SCLK_AUD_PCM>,
> + <&cmu_top CLK_MOUT_AUD_PLL>,
> +
> + <&cmu_top CLK_MOUT_AUD_PLL_USER_T>,
> + <&cmu_top CLK_MOUT_SCLK_AUDIO0>,
> + <&cmu_top CLK_MOUT_SCLK_AUDIO1>,
> + <&cmu_top CLK_MOUT_SCLK_SPDIF>,
> +
> + <&cmu_aud CLK_DIV_AUD_CA5>,
> + <&cmu_aud CLK_DIV_ACLK_AUD>,
> + <&cmu_aud CLK_DIV_PCLK_DBG_AUD>,
> + <&cmu_aud CLK_DIV_SCLK_AUD_I2S>,
> + <&cmu_aud CLK_DIV_SCLK_AUD_PCM>,
> + <&cmu_aud CLK_DIV_SCLK_AUD_SLIMBUS>,
> + <&cmu_aud CLK_DIV_SCLK_AUD_UART>,
> +
> + <&cmu_top CLK_DIV_SCLK_AUDIO0>,
> + <&cmu_top CLK_DIV_SCLK_AUDIO1>,
> + <&cmu_top CLK_DIV_SCLK_PCM1>,
> + <&cmu_top CLK_DIV_SCLK_I2S1>;
> +
> + assigned-clock-parents = <&cmu_top CLK_FOUT_AUD_PLL>,
> + <&cmu_aud CLK_MOUT_AUD_PLL_USER>,
> + <&cmu_aud CLK_MOUT_AUD_PLL_USER>,
> + <&cmu_top CLK_FOUT_AUD_PLL>,
> +
> + <&cmu_top CLK_MOUT_AUD_PLL>,
> + <&cmu_top CLK_MOUT_AUD_PLL_USER_T>,
> + <&cmu_top CLK_MOUT_AUD_PLL_USER_T>,
> + <&cmu_top CLK_SCLK_AUDIO0>;
> +
> + assigned-clock-rates = <0>, <0>, <0>, <0>, <0>, <0>, <0>, <0>,
> + <(196608009 + 1)>,
> + <((196608009 / 3) + 1)>,
> + <((196608009 / 6) + 1)>,
> + <((196608009 / 4) + 1)>,
> + <((196608009 / 96) + 1)>,
> + <((196608009 / 8) + 1)>,
> + <(196608010 + 1)>,
> +
> + <((196608009 / 8) + 1)>,
> + <((196608009 / 2) + 1)>,
> + <((196608009 / 96) + 1)>,
> + <((196608009 / 4) + 1)>;
> +};
> +
> +&i2s1 {
Please move it further to i2s1 so all the nodes/labels will be ordered
alphabetically. As with #1 I understand that there is no explicit
dependency so please correct me if I am wrong.
Best regards,
Krzysztof
next prev parent reply other threads:[~2018-02-06 13:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20180205172146epcas1p1cd7a5027e673fc17fb64d8841c47175a@epcas1p1.samsung.com>
2018-02-05 17:21 ` [PATCH 1/2] ARM: dts: exynos: Add I2S1 device node to exynos5433.dtsi Sylwester Nawrocki
[not found] ` <CGME20180205172216epcas2p3be603e84df81b28ee4c04c9b1c1c551f@epcas2p3.samsung.com>
2018-02-05 17:21 ` [PATCH 2/2] ARM: dts: exynos: Add support for HDMI audio on exynos5433-tm2 Sylwester Nawrocki
2018-02-06 13:14 ` Krzysztof Kozlowski [this message]
[not found] ` <CAJKOXPef+8UvinoK-9j6tPMgNavMw1K1BhLuibD5FomjRC9Sbg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-02-07 16:48 ` Sylwester Nawrocki
2018-02-06 13:07 ` [PATCH 1/2] ARM: dts: exynos: Add I2S1 device node to exynos5433.dtsi Krzysztof Kozlowski
2018-02-07 16:44 ` 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=CAJKOXPef+8UvinoK-9j6tPMgNavMw1K1BhLuibD5FomjRC9Sbg@mail.gmail.com \
--to=krzk@kernel.org \
--cc=b.zolnierkie@samsung.com \
--cc=devicetree@vger.kernel.org \
--cc=jcsing.lee@samsung.com \
--cc=kgene@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).