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

Commit 538fc7ad authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

ARM: dts: exynos: Move HSI2C nodes to exynos54xx.dtsi 



The USI/HSI2C nodes can be mostly shared between Exynos5420 and
Exynos5410 so move them to common DTSI.

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Tested-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
parent 8149afe4

arch/arm/boot/dts/exynos5420.dtsi

+28 −57
Original line number Diff line number Diff line
@@ -29,10 +29,6 @@ 
		pinctrl2 = &pinctrl_2;

		pinctrl3 = &pinctrl_3;

		pinctrl4 = &pinctrl_4;

		i2c4 = &hsi2c_4;

		i2c5 = &hsi2c_5;

		i2c6 = &hsi2c_6;

		i2c7 = &hsi2c_7;

		i2c8 = &hsi2c_8;

		i2c9 = &hsi2c_9;

		i2c10 = &hsi2c_10;
@@ -562,59 +558,6 @@ 
			status = "disabled";

		};



		/* i2c_0-3 are defined in exynos5.dtsi */

		hsi2c_4: i2c@12CA0000 {

			compatible = "samsung,exynos5250-hsi2c";

			reg = <0x12CA0000 0x1000>;

			interrupts = <0 60 0>;

			#address-cells = <1>;

			#size-cells = <0>;

			pinctrl-names = "default";

			pinctrl-0 = <&i2c4_hs_bus>;

			clocks = <&clock CLK_USI0>;

			clock-names = "hsi2c";

			status = "disabled";

		};



		hsi2c_5: i2c@12CB0000 {

			compatible = "samsung,exynos5250-hsi2c";

			reg = <0x12CB0000 0x1000>;

			interrupts = <0 61 0>;

			#address-cells = <1>;

			#size-cells = <0>;

			pinctrl-names = "default";

			pinctrl-0 = <&i2c5_hs_bus>;

			clocks = <&clock CLK_USI1>;

			clock-names = "hsi2c";

			status = "disabled";

		};



		hsi2c_6: i2c@12CC0000 {

			compatible = "samsung,exynos5250-hsi2c";

			reg = <0x12CC0000 0x1000>;

			interrupts = <0 62 0>;

			#address-cells = <1>;

			#size-cells = <0>;

			pinctrl-names = "default";

			pinctrl-0 = <&i2c6_hs_bus>;

			clocks = <&clock CLK_USI2>;

			clock-names = "hsi2c";

			status = "disabled";

		};



		hsi2c_7: i2c@12CD0000 {

			compatible = "samsung,exynos5250-hsi2c";

			reg = <0x12CD0000 0x1000>;

			interrupts = <0 63 0>;

			#address-cells = <1>;

			#size-cells = <0>;

			pinctrl-names = "default";

			pinctrl-0 = <&i2c7_hs_bus>;

			clocks = <&clock CLK_USI3>;

			clock-names = "hsi2c";

			status = "disabled";

		};



		hsi2c_8: i2c@12E00000 {

			compatible = "samsung,exynos5250-hsi2c";

			reg = <0x12E00000 0x1000>;
@@ -1429,6 +1372,34 @@ 
	pinctrl-0 = <&i2c3_bus>;

};



&hsi2c_4 {

	clocks = <&clock CLK_USI0>;

	clock-names = "hsi2c";

	pinctrl-names = "default";

	pinctrl-0 = <&i2c4_hs_bus>;

};



&hsi2c_5 {

	clocks = <&clock CLK_USI1>;

	clock-names = "hsi2c";

	pinctrl-names = "default";

	pinctrl-0 = <&i2c5_hs_bus>;

};



&hsi2c_6 {

	clocks = <&clock CLK_USI2>;

	clock-names = "hsi2c";

	pinctrl-names = "default";

	pinctrl-0 = <&i2c6_hs_bus>;

};



&hsi2c_7 {

	clocks = <&clock CLK_USI3>;

	clock-names = "hsi2c";

	pinctrl-names = "default";

	pinctrl-0 = <&i2c7_hs_bus>;

};



&mct {

	clocks = <&clock CLK_FIN_PLL>, <&clock CLK_MCT>;

	clock-names = "fin_pll", "mct";

arch/arm/boot/dts/exynos54xx.dtsi

+41 −0
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ 
	compatible = "samsung,exynos5";



	aliases {

		i2c4 = &hsi2c_4;

		i2c5 = &hsi2c_5;

		i2c6 = &hsi2c_6;

		i2c7 = &hsi2c_7;

		usbdrdphy0 = &usbdrd_phy0;

		usbdrdphy1 = &usbdrd_phy1;

	};
@@ -70,6 +74,43 @@ 
			};

		};



		/* i2c_0-3 are defined in exynos5.dtsi */

		hsi2c_4: i2c@12ca0000 {

			compatible = "samsung,exynos5250-hsi2c";

			reg = <0x12ca0000 0x1000>;

			interrupts = <0 60 0>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};



		hsi2c_5: i2c@12cb0000 {

			compatible = "samsung,exynos5250-hsi2c";

			reg = <0x12cb0000 0x1000>;

			interrupts = <0 61 0>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};



		hsi2c_6: i2c@12cc0000 {

			compatible = "samsung,exynos5250-hsi2c";

			reg = <0x12cc0000 0x1000>;

			interrupts = <0 62 0>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};



		hsi2c_7: i2c@12cd0000 {

			compatible = "samsung,exynos5250-hsi2c";

			reg = <0x12cd0000 0x1000>;

			interrupts = <0 63 0>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};



		usbdrd3_0: usb3-0 {

			compatible = "samsung,exynos5250-dwusb3";

			#address-cells = <1>;