[PATCHv2 09/11] ARM: dts: exynos4: Use labels for overriding nodes in Odroid

2015-04-17 Thread Krzysztof Kozlowski
Usage of lablels instead of full paths reduces possible mistakes when
overriding nodes.

Signed-off-by: Krzysztof Kozlowski 
---
 arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 728 
 arch/arm/boot/dts/exynos4412-odroidx.dts|  16 +-
 2 files changed, 372 insertions(+), 372 deletions(-)

diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi 
b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index 8de12af7c276..6801ee6c4449 100644
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -37,16 +37,6 @@
};
};
 
-   i2s0: i2s@0383 {
-   pinctrl-0 = <_bus>;
-   pinctrl-names = "default";
-   status = "okay";
-   clocks = <_audss EXYNOS_I2S_BUS>,
-<_audss EXYNOS_DOUT_AUD_BUS>,
-<_audss EXYNOS_SCLK_I2S>;
-   clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
-   };
-
sound: sound {
compatible = "simple-audio-card";
assigned-clocks = <_audss EXYNOS_MOUT_AUDSS>,
@@ -82,425 +72,435 @@
reset-gpios = < 2 1>;
};
 
-   mmc@1255 {
-   pinctrl-0 = <_clk _cmd _bus4 _bus8>;
-   pinctrl-names = "default";
-   vmmc-supply = <_reg _reg>;
-   mmc-pwrseq = <_pwrseq>;
-   status = "okay";
-
-   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;
-   };
-
-   watchdog@1006 {
-   status = "okay";
-   };
-
-   rtc@1007 {
-   status = "okay";
-   };
-
-   g2d@1080 {
-   status = "okay";
-   };
-
camera {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <>;
+   };
 
-   fimc_0: fimc@1180 {
-   status = "okay";
-   assigned-clocks = < CLK_MOUT_FIMC0>,
-   < CLK_SCLK_FIMC0>;
-   assigned-clock-parents = < CLK_MOUT_MPLL_USER_T>;
-   assigned-clock-rates = <0>, <17600>;
-   };
-
-   fimc_1: fimc@1181 {
-   status = "okay";
-   assigned-clocks = < CLK_MOUT_FIMC1>,
-   < CLK_SCLK_FIMC1>;
-   assigned-clock-parents = < CLK_MOUT_MPLL_USER_T>;
-   assigned-clock-rates = <0>, <17600>;
+   fixed-rate-clocks {
+   xxti {
+   compatible = "samsung,clock-xxti";
+   clock-frequency = <0>;
};
 
-   fimc_2: fimc@1182 {
-   status = "okay";
-   assigned-clocks = < CLK_MOUT_FIMC2>,
-   < CLK_SCLK_FIMC2>;
-   assigned-clock-parents = < CLK_MOUT_MPLL_USER_T>;
-   assigned-clock-rates = <0>, <17600>;
+   xusbxti {
+   compatible = "samsung,clock-xusbxti";
+   clock-frequency = <2400>;
};
+   };
 
-   fimc_3: fimc@1183 {
-   status = "okay";
-   assigned-clocks = < CLK_MOUT_FIMC3>,
-   < CLK_SCLK_FIMC3>;
-   assigned-clock-parents = < CLK_MOUT_MPLL_USER_T>;
-   assigned-clock-rates = <0>, <17600>;
+   thermal-zones {
+   cpu_thermal: cpu-thermal {
+   cooling-maps {
+   map0 {
+/* Corresponds to 800MHz at freq_table */
+cooling-device = < 7 7>;
+   };
+   map1 {
+/* Corresponds to 200MHz at freq_table */
+cooling-device = < 13 13>;
+  };
+  };
};
};
+};
 
-   sdhci@1253 {
-   bus-width = <4>;
-   pinctrl-0 = <_clk _cmd _cd _bus4>;
-   pinctrl-names = "default";
-   vmmc-supply = <_reg _reg>;
-   cd-gpios = < 2 0>;
-   cd-inverted;
-   status = "okay";
-   };
+/* RSTN signal for eMMC */
+_cd {
+   samsung,pin-pud = <0>;
+   samsung,pin-drv = <0>;
+};
 
-   serial@1380 {
-   status = "okay";
+_1 {
+   gpio_power_key: power_key {
+   

[PATCHv2 09/11] ARM: dts: exynos4: Use labels for overriding nodes in Odroid

2015-04-17 Thread Krzysztof Kozlowski
Usage of lablels instead of full paths reduces possible mistakes when
overriding nodes.

Signed-off-by: Krzysztof Kozlowski k.kozlowsk...@gmail.com
---
 arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 728 
 arch/arm/boot/dts/exynos4412-odroidx.dts|  16 +-
 2 files changed, 372 insertions(+), 372 deletions(-)

diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi 
b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index 8de12af7c276..6801ee6c4449 100644
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -37,16 +37,6 @@
};
};
 
-   i2s0: i2s@0383 {
-   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,
@@ -82,425 +72,435 @@
reset-gpios = gpk1 2 1;
};
 
-   mmc@1255 {
-   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;
-
-   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;
-   };
-
-   watchdog@1006 {
-   status = okay;
-   };
-
-   rtc@1007 {
-   status = okay;
-   };
-
-   g2d@1080 {
-   status = okay;
-   };
-
camera {
status = okay;
pinctrl-names = default;
pinctrl-0 = ;
+   };
 
-   fimc_0: fimc@1180 {
-   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, 17600;
-   };
-
-   fimc_1: fimc@1181 {
-   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, 17600;
+   fixed-rate-clocks {
+   xxti {
+   compatible = samsung,clock-xxti;
+   clock-frequency = 0;
};
 
-   fimc_2: fimc@1182 {
-   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, 17600;
+   xusbxti {
+   compatible = samsung,clock-xusbxti;
+   clock-frequency = 2400;
};
+   };
 
-   fimc_3: fimc@1183 {
-   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, 17600;
+   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;
+  };
+  };
};
};
+};
 
-   sdhci@1253 {
-   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;
-   status = okay;
-   };
+/* RSTN signal for eMMC */
+sd1_cd {
+   samsung,pin-pud = 0;
+   samsung,pin-drv = 0;
+};
 
-   serial@1380 {
-   status = okay;
+pinctrl_1 {
+