* [PATCH v2 1/3] ARM: dts: exynos: Add I2S1 device node to exynos5433.dtsi
[not found] <CGME20180208184418epcas2p33540f1624c15227e9c4fccb60413eb59@epcas2p3.samsung.com>
@ 2018-02-08 18:44 ` Sylwester Nawrocki
0 siblings, 0 replies; 10+ messages in thread
From: Sylwester Nawrocki @ 2018-02-08 18:44 UTC (permalink / raw)
To: krzk
Cc: kgene, devicetree, linux-samsung-soc, jcsing.lee,
linux-arm-kernel, b.zolnierkie, m.szyprowski, Sylwester Nawrocki
Add DT node for the second I2S controller available
on Exynos 5433 SoC.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
---
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@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@14dd0000 {
compatible = "samsung,exynos4210-pwm";
reg = <0x14dd0000 0x100>;
--
2.14.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 1/3] ARM: dts: exynos: Add I2S1 device node to exynos5433.dtsi
@ 2018-02-08 18:44 ` Sylwester Nawrocki
0 siblings, 0 replies; 10+ messages in thread
From: Sylwester Nawrocki @ 2018-02-08 18:44 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>
---
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] 10+ messages in thread
* [PATCH v2 2/3] ARM: dts: exynos: Update I2S0 device node in exynos5433.dtsi
[not found] ` <CGME20180208184442epcas1p1c207d993f6f028fb954476a781757479@epcas1p1.samsung.com>
@ 2018-02-08 18:44 ` Sylwester Nawrocki
0 siblings, 0 replies; 10+ messages in thread
From: Sylwester Nawrocki @ 2018-02-08 18:44 UTC (permalink / raw)
To: krzk
Cc: kgene, devicetree, linux-samsung-soc, jcsing.lee,
linux-arm-kernel, b.zolnierkie, m.szyprowski, Sylwester Nawrocki
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>
---
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@11440000 {
+ i2s0: i2s@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] 10+ messages in thread
* [PATCH v2 2/3] ARM: dts: exynos: Update I2S0 device node in exynos5433.dtsi
@ 2018-02-08 18:44 ` Sylwester Nawrocki
0 siblings, 0 replies; 10+ messages in thread
From: Sylwester Nawrocki @ 2018-02-08 18:44 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>
---
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] 10+ messages in thread
* [PATCH v2 3/3] ARM: dts: exynos: Add support for HDMI audio on exynos5433-tm2
[not found] ` <CGME20180208184446epcas2p2a5a59112f29b97dad9deb820699eb741@epcas2p2.samsung.com>
@ 2018-02-08 18:44 ` Sylwester Nawrocki
0 siblings, 0 replies; 10+ messages in thread
From: Sylwester Nawrocki @ 2018-02-08 18:44 UTC (permalink / raw)
To: krzk
Cc: kgene, devicetree, linux-samsung-soc, jcsing.lee,
linux-arm-kernel, b.zolnierkie, m.szyprowski, Sylwester Nawrocki
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 v1:
- dropped unnecessary assigned-clock* properties for AUD PLL
in cmu_top node,
- changed default AUD PLL frequency so it is withing recommended
252...400 MHz range.
---
.../boot/dts/exynos/exynos5433-tm2-common.dtsi | 60 ++++++++++++++++++++--
arch/arm64/boot/dts/exynos/exynos5433.dtsi | 1 +
2 files changed, 57 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..5599f1941c64 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,56 @@
status = "okay";
};
+#define TM2_DEF_AUD_PLL_RATE 393216003U
+
&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>,
+ <((TM2_DEF_AUD_PLL_RATE / 2) + 1)>,
+ <((TM2_DEF_AUD_PLL_RATE / 6) + 1)>,
+ <((TM2_DEF_AUD_PLL_RATE / 12) + 1)>,
+ <((TM2_DEF_AUD_PLL_RATE / 8) + 1)>,
+ <((TM2_DEF_AUD_PLL_RATE / 192) + 1)>,
+ <((TM2_DEF_AUD_PLL_RATE / 16) + 1)>,
+ <((TM2_DEF_AUD_PLL_RATE / 2) + 1)>,
+ <((TM2_DEF_AUD_PLL_RATE / 16) + 1)>,
+ <((TM2_DEF_AUD_PLL_RATE / 4) + 1)>,
+ <((TM2_DEF_AUD_PLL_RATE / 192) + 1)>,
+ <((TM2_DEF_AUD_PLL_RATE / 8) + 1)>;
+};
+
+&i2s1 {
+ assigned-clocks = <&i2s1 CLK_I2S_RCLK_SRC>;
+ assigned-clock-parents = <&cmu_peric CLK_SCLK_I2S1>;
};
&cmu_fsys {
@@ -838,6 +886,10 @@
status = "okay";
};
+&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] 10+ messages in thread
* [PATCH v2 3/3] ARM: dts: exynos: Add support for HDMI audio on exynos5433-tm2
@ 2018-02-08 18:44 ` Sylwester Nawrocki
0 siblings, 0 replies; 10+ messages in thread
From: Sylwester Nawrocki @ 2018-02-08 18:44 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 v1:
- dropped unnecessary assigned-clock* properties for AUD PLL
in cmu_top node,
- changed default AUD PLL frequency so it is withing recommended
252...400 MHz range.
---
.../boot/dts/exynos/exynos5433-tm2-common.dtsi | 60 ++++++++++++++++++++--
arch/arm64/boot/dts/exynos/exynos5433.dtsi | 1 +
2 files changed, 57 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..5599f1941c64 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,56 @@
status = "okay";
};
+#define TM2_DEF_AUD_PLL_RATE 393216003U
+
&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>,
+ <((TM2_DEF_AUD_PLL_RATE / 2) + 1)>,
+ <((TM2_DEF_AUD_PLL_RATE / 6) + 1)>,
+ <((TM2_DEF_AUD_PLL_RATE / 12) + 1)>,
+ <((TM2_DEF_AUD_PLL_RATE / 8) + 1)>,
+ <((TM2_DEF_AUD_PLL_RATE / 192) + 1)>,
+ <((TM2_DEF_AUD_PLL_RATE / 16) + 1)>,
+ <((TM2_DEF_AUD_PLL_RATE / 2) + 1)>,
+ <((TM2_DEF_AUD_PLL_RATE / 16) + 1)>,
+ <((TM2_DEF_AUD_PLL_RATE / 4) + 1)>,
+ <((TM2_DEF_AUD_PLL_RATE / 192) + 1)>,
+ <((TM2_DEF_AUD_PLL_RATE / 8) + 1)>;
+};
+
+&i2s1 {
+ assigned-clocks = <&i2s1 CLK_I2S_RCLK_SRC>;
+ assigned-clock-parents = <&cmu_peric CLK_SCLK_I2S1>;
};
&cmu_fsys {
@@ -838,6 +886,10 @@
status = "okay";
};
+&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] 10+ messages in thread
* Re: [PATCH v2 3/3] ARM: dts: exynos: Add support for HDMI audio on exynos5433-tm2
2018-02-08 18:44 ` Sylwester Nawrocki
@ 2018-02-12 9:28 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 10+ messages in thread
From: Krzysztof Kozlowski @ 2018-02-12 9:28 UTC (permalink / raw)
To: Sylwester Nawrocki
Cc: kgene-DgEjT+Ai2ygdnm+yROfE0A, devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
jcsing.lee-Sze3O3UU22JBDgjK7y7TUQ,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
Bartłomiej Żołnierkiewicz, Marek Szyprowski
On Thu, Feb 8, 2018 at 7:44 PM, Sylwester Nawrocki
<s.nawrocki-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> 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-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
> ---
> Changes since v1:
> - dropped unnecessary assigned-clock* properties for AUD PLL
> in cmu_top node,
> - changed default AUD PLL frequency so it is withing recommended
> 252...400 MHz range.
> ---
> .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 60 ++++++++++++++++++++--
> arch/arm64/boot/dts/exynos/exynos5433.dtsi | 1 +
> 2 files changed, 57 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..5599f1941c64 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,56 @@
> status = "okay";
> };
>
> +#define TM2_DEF_AUD_PLL_RATE 393216003U
> +
> &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>,
> + <((TM2_DEF_AUD_PLL_RATE / 2) + 1)>,
> + <((TM2_DEF_AUD_PLL_RATE / 6) + 1)>,
> + <((TM2_DEF_AUD_PLL_RATE / 12) + 1)>,
> + <((TM2_DEF_AUD_PLL_RATE / 8) + 1)>,
> + <((TM2_DEF_AUD_PLL_RATE / 192) + 1)>,
> + <((TM2_DEF_AUD_PLL_RATE / 16) + 1)>,
> + <((TM2_DEF_AUD_PLL_RATE / 2) + 1)>,
> + <((TM2_DEF_AUD_PLL_RATE / 16) + 1)>,
> + <((TM2_DEF_AUD_PLL_RATE / 4) + 1)>,
> + <((TM2_DEF_AUD_PLL_RATE / 192) + 1)>,
> + <((TM2_DEF_AUD_PLL_RATE / 8) + 1)>;
> +};
> +
> +&i2s1 {
> + assigned-clocks = <&i2s1 CLK_I2S_RCLK_SRC>;
> + assigned-clock-parents = <&cmu_peric CLK_SCLK_I2S1>;
Reorder alphabetically the node (and then you'll see you already add
one for i2s1).
BR,
Krzysztof
> };
>
> &cmu_fsys {
> @@ -838,6 +886,10 @@
> status = "okay";
> };
>
> +&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
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 3/3] ARM: dts: exynos: Add support for HDMI audio on exynos5433-tm2
@ 2018-02-12 9:28 ` Krzysztof Kozlowski
0 siblings, 0 replies; 10+ messages in thread
From: Krzysztof Kozlowski @ 2018-02-12 9:28 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Feb 8, 2018 at 7:44 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>
> ---
> Changes since v1:
> - dropped unnecessary assigned-clock* properties for AUD PLL
> in cmu_top node,
> - changed default AUD PLL frequency so it is withing recommended
> 252...400 MHz range.
> ---
> .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 60 ++++++++++++++++++++--
> arch/arm64/boot/dts/exynos/exynos5433.dtsi | 1 +
> 2 files changed, 57 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..5599f1941c64 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,56 @@
> status = "okay";
> };
>
> +#define TM2_DEF_AUD_PLL_RATE 393216003U
> +
> &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>,
> + <((TM2_DEF_AUD_PLL_RATE / 2) + 1)>,
> + <((TM2_DEF_AUD_PLL_RATE / 6) + 1)>,
> + <((TM2_DEF_AUD_PLL_RATE / 12) + 1)>,
> + <((TM2_DEF_AUD_PLL_RATE / 8) + 1)>,
> + <((TM2_DEF_AUD_PLL_RATE / 192) + 1)>,
> + <((TM2_DEF_AUD_PLL_RATE / 16) + 1)>,
> + <((TM2_DEF_AUD_PLL_RATE / 2) + 1)>,
> + <((TM2_DEF_AUD_PLL_RATE / 16) + 1)>,
> + <((TM2_DEF_AUD_PLL_RATE / 4) + 1)>,
> + <((TM2_DEF_AUD_PLL_RATE / 192) + 1)>,
> + <((TM2_DEF_AUD_PLL_RATE / 8) + 1)>;
> +};
> +
> +&i2s1 {
> + assigned-clocks = <&i2s1 CLK_I2S_RCLK_SRC>;
> + assigned-clock-parents = <&cmu_peric CLK_SCLK_I2S1>;
Reorder alphabetically the node (and then you'll see you already add
one for i2s1).
BR,
Krzysztof
> };
>
> &cmu_fsys {
> @@ -838,6 +886,10 @@
> status = "okay";
> };
>
> +&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 [flat|nested] 10+ messages in thread
* Re: [PATCH v2 3/3] ARM: dts: exynos: Add support for HDMI audio on exynos5433-tm2
2018-02-12 9:28 ` Krzysztof Kozlowski
@ 2018-02-12 11:47 ` Sylwester Nawrocki
-1 siblings, 0 replies; 10+ messages in thread
From: Sylwester Nawrocki @ 2018-02-12 11:47 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: kgene-DgEjT+Ai2ygdnm+yROfE0A, devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
jcsing.lee-Sze3O3UU22JBDgjK7y7TUQ,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
Bartłomiej Żołnierkiewicz, Marek Szyprowski
On 02/12/2018 10:28 AM, Krzysztof Kozlowski wrote:
>> +&i2s1 {
>> + assigned-clocks = <&i2s1 CLK_I2S_RCLK_SRC>;
>> + assigned-clock-parents = <&cmu_peric CLK_SCLK_I2S1>;
>
> Reorder alphabetically the node (and then you'll see you already add
> one for i2s1).
Oops, my fault, let me correct this again and resend.
--
Regards,
Sylwester
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 3/3] ARM: dts: exynos: Add support for HDMI audio on exynos5433-tm2
@ 2018-02-12 11:47 ` Sylwester Nawrocki
0 siblings, 0 replies; 10+ messages in thread
From: Sylwester Nawrocki @ 2018-02-12 11:47 UTC (permalink / raw)
To: linux-arm-kernel
On 02/12/2018 10:28 AM, Krzysztof Kozlowski wrote:
>> +&i2s1 {
>> + assigned-clocks = <&i2s1 CLK_I2S_RCLK_SRC>;
>> + assigned-clock-parents = <&cmu_peric CLK_SCLK_I2S1>;
>
> Reorder alphabetically the node (and then you'll see you already add
> one for i2s1).
Oops, my fault, let me correct this again and resend.
--
Regards,
Sylwester
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2018-02-12 11:47 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <CGME20180208184418epcas2p33540f1624c15227e9c4fccb60413eb59@epcas2p3.samsung.com>
2018-02-08 18:44 ` [PATCH v2 1/3] ARM: dts: exynos: Add I2S1 device node to exynos5433.dtsi Sylwester Nawrocki
2018-02-08 18:44 ` Sylwester Nawrocki
[not found] ` <CGME20180208184442epcas1p1c207d993f6f028fb954476a781757479@epcas1p1.samsung.com>
2018-02-08 18:44 ` [PATCH v2 2/3] ARM: dts: exynos: Update I2S0 device node in exynos5433.dtsi Sylwester Nawrocki
2018-02-08 18:44 ` Sylwester Nawrocki
[not found] ` <CGME20180208184446epcas2p2a5a59112f29b97dad9deb820699eb741@epcas2p2.samsung.com>
2018-02-08 18:44 ` [PATCH v2 3/3] ARM: dts: exynos: Add support for HDMI audio on exynos5433-tm2 Sylwester Nawrocki
2018-02-08 18:44 ` Sylwester Nawrocki
[not found] ` <20180208184408.24185-3-s.nawrocki-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2018-02-12 9:28 ` Krzysztof Kozlowski
2018-02-12 9:28 ` Krzysztof Kozlowski
[not found] ` <CAJKOXPfXR3pRcTy_y2jwg7R8Pkg15+VJyOvCaXvQa8ZHS=HeBA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-02-12 11:47 ` Sylwester Nawrocki
2018-02-12 11:47 ` Sylwester Nawrocki
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.