ARM: dts: Use labels for overriding nodes in exynos4412-odroid

Usage of labels instead of full paths reduces possible mistakes when
overriding nodes.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>

For thermal zones:
Acked-by: Eduardo Valentin <edubezval@gmail.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>

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

@@ -38,16 +38,6 @@ power_key {
 		};
 	};
 
-	i2s0: i2s@03830000 {
-		pinctrl-0 = <&i2s0_bus>;
-		pinctrl-names = "default";
-		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";
-	};
-
 	sound: sound {
 		compatible = "simple-audio-card";
 		assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>,
@@ -83,106 +73,128 @@ emmc_pwrseq: pwrseq {
 		reset-gpios = <&gpk1 2 1>;
 	};
 
-	mmc@12550000 {
-		pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
-		pinctrl-names = "default";
-		vmmc-supply = <&ldo20_reg &buck8_reg>;
-		mmc-pwrseq = <&emmc_pwrseq>;
+	camera {
 		status = "okay";
+		pinctrl-names = "default";
+		pinctrl-0 = <>;
+	};
 
-		num-slots = <1>;
-		broken-cd;
-		card-detect-delay = <200>;
-		samsung,dw-mshc-ciu-div = <3>;
-		samsung,dw-mshc-sdr-timing = <2 3>;
-		samsung,dw-mshc-ddr-timing = <1 2>;
-		bus-width = <8>;
-		cap-mmc-highspeed;
+	fixed-rate-clocks {
+		xxti {
+			compatible = "samsung,clock-xxti";
+			clock-frequency = <0>;
 		};
 
-	watchdog@10060000 {
-		status = "okay";
+		xusbxti {
+			compatible = "samsung,clock-xusbxti";
+			clock-frequency = <24000000>;
+		};
 	};
 
-	rtc@10070000 {
-		status = "okay";
-		clocks = <&clock CLK_RTC>, <&max77686 MAX77686_CLK_AP>;
-		clock-names = "rtc", "rtc_src";
+	thermal-zones {
+		cpu_thermal: cpu-thermal {
+			cooling-maps {
+				map0 {
+				     /* Corresponds to 800MHz at freq_table */
+				     cooling-device = <&cpu0 7 7>;
+				};
+				map1 {
+				     /* Corresponds to 200MHz at freq_table */
+				     cooling-device = <&cpu0 13 13>;
+			       };
+		       };
 		};
+	};
+};
 
-	g2d@10800000 {
-		status = "okay";
+/* RSTN signal for eMMC */
+&sd1_cd {
+	samsung,pin-pud = <0>;
+	samsung,pin-drv = <0>;
+};
+
+&pinctrl_1 {
+	gpio_power_key: power_key {
+		samsung,pins = "gpx1-3";
+		samsung,pin-pud = <0>;
 	};
 
-	camera {
+	max77686_irq: max77686-irq {
+		samsung,pins = "gpx3-2";
+		samsung,pin-function = <0>;
+		samsung,pin-pud = <0>;
+		samsung,pin-drv = <0>;
+	};
+
+	hdmi_hpd: hdmi-hpd {
+		samsung,pins = "gpx3-7";
+		samsung,pin-pud = <1>;
+	};
+};
+
+&ehci {
 	status = "okay";
-		pinctrl-names = "default";
-		pinctrl-0 = <>;
+};
 
-		fimc_0: fimc@11800000 {
+&exynos_usbphy {
+	status = "okay";
+};
+
+&fimc_0 {
 	status = "okay";
 	assigned-clocks = <&clock CLK_MOUT_FIMC0>,
 			<&clock CLK_SCLK_FIMC0>;
 	assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
 	assigned-clock-rates = <0>, <176000000>;
-		};
+};
 
-		fimc_1: fimc@11810000 {
+&fimc_1 {
 	status = "okay";
 	assigned-clocks = <&clock CLK_MOUT_FIMC1>,
 			<&clock CLK_SCLK_FIMC1>;
 	assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
 	assigned-clock-rates = <0>, <176000000>;
-		};
+};
 
-		fimc_2: fimc@11820000 {
+&fimc_2 {
 	status = "okay";
 	assigned-clocks = <&clock CLK_MOUT_FIMC2>,
 			<&clock CLK_SCLK_FIMC2>;
 	assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
 	assigned-clock-rates = <0>, <176000000>;
-		};
+};
 
-		fimc_3: fimc@11830000 {
+&fimc_3 {
 	status = "okay";
 	assigned-clocks = <&clock CLK_MOUT_FIMC3>,
 			<&clock CLK_SCLK_FIMC3>;
 	assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
 	assigned-clock-rates = <0>, <176000000>;
-		};
-	};
+};
 
-	sdhci@12530000 {
-		bus-width = <4>;
-		pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
-		pinctrl-names = "default";
-		vmmc-supply = <&ldo4_reg &ldo21_reg>;
-		cd-gpios = <&gpk2 2 0>;
-		cd-inverted;
+&g2d {
 	status = "okay";
-	};
+};
 
-	serial@13800000 {
+&hdmi {
+	hpd-gpio = <&gpx3 7 0>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&hdmi_hpd>;
+	vdd-supply = <&ldo8_reg>;
+	vdd_osc-supply = <&ldo10_reg>;
+	vdd_pll-supply = <&ldo8_reg>;
+	ddc = <&i2c_2>;
 	status = "okay";
-	};
+};
 
-	serial@13810000 {
+&hsotg {
+	dr_mode = "peripheral";
 	status = "okay";
-	};
-
-	fixed-rate-clocks {
-		xxti {
-			compatible = "samsung,clock-xxti";
-			clock-frequency = <0>;
-		};
-
-		xusbxti {
-			compatible = "samsung,clock-xusbxti";
-			clock-frequency = <24000000>;
-		};
-	};
+	vusb_d-supply = <&ldo15_reg>;
+	vusb_a-supply = <&ldo12_reg>;
+};
 
-	i2c@13860000 {
+&i2c_0 {
 	pinctrl-0 = <&i2c0_bus>;
 	pinctrl-names = "default";
 	samsung,i2c-sda-delay = <100>;
@@ -405,9 +417,9 @@ buck8_reg: BUCK8 {
 			};
 		};
 	};
-	};
+};
 
-	i2c@13870000 {
+&i2c_1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c1_bus>;
 	status = "okay";
@@ -420,90 +432,78 @@ max98090: max98090@10 {
 		clock-names = "mclk";
 		#sound-dai-cells = <0>;
 	};
-	};
+};
 
-	exynos-usbphy@125B0000 {
+&i2c_2 {
 	status = "okay";
-	};
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c2_bus>;
+};
 
-	hsotg@12480000 {
-		dr_mode = "peripheral";
+&i2c_8 {
 	status = "okay";
-		vusb_d-supply = <&ldo15_reg>;
-		vusb_a-supply = <&ldo12_reg>;
-	};
+};
 
-	ehci: ehci@12580000 {
+&i2s0 {
+	pinctrl-0 = <&i2s0_bus>;
+	pinctrl-names = "default";
 	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";
+};
 
-	tmu@100C0000 {
-		vtmu-supply = <&ldo10_reg>;
+&mixer {
 	status = "okay";
-	};
+};
 
-	thermal-zones {
-		cpu_thermal: cpu-thermal {
-			cooling-maps {
-				map0 {
-				     /* Corresponds to 800MHz at freq_table */
-				     cooling-device = <&cpu0 7 7>;
-				};
-				map1 {
-				     /* Corresponds to 200MHz at freq_table */
-				     cooling-device = <&cpu0 13 13>;
-			       };
-		       };
-		};
-	};
+&mshc_0 {
+	pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
+	pinctrl-names = "default";
+	vmmc-supply = <&ldo20_reg &buck8_reg>;
+	mmc-pwrseq = <&emmc_pwrseq>;
+	status = "okay";
 
-	mixer: mixer@12C10000 {
+	num-slots = <1>;
+	broken-cd;
+	card-detect-delay = <200>;
+	samsung,dw-mshc-ciu-div = <3>;
+	samsung,dw-mshc-sdr-timing = <2 3>;
+	samsung,dw-mshc-ddr-timing = <1 2>;
+	bus-width = <8>;
+	cap-mmc-highspeed;
+};
+
+&rtc {
 	status = "okay";
-	};
+	clocks = <&clock CLK_RTC>, <&max77686 MAX77686_CLK_AP>;
+	clock-names = "rtc", "rtc_src";
+};
 
-	hdmi@12D00000 {
-		hpd-gpio = <&gpx3 7 0>;
+&sdhci_2 {
+	bus-width = <4>;
+	pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
 	pinctrl-names = "default";
-		pinctrl-0 = <&hdmi_hpd>;
-		vdd-supply = <&ldo8_reg>;
-		vdd_osc-supply = <&ldo10_reg>;
-		vdd_pll-supply = <&ldo8_reg>;
-		ddc = <&hdmi_ddc>;
+	vmmc-supply = <&ldo4_reg &ldo21_reg>;
+	cd-gpios = <&gpk2 2 0>;
+	cd-inverted;
 	status = "okay";
-	};
+};
 
-	hdmi_ddc: i2c@13880000 {
+&serial_0 {
 	status = "okay";
-		pinctrl-names = "default";
-		pinctrl-0 = <&i2c2_bus>;
-	};
+};
 
-	i2c@138E0000 {
+&serial_1 {
 	status = "okay";
-	};
 };
 
-/* RSTN signal for eMMC */
-&sd1_cd {
-	samsung,pin-pud = <0>;
-	samsung,pin-drv = <0>;
+&tmu {
+	vtmu-supply = <&ldo10_reg>;
+	status = "okay";
 };
 
-&pinctrl_1 {
-	gpio_power_key: power_key {
-		samsung,pins = "gpx1-3";
-		samsung,pin-pud = <0>;
-	};
-
-	max77686_irq: max77686-irq {
-		samsung,pins = "gpx3-2";
-		samsung,pin-function = <0>;
-		samsung,pin-pud = <0>;
-		samsung,pin-drv = <0>;
-	};
-
-	hdmi_hpd: hdmi-hpd {
-		samsung,pins = "gpx3-7";
-		samsung,pin-pud = <1>;
-	};
+&watchdog {
+	status = "okay";
 };

arch/arm/boot/dts/exynos4412-odroidx.dts

@@ -38,14 +38,6 @@ led2 {
 		};
 	};
 
-	serial@13820000 {
-		status = "okay";
-	};
-
-	serial@13830000 {
-		status = "okay";
-	};
-
 	gpio_keys {
 		pinctrl-0 = <&gpio_power_key &gpio_home_key>;
 
@@ -83,3 +75,11 @@ gpio_home_key: home_key {
 		samsung,pin-pud = <0>;
 	};
 };
+
+&serial_2 {
+	status = "okay";
+};
+
+&serial_3 {
+	status = "okay";
+};