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

Commit 5a124fe0 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

ARM: dts: exynos: Move common nodes to exynos5.dtsi 



Exynos5420 and Exynos5250 share some nodes: the PWM, syscon
(sysreg_system_controller) and first four I2C controllers. Move them to
parent DTSI to avoid duplication.

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 8c2bd87e

arch/arm/boot/dts/exynos5.dtsi

+56 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ 
	interrupt-parent = <&gic>;



	aliases {

		i2c0 = &i2c_0;

		i2c1 = &i2c_1;

		i2c2 = &i2c_2;

		i2c3 = &i2c_3;

		serial0 = &serial_0;

		serial1 = &serial_1;

		serial2 = &serial_2;
@@ -63,6 +67,11 @@ 
		interrupts = <1 9 0xf04>;

	};



	sysreg_system_controller: syscon@10050000 {

		compatible = "samsung,exynos5-sysreg", "syscon";

		reg = <0x10050000 0x5000>;

	};



	serial_0: serial@12C00000 {

		compatible = "samsung,exynos4210-uart";

		reg = <0x12C00000 0x100>;
@@ -87,6 +96,53 @@ 
		interrupts = <0 54 0>;

	};



	i2c_0: i2c@12C60000 {

		compatible = "samsung,s3c2440-i2c";

		reg = <0x12C60000 0x100>;

		interrupts = <0 56 0>;

		#address-cells = <1>;

		#size-cells = <0>;

		samsung,sysreg-phandle = <&sysreg_system_controller>;

		status = "disabled";

	};



	i2c_1: i2c@12C70000 {

		compatible = "samsung,s3c2440-i2c";

		reg = <0x12C70000 0x100>;

		interrupts = <0 57 0>;

		#address-cells = <1>;

		#size-cells = <0>;

		samsung,sysreg-phandle = <&sysreg_system_controller>;

		status = "disabled";

	};



	i2c_2: i2c@12C80000 {

		compatible = "samsung,s3c2440-i2c";

		reg = <0x12C80000 0x100>;

		interrupts = <0 58 0>;

		#address-cells = <1>;

		#size-cells = <0>;

		samsung,sysreg-phandle = <&sysreg_system_controller>;

		status = "disabled";

	};



	i2c_3: i2c@12C90000 {

		compatible = "samsung,s3c2440-i2c";

		reg = <0x12C90000 0x100>;

		interrupts = <0 59 0>;

		#address-cells = <1>;

		#size-cells = <0>;

		samsung,sysreg-phandle = <&sysreg_system_controller>;

		status = "disabled";

	};



	pwm: pwm@12DD0000 {

		compatible = "samsung,exynos4210-pwm";

		reg = <0x12DD0000 0x100>;

		samsung,pwm-outputs = <0>, <1>, <2>, <3>;

		#pwm-cells = <3>;

	};



	rtc: rtc@101E0000 {

		compatible = "samsung,s3c6410-rtc";

		reg = <0x101E0000 0x100>;

arch/arm/boot/dts/exynos5250.dtsi

+34 −74
Original line number Diff line number Diff line
@@ -37,10 +37,6 @@ 
		mshc1 = &mmc_1;

		mshc2 = &mmc_2;

		mshc3 = &mmc_3;

		i2c0 = &i2c_0;

		i2c1 = &i2c_1;

		i2c2 = &i2c_2;

		i2c3 = &i2c_3;

		i2c4 = &i2c_4;

		i2c5 = &i2c_5;

		i2c6 = &i2c_6;
@@ -235,11 +231,6 @@ 
		interrupt-parent = <&gic>;

	};



	sysreg_system_controller: syscon@10050000 {

		compatible = "samsung,exynos5-sysreg", "syscon";

		reg = <0x10050000 0x5000>;

	};



	watchdog@101D0000 {

		compatible = "samsung,exynos5250-wdt";

		reg = <0x101D0000 0x100>;
@@ -328,62 +319,7 @@ 
		status = "disabled";

	};



	i2c_0: i2c@12C60000 {

		compatible = "samsung,s3c2440-i2c";

		reg = <0x12C60000 0x100>;

		interrupts = <0 56 0>;

		#address-cells = <1>;

		#size-cells = <0>;

		clocks = <&clock CLK_I2C0>;

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c0_bus>;

		samsung,sysreg-phandle = <&sysreg_system_controller>;

		status = "disabled";

	};



	i2c_1: i2c@12C70000 {

		compatible = "samsung,s3c2440-i2c";

		reg = <0x12C70000 0x100>;

		interrupts = <0 57 0>;

		#address-cells = <1>;

		#size-cells = <0>;

		clocks = <&clock CLK_I2C1>;

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c1_bus>;

		samsung,sysreg-phandle = <&sysreg_system_controller>;

		status = "disabled";

	};



	i2c_2: i2c@12C80000 {

		compatible = "samsung,s3c2440-i2c";

		reg = <0x12C80000 0x100>;

		interrupts = <0 58 0>;

		#address-cells = <1>;

		#size-cells = <0>;

		clocks = <&clock CLK_I2C2>;

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c2_bus>;

		samsung,sysreg-phandle = <&sysreg_system_controller>;

		status = "disabled";

	};



	i2c_3: i2c@12C90000 {

		compatible = "samsung,s3c2440-i2c";

		reg = <0x12C90000 0x100>;

		interrupts = <0 59 0>;

		#address-cells = <1>;

		#size-cells = <0>;

		clocks = <&clock CLK_I2C3>;

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c3_bus>;

		samsung,sysreg-phandle = <&sysreg_system_controller>;

		status = "disabled";

	};



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

	i2c_4: i2c@12CA0000 {

		compatible = "samsung,s3c2440-i2c";

		reg = <0x12CA0000 0x100>;
@@ -662,15 +598,6 @@ 
		samsung,pmureg-phandle = <&pmu_system_controller>;

	};



	pwm: pwm@12dd0000 {

		compatible = "samsung,exynos4210-pwm";

		reg = <0x12dd0000 0x100>;

		samsung,pwm-outputs = <0>, <1>, <2>, <3>;

		#pwm-cells = <3>;

		clocks = <&clock CLK_PWM>;

		clock-names = "timers";

	};



	amba {

		#address-cells = <1>;

		#size-cells = <1>;
@@ -1070,6 +997,39 @@ 
	iommus = <&sysmmu_fimd1>;

};



&i2c_0 {

	clocks = <&clock CLK_I2C0>;

	clock-names = "i2c";

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_bus>;

};



&i2c_1 {

	clocks = <&clock CLK_I2C1>;

	clock-names = "i2c";

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_bus>;

};



&i2c_2 {

	clocks = <&clock CLK_I2C2>;

	clock-names = "i2c";

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_bus>;

};



&i2c_3 {

	clocks = <&clock CLK_I2C3>;

	clock-names = "i2c";

	pinctrl-names = "default";

	pinctrl-0 = <&i2c3_bus>;

};



&pwm {

	clocks = <&clock CLK_PWM>;

	clock-names = "timers";

};



&rtc {

	clocks = <&clock CLK_RTC>;

	clock-names = "rtc";

arch/arm/boot/dts/exynos5420.dtsi

+34 −74
Original line number Diff line number Diff line
@@ -30,10 +30,6 @@ 
		pinctrl2 = &pinctrl_2;

		pinctrl3 = &pinctrl_3;

		pinctrl4 = &pinctrl_4;

		i2c0 = &i2c_0;

		i2c1 = &i2c_1;

		i2c2 = &i2c_2;

		i2c3 = &i2c_3;

		i2c4 = &hsi2c_4;

		i2c5 = &hsi2c_5;

		i2c6 = &hsi2c_6;
@@ -578,15 +574,6 @@ 
		status = "disabled";

	};



	pwm: pwm@12dd0000 {

		compatible = "samsung,exynos4210-pwm";

		reg = <0x12dd0000 0x100>;

		samsung,pwm-outputs = <0>, <1>, <2>, <3>;

		#pwm-cells = <3>;

		clocks = <&clock CLK_PWM>;

		clock-names = "timers";

	};



	dp_phy: dp-video-phy {

		compatible = "samsung,exynos5420-dp-video-phy";

		samsung,pmu-syscon = <&pmu_system_controller>;
@@ -624,62 +611,7 @@ 
		status = "disabled";

	};



	i2c_0: i2c@12C60000 {

		compatible = "samsung,s3c2440-i2c";

		reg = <0x12C60000 0x100>;

		interrupts = <0 56 0>;

		#address-cells = <1>;

		#size-cells = <0>;

		clocks = <&clock CLK_I2C0>;

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c0_bus>;

		samsung,sysreg-phandle = <&sysreg_system_controller>;

		status = "disabled";

	};



	i2c_1: i2c@12C70000 {

		compatible = "samsung,s3c2440-i2c";

		reg = <0x12C70000 0x100>;

		interrupts = <0 57 0>;

		#address-cells = <1>;

		#size-cells = <0>;

		clocks = <&clock CLK_I2C1>;

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c1_bus>;

		samsung,sysreg-phandle = <&sysreg_system_controller>;

		status = "disabled";

	};



	i2c_2: i2c@12C80000 {

		compatible = "samsung,s3c2440-i2c";

		reg = <0x12C80000 0x100>;

		interrupts = <0 58 0>;

		#address-cells = <1>;

		#size-cells = <0>;

		clocks = <&clock CLK_I2C2>;

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c2_bus>;

		samsung,sysreg-phandle = <&sysreg_system_controller>;

		status = "disabled";

	};



	i2c_3: i2c@12C90000 {

		compatible = "samsung,s3c2440-i2c";

		reg = <0x12C90000 0x100>;

		interrupts = <0 59 0>;

		#address-cells = <1>;

		#size-cells = <0>;

		clocks = <&clock CLK_I2C3>;

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c3_bus>;

		samsung,sysreg-phandle = <&sysreg_system_controller>;

		status = "disabled";

	};



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

	hsi2c_4: i2c@12CA0000 {

		compatible = "samsung,exynos5250-hsi2c";

		reg = <0x12CA0000 0x1000>;
@@ -859,11 +791,6 @@ 
		interrupt-parent = <&gic>;

	};



	sysreg_system_controller: syscon@10050000 {

		compatible = "samsung,exynos5-sysreg", "syscon";

		reg = <0x10050000 0x5000>;

	};



	tmu_cpu0: tmu@10060000 {

		compatible = "samsung,exynos5420-tmu";

		reg = <0x10060000 0x100>;
@@ -1614,6 +1541,39 @@ 
	iommu-names = "m0", "m1";

};



&i2c_0 {

	clocks = <&clock CLK_I2C0>;

	clock-names = "i2c";

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_bus>;

};



&i2c_1 {

	clocks = <&clock CLK_I2C1>;

	clock-names = "i2c";

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_bus>;

};



&i2c_2 {

	clocks = <&clock CLK_I2C2>;

	clock-names = "i2c";

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_bus>;

};



&i2c_3 {

	clocks = <&clock CLK_I2C3>;

	clock-names = "i2c";

	pinctrl-names = "default";

	pinctrl-0 = <&i2c3_bus>;

};



&pwm {

	clocks = <&clock CLK_PWM>;

	clock-names = "timers";

};



&rtc {

	clocks = <&clock CLK_RTC>;

	clock-names = "rtc";