diff mbox

[V3,13/15] ARM: dts: Exynos4 and Odroid X2/U3 sound device nodes update

Message ID 1421260962-16892-14-git-send-email-s.nawrocki@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Clock related properties are added to the Exynos4 I2S device nodes
so they can be referred to as clock providers. Missing i2s_opclk1
clock is added to the I2S0 node and clock properties are added
to the MAX98090 codec node to allow it to control/read frequency
of the MCLK clock directly.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
---
 arch/arm/boot/dts/exynos4.dtsi                  |    6 ++++++
 arch/arm/boot/dts/exynos4412-odroid-common.dtsi |    8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

Comments

Mark Brown Jan. 14, 2015, 7:54 p.m. UTC | #1
On Wed, Jan 14, 2015 at 07:42:40PM +0100, Sylwester Nawrocki wrote:
> Clock related properties are added to the Exynos4 I2S device nodes
> so they can be referred to as clock providers. Missing i2s_opclk1
> clock is added to the I2S0 node and clock properties are added
> to the MAX98090 codec node to allow it to control/read frequency
> of the MCLK clock directly.

Sorry, I should've said - I applied the ASoC patches, not these.
kgene@kernel.org Feb. 3, 2015, 4:27 a.m. UTC | #2
Mark Brown wrote:
> 
Hi Mark,

> On Wed, Jan 14, 2015 at 07:42:40PM +0100, Sylwester Nawrocki wrote:
> > Clock related properties are added to the Exynos4 I2S device nodes
> > so they can be referred to as clock providers. Missing i2s_opclk1
> > clock is added to the I2S0 node and clock properties are added
> > to the MAX98090 codec node to allow it to control/read frequency
> > of the MCLK clock directly.
> 
> Sorry, I should've said - I applied the ASoC patches, not these.

Shall I take 13 to 15 DT patches in Samsung tree?

- Kukjin
On 03/02/15 05:27, Kukjin Kim wrote:
> Mark Brown wrote:
>> On Wed, Jan 14, 2015 at 07:42:40PM +0100, Sylwester Nawrocki wrote:
>>> Clock related properties are added to the Exynos4 I2S device nodes
>>> so they can be referred to as clock providers. Missing i2s_opclk1
>>> clock is added to the I2S0 node and clock properties are added
>>> to the MAX98090 codec node to allow it to control/read frequency
>>> of the MCLK clock directly.
>>
>> Sorry, I should've said - I applied the ASoC patches, not these.
> 
> Shall I take 13 to 15 DT patches in Samsung tree?

Patches 13, 14 use macro definitions which are added in patch which is
already in Mark's sound tree ("ASoC: samsung: i2s: Add clk provider DT
binding documentation") [1]. We would need to consider that to avoid
build breaks.

--
Thanks,
Sylwester

[1]
https://git.kernel.org/cgit/linux/kernel/git/broonie/sound.git/commit/?h=for-next&id=0d40c61279510b8ce2368e1c6adcc2c4dc1af279
Mark Brown Feb. 3, 2015, 1:11 p.m. UTC | #4
On Tue, Feb 03, 2015 at 12:04:16PM +0100, Sylwester Nawrocki wrote:

> >> Sorry, I should've said - I applied the ASoC patches, not these.

> > Shall I take 13 to 15 DT patches in Samsung tree?

> Patches 13, 14 use macro definitions which are added in patch which is
> already in Mark's sound tree ("ASoC: samsung: i2s: Add clk provider DT
> binding documentation") [1]. We would need to consider that to avoid
> build breaks.

OK, I can apply them if people want but I'd need a resend - I discarded
them since they'd normally go via the arch tree.
On 03/02/15 14:11, Mark Brown wrote:
> On Tue, Feb 03, 2015 at 12:04:16PM +0100, Sylwester Nawrocki wrote:
> 
>>>> > >> Sorry, I should've said - I applied the ASoC patches, not these.
>>> > > Shall I take 13 to 15 DT patches in Samsung tree?
>> > Patches 13, 14 use macro definitions which are added in patch which is
>> > already in Mark's sound tree ("ASoC: samsung: i2s: Add clk provider DT
>> > binding documentation") [1]. We would need to consider that to avoid
>> > build breaks.
>
> OK, I can apply them if people want but I'd need a resend - I discarded
> them since they'd normally go via the arch tree.

I will resend the last 3 patches then. There also shouldn't be any issues
if 13, 14 are only merged through ASoC tree and patch 15 through Samsung
tree.

--
Thanks,
Sylwester
Mark Brown Feb. 3, 2015, 4:19 p.m. UTC | #6
On Tue, Feb 03, 2015 at 03:05:36PM +0100, Sylwester Nawrocki wrote:
> On 03/02/15 14:11, Mark Brown wrote:

> > OK, I can apply them if people want but I'd need a resend - I discarded
> > them since they'd normally go via the arch tree.

> I will resend the last 3 patches then. There also shouldn't be any issues
> if 13, 14 are only merged through ASoC tree and patch 15 through Samsung
> tree.

OK.  Kukjin, are you OK with me applying some or all of these?
diff mbox

Patch

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index b8168f1..38d8f68 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -61,6 +61,8 @@ 
 		reg = <0x03830000 0x100>;
 		clocks = <&clock_audss EXYNOS_I2S_BUS>;
 		clock-names = "iis";
+		#clock-cells = <1>;
+		clock-output-names = "i2s_cdclk0";
 		dmas = <&pdma0 12>, <&pdma0 11>, <&pdma0 10>;
 		dma-names = "tx", "rx", "tx-sec";
 		samsung,idma-addr = <0x03000000>;
@@ -372,6 +374,8 @@ 
 		reg = <0x13960000 0x100>;
 		clocks = <&clock CLK_I2S1>;
 		clock-names = "iis";
+		#clock-cells = <1>;
+		clock-output-names = "i2s_cdclk1";
 		dmas = <&pdma1 12>, <&pdma1 11>;
 		dma-names = "tx", "rx";
 		status = "disabled";
@@ -382,6 +386,8 @@ 
 		reg = <0x13970000 0x100>;
 		clocks = <&clock CLK_I2S2>;
 		clock-names = "iis";
+		#clock-cells = <1>;
+		clock-output-names = "i2s_cdclk2";
 		dmas = <&pdma0 14>, <&pdma0 13>;
 		dma-names = "tx", "rx";
 		status = "disabled";
diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index 3fbf588..c26b9fb 100644
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -7,6 +7,7 @@ 
  * published by the Free Software Foundation.
 */
 
+#include <dt-bindings/sound/samsung-i2s.h>
 #include <dt-bindings/input/input.h>
 #include "exynos4412.dtsi"
 
@@ -37,8 +38,9 @@ 
 		pinctrl-names = "default";
 		status = "okay";
 		clocks = <&clock_audss EXYNOS_I2S_BUS>,
-			 <&clock_audss EXYNOS_DOUT_AUD_BUS>;
-		clock-names = "iis", "i2s_opclk0";
+			 <&clock_audss EXYNOS_DOUT_AUD_BUS>,
+			 <&clock_audss EXYNOS_SCLK_I2S>;
+		clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
 	};
 
 	sound: sound {
@@ -373,6 +375,8 @@ 
 			reg = <0x10>;
 			interrupt-parent = <&gpx0>;
 			interrupts = <0 0>;
+			clocks = <&i2s0 CLK_I2S_CDCLK>;
+			clock-names = "mclk";
 		};
 	};