diff mbox

[1/2] ARM: dts: exynos: Add I2S1 device node to exynos5433.dtsi

Message ID 20180205172110.9897-1-s.nawrocki@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Add DT node for the second I2S controller available on Exynos 5433
SoC. While at it the i2s0 node name is changed to a more generic
"i2s" and missing properties are added to that node.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
---
 arch/arm64/boot/dts/exynos/exynos5433.dtsi | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

Comments

Krzysztof Kozlowski Feb. 6, 2018, 1:07 p.m. UTC | #1
On Mon, Feb 5, 2018 at 6:21 PM, Sylwester Nawrocki
<s.nawrocki@samsung.com> wrote:
> Add DT node for the second I2S controller available on Exynos 5433
> SoC. While at it the i2s0 node name is changed to a more generic
> "i2s" and missing properties are added to that node.

Please split it - one patch for adding new I2S and second minor
cleanup in i2s0 and adding of required properties.

I think there are no dependencies on driver code changes... but let me
know if I am wrong.

Best regards,
Krzysztof


> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> ---
>  arch/arm64/boot/dts/exynos/exynos5433.dtsi | 23 ++++++++++++++++++++++-
>  1 file changed, 22 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/exynos/exynos5433.dtsi b/arch/arm64/boot/dts/exynos/exynos5433.dtsi
> index 62f276970174..2b73bd86bc56 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>;
> @@ -1639,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>;
> @@ -1651,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
>
On 02/06/2018 02:07 PM, Krzysztof Kozlowski wrote:
> On Mon, Feb 5, 2018 at 6:21 PM, Sylwester Nawrocki
> <s.nawrocki@samsung.com> wrote:
>> Add DT node for the second I2S controller available on Exynos 5433
>> SoC. While at it the i2s0 node name is changed to a more generic
>> "i2s" and missing properties are added to that node.
>
> Please split it - one patch for adding new I2S and second minor
> cleanup in i2s0 and adding of required properties.

OK, will split it in next iteration.
 
> I think there are no dependencies on driver code changes... but let me
> know if I am wrong.

Yes, the dts and driver changes are independent, it should work
in all combinations: old dts/new driver, new dts/new driver,
new dts/old driver.

--
Regards,
Sylwester
diff mbox

Patch

diff --git a/arch/arm64/boot/dts/exynos/exynos5433.dtsi b/arch/arm64/boot/dts/exynos/exynos5433.dtsi
index 62f276970174..2b73bd86bc56 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>;
@@ -1639,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>;
@@ -1651,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";
 			};