diff mbox

[RESEND,V3,15/15] ARM: dts: Fix I2S1, I2S2 compatible for exynos4 SoCs

Message ID 1422972382-18520-3-git-send-email-s.nawrocki@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

I2S1, I2S2 on Exynos4 SoC series have limited functionality compared
to I2S0, "samsung,s3c6410-i2s" compatible should be used for them.

Cc: stable@vger.kernel.org
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
---
 arch/arm/boot/dts/exynos4.dtsi |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Mark Brown Feb. 5, 2015, 7:41 p.m. UTC | #1
On Tue, Feb 03, 2015 at 03:06:22PM +0100, Sylwester Nawrocki wrote:
> I2S1, I2S2 on Exynos4 SoC series have limited functionality compared
> to I2S0, "samsung,s3c6410-i2s" compatible should be used for them.

I've applied this even though I really shouldn't in order to get it in.
Since it's a bug fix for stable it should've been near the head of any
series it's part of not the very last patch in the series, and since
it's not really related to the rest of the series except in that it
relates to the same driver it should probably have been sent by itself
rather than mixed in with everything else.
On 05/02/15 20:41, Mark Brown wrote:
> On Tue, Feb 03, 2015 at 03:06:22PM +0100, Sylwester Nawrocki wrote:
>> I2S1, I2S2 on Exynos4 SoC series have limited functionality compared
>> to I2S0, "samsung,s3c6410-i2s" compatible should be used for them.
> 
> I've applied this even though I really shouldn't in order to get it in.
> Since it's a bug fix for stable it should've been near the head of any
> series it's part of not the very last patch in the series, and since
> it's not really related to the rest of the series except in that it
> relates to the same driver it should probably have been sent by itself
> rather than mixed in with everything else.

Indeed I could sent this one separately to Kukjin, the issue it fixes
was just found in the course of creating remaining part of the series
and I wanted to keep somewhat related changes together.
Thank you for merging it.  I hope you picked up the previous 2 as well,
I couldn't see them in your tree.
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Mark Brown Feb. 6, 2015, 11:51 a.m. UTC | #3
On Fri, Feb 06, 2015 at 12:30:45PM +0100, Sylwester Nawrocki wrote:

> Thank you for merging it.  I hope you picked up the previous 2 as well,
> I couldn't see them in your tree.

I probably will if I don't hear anything but since they don't need to go
as a bug fix I can leave Kukjin a bit longer to say if he's OK with
that.
diff mbox

Patch

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 0cffe39..cb60010 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -371,7 +371,7 @@ 
 	};

 	i2s1: i2s@13960000 {
-		compatible = "samsung,s5pv210-i2s";
+		compatible = "samsung,s3c6410-i2s";
 		reg = <0x13960000 0x100>;
 		clocks = <&clock CLK_I2S1>;
 		clock-names = "iis";
@@ -384,7 +384,7 @@ 
 	};

 	i2s2: i2s@13970000 {
-		compatible = "samsung,s5pv210-i2s";
+		compatible = "samsung,s3c6410-i2s";
 		reg = <0x13970000 0x100>;
 		clocks = <&clock CLK_I2S2>;
 		clock-names = "iis";