Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c503ca52 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/samsung' into asoc-linus

parents b2dde2f9 fddcd300

arch/arm/boot/dts/exynos4.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ 
	};



	i2s1: i2s@13960000 {

		compatible = "samsung,s5pv210-i2s";

		compatible = "samsung,s3c6410-i2s";

		reg = <0x13960000 0x100>;

		clocks = <&clock CLK_I2S1>;

		clock-names = "iis";
@@ -378,7 +378,7 @@ 
	};



	i2s2: i2s@13970000 {

		compatible = "samsung,s5pv210-i2s";

		compatible = "samsung,s3c6410-i2s";

		reg = <0x13970000 0x100>;

		clocks = <&clock CLK_I2S2>;

		clock-names = "iis";