* [PATCH v3 1/3] ARM: dts: exynos: Add I2S1 device node to exynos5433.dtsi [not found] <CGME20180212163202epcas2p3acceac29dd61f37d80f50cf2640d4686@epcas2p3.samsung.com> @ 2018-02-12 16:31 ` Sylwester Nawrocki 2018-02-12 16:31 ` [PATCH v3 2/3] ARM: dts: exynos: Update I2S0 device node in exynos5433.dtsi Sylwester Nawrocki ` (2 more replies) 0 siblings, 3 replies; 6+ messages in thread From: Sylwester Nawrocki @ 2018-02-12 16:31 UTC (permalink / raw) To: linux-arm-kernel Add DT node for the second I2S controller available on Exynos 5433 SoC. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> --- Changes since v2: - none. --- arch/arm64/boot/dts/exynos/exynos5433.dtsi | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/arch/arm64/boot/dts/exynos/exynos5433.dtsi b/arch/arm64/boot/dts/exynos/exynos5433.dtsi index 62f276970174..3845a8de7a42 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433.dtsi @@ -1311,6 +1311,25 @@ status = "disabled"; }; + i2s1: i2s at 14d60000 { + compatible = "samsung,exynos7-i2s"; + reg = <0x14d60000 0x100>; + dmas = <&pdma0 31 &pdma0 30>; + dma-names = "tx", "rx"; + interrupts = <GIC_SPI 435 IRQ_TYPE_NONE>; + clocks = <&cmu_peric CLK_PCLK_I2S1>, + <&cmu_peric CLK_PCLK_I2S1>, + <&cmu_peric CLK_SCLK_I2S1>; + clock-names = "iis", "i2s_opclk0", "i2s_opclk1"; + #clock-cells = <1>; + samsung,supports-6ch; + samsung,supports-rstclr; + samsung,supports-tdm; + samsung,supports-low-rfs; + #sound-dai-cells = <1>; + status = "disabled"; + }; + pwm: pwm at 14dd0000 { compatible = "samsung,exynos4210-pwm"; reg = <0x14dd0000 0x100>; -- 2.14.2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 2/3] ARM: dts: exynos: Update I2S0 device node in exynos5433.dtsi 2018-02-12 16:31 ` [PATCH v3 1/3] ARM: dts: exynos: Add I2S1 device node to exynos5433.dtsi Sylwester Nawrocki @ 2018-02-12 16:31 ` Sylwester Nawrocki 2018-02-15 18:32 ` Krzysztof Kozlowski 2018-02-12 16:31 ` [PATCH v3 3/3] ARM: dts: exynos: Add support for HDMI audio on exynos5433-tm2 Sylwester Nawrocki 2018-02-15 18:32 ` [PATCH v3 1/3] ARM: dts: exynos: Add I2S1 device node to exynos5433.dtsi Krzysztof Kozlowski 2 siblings, 1 reply; 6+ messages in thread From: Sylwester Nawrocki @ 2018-02-12 16:31 UTC (permalink / raw) To: linux-arm-kernel The i2s0 node name is changed to a more generic "i2s" and missing (optional) properties are added. The #sound-dai-cells property is required for HDMI audio support on TM2 board. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> --- Changes since v2: - none. --- arch/arm64/boot/dts/exynos/exynos5433.dtsi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/exynos/exynos5433.dtsi b/arch/arm64/boot/dts/exynos/exynos5433.dtsi index 3845a8de7a42..2b73bd86bc56 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433.dtsi @@ -1658,7 +1658,7 @@ power-domains = <&pd_aud>; }; - i2s0: i2s0 at 11440000 { + i2s0: i2s at 11440000 { compatible = "samsung,exynos7-i2s"; reg = <0x11440000 0x100>; dmas = <&adma 0 &adma 2>; @@ -1670,9 +1670,11 @@ <&cmu_aud CLK_SCLK_AUD_I2S>, <&cmu_aud CLK_SCLK_I2S_BCLK>; clock-names = "iis", "i2s_opclk0", "i2s_opclk1"; + #clock-cells = <1>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_bus>; power-domains = <&pd_aud>; + #sound-dai-cells = <1>; status = "disabled"; }; -- 2.14.2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 2/3] ARM: dts: exynos: Update I2S0 device node in exynos5433.dtsi 2018-02-12 16:31 ` [PATCH v3 2/3] ARM: dts: exynos: Update I2S0 device node in exynos5433.dtsi Sylwester Nawrocki @ 2018-02-15 18:32 ` Krzysztof Kozlowski 0 siblings, 0 replies; 6+ messages in thread From: Krzysztof Kozlowski @ 2018-02-15 18:32 UTC (permalink / raw) To: linux-arm-kernel On Mon, Feb 12, 2018 at 05:31:46PM +0100, Sylwester Nawrocki wrote: > The i2s0 node name is changed to a more generic "i2s" and missing > (optional) properties are added. The #sound-dai-cells property is > required for HDMI audio support on TM2 board. > > Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> > --- > Changes since v2: > - none. > --- > arch/arm64/boot/dts/exynos/exynos5433.dtsi | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > Thanks, applied. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 3/3] ARM: dts: exynos: Add support for HDMI audio on exynos5433-tm2 2018-02-12 16:31 ` [PATCH v3 1/3] ARM: dts: exynos: Add I2S1 device node to exynos5433.dtsi Sylwester Nawrocki 2018-02-12 16:31 ` [PATCH v3 2/3] ARM: dts: exynos: Update I2S0 device node in exynos5433.dtsi Sylwester Nawrocki @ 2018-02-12 16:31 ` Sylwester Nawrocki 2018-02-15 18:32 ` Krzysztof Kozlowski 2018-02-15 18:32 ` [PATCH v3 1/3] ARM: dts: exynos: Add I2S1 device node to exynos5433.dtsi Krzysztof Kozlowski 2 siblings, 1 reply; 6+ messages in thread From: Sylwester Nawrocki @ 2018-02-12 16:31 UTC (permalink / raw) To: linux-arm-kernel 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> --- Changes since v2: - nodes sorted alphabetically, changed the assigned clock frequencies. Changes since v1: - dropped unnecessary assigned-clock* properties for AUD PLL in cmu_top node, - changed default AUD PLL frequency so it is within recommended 252...400 MHz range. --- .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 52 ++++++++++++++++++++-- arch/arm64/boot/dts/exynos/exynos5433.dtsi | 1 + 2 files changed, 49 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..b73c389e1a8b 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"; @@ -217,8 +218,40 @@ }; &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>, + <196608001>, <65536001>, <32768001>, <49152001>, + <2048001>, <24576001>, <196608001>, + <24576001>, <98304001>, <2048001>, <49152001>; }; &cmu_fsys { @@ -267,6 +300,11 @@ <&cmu_top CLK_MOUT_BUS_PLL_USER>; }; +&cmu_top { + assigned-clocks = <&cmu_top CLK_FOUT_AUD_PLL>; + assigned-clock-rates = <196608001>; +}; + &cpu0 { cpu-supply = <&buck3_reg>; }; @@ -838,6 +876,12 @@ status = "okay"; }; +&i2s1 { + assigned-clocks = <&i2s1 CLK_I2S_RCLK_SRC>; + assigned-clock-parents = <&cmu_peric CLK_SCLK_I2S1>; + status = "okay"; +}; + &mshc_0 { status = "okay"; mmc-hs200-1_8v; diff --git a/arch/arm64/boot/dts/exynos/exynos5433.dtsi b/arch/arm64/boot/dts/exynos/exynos5433.dtsi index 2b73bd86bc56..c0231d077fa6 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433.dtsi @@ -969,6 +969,7 @@ ddc = <&hsi2c_11>; samsung,syscon-phandle = <&pmu_system_controller>; samsung,sysreg-phandle = <&syscon_disp>; + #sound-dai-cells = <0>; status = "disabled"; }; -- 2.14.2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 3/3] ARM: dts: exynos: Add support for HDMI audio on exynos5433-tm2 2018-02-12 16:31 ` [PATCH v3 3/3] ARM: dts: exynos: Add support for HDMI audio on exynos5433-tm2 Sylwester Nawrocki @ 2018-02-15 18:32 ` Krzysztof Kozlowski 0 siblings, 0 replies; 6+ messages in thread From: Krzysztof Kozlowski @ 2018-02-15 18:32 UTC (permalink / raw) To: linux-arm-kernel On Mon, Feb 12, 2018 at 05:31:47PM +0100, Sylwester Nawrocki 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> > --- > Changes since v2: > - nodes sorted alphabetically, changed the assigned clock > frequencies. > > Changes since v1: > - dropped unnecessary assigned-clock* properties for AUD PLL > in cmu_top node, > - changed default AUD PLL frequency so it is within recommended > 252...400 MHz range. > --- > .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 52 ++++++++++++++++++++-- > arch/arm64/boot/dts/exynos/exynos5433.dtsi | 1 + > 2 files changed, 49 insertions(+), 4 deletions(-) > Thanks, applied. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 1/3] ARM: dts: exynos: Add I2S1 device node to exynos5433.dtsi 2018-02-12 16:31 ` [PATCH v3 1/3] ARM: dts: exynos: Add I2S1 device node to exynos5433.dtsi Sylwester Nawrocki 2018-02-12 16:31 ` [PATCH v3 2/3] ARM: dts: exynos: Update I2S0 device node in exynos5433.dtsi Sylwester Nawrocki 2018-02-12 16:31 ` [PATCH v3 3/3] ARM: dts: exynos: Add support for HDMI audio on exynos5433-tm2 Sylwester Nawrocki @ 2018-02-15 18:32 ` Krzysztof Kozlowski 2 siblings, 0 replies; 6+ messages in thread From: Krzysztof Kozlowski @ 2018-02-15 18:32 UTC (permalink / raw) To: linux-arm-kernel On Mon, Feb 12, 2018 at 05:31:45PM +0100, Sylwester Nawrocki wrote: > Add DT node for the second I2S controller available > on Exynos 5433 SoC. > > Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> > --- > Changes since v2: > - none. > --- > arch/arm64/boot/dts/exynos/exynos5433.dtsi | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > Thanks, applied. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-02-15 18:32 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <CGME20180212163202epcas2p3acceac29dd61f37d80f50cf2640d4686@epcas2p3.samsung.com>
2018-02-12 16:31 ` [PATCH v3 1/3] ARM: dts: exynos: Add I2S1 device node to exynos5433.dtsi Sylwester Nawrocki
2018-02-12 16:31 ` [PATCH v3 2/3] ARM: dts: exynos: Update I2S0 device node in exynos5433.dtsi Sylwester Nawrocki
2018-02-15 18:32 ` Krzysztof Kozlowski
2018-02-12 16:31 ` [PATCH v3 3/3] ARM: dts: exynos: Add support for HDMI audio on exynos5433-tm2 Sylwester Nawrocki
2018-02-15 18:32 ` Krzysztof Kozlowski
2018-02-15 18:32 ` [PATCH v3 1/3] ARM: dts: exynos: Add I2S1 device node to exynos5433.dtsi Krzysztof Kozlowski
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox