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

Commit 087ce39c authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Krzysztof Kozlowski
Browse files

ARM: dts: exynos: Correct clocks for Exynos4 I2S module 



"iis", "i2s_opclk0" and "i2s_opclk1" are standard clocks for Exynos4 I2S
hardware module, so they should be defined in .dtsi file not in the random
board .dts file.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parent 7ce7d89f

arch/arm/boot/dts/exynos4.dtsi

+4 −2
Original line number Original line Diff line number Diff line
@@ -64,8 +64,10 @@ 
	i2s0: i2s@03830000 {

	i2s0: i2s@03830000 {

		compatible = "samsung,s5pv210-i2s";

		compatible = "samsung,s5pv210-i2s";

		reg = <0x03830000 0x100>;

		reg = <0x03830000 0x100>;

		clocks = <&clock_audss EXYNOS_I2S_BUS>;

		clocks = <&clock_audss EXYNOS_I2S_BUS>,

		clock-names = "iis";

			 <&clock_audss EXYNOS_DOUT_AUD_BUS>,

			 <&clock_audss EXYNOS_SCLK_I2S>;

		clock-names = "iis", "i2s_opclk0", "i2s_opclk1";

		#clock-cells = <1>;

		#clock-cells = <1>;

		clock-output-names = "i2s_cdclk0";

		clock-output-names = "i2s_cdclk0";

		dmas = <&pdma0 12>, <&pdma0 11>, <&pdma0 10>;

		dmas = <&pdma0 12>, <&pdma0 11>, <&pdma0 10>;

arch/arm/boot/dts/exynos4412-itop-elite.dts

+0 −4
Original line number Original line Diff line number Diff line
@@ -198,10 +198,6 @@ 
	pinctrl-0 = <&i2s0_bus>;

	pinctrl-0 = <&i2s0_bus>;

	pinctrl-names = "default";

	pinctrl-names = "default";

	status = "okay";

	status = "okay";

	clocks = <&clock_audss EXYNOS_I2S_BUS>,

		 <&clock_audss EXYNOS_DOUT_AUD_BUS>,

		 <&clock_audss EXYNOS_SCLK_I2S>;

	clock-names = "iis", "i2s_opclk0", "i2s_opclk1";

};

};





&pinctrl_1 {

&pinctrl_1 {

arch/arm/boot/dts/exynos4412-odroid-common.dtsi

+0 −4
Original line number Original line Diff line number Diff line
@@ -503,10 +503,6 @@ 
	pinctrl-0 = <&i2s0_bus>;

	pinctrl-0 = <&i2s0_bus>;

	pinctrl-names = "default";

	pinctrl-names = "default";

	status = "okay";

	status = "okay";

	clocks = <&clock_audss EXYNOS_I2S_BUS>,

		 <&clock_audss EXYNOS_DOUT_AUD_BUS>,

		 <&clock_audss EXYNOS_SCLK_I2S>;

	clock-names = "iis", "i2s_opclk0", "i2s_opclk1";

};

};





&mixer {

&mixer {