lkml.org 
[lkml]   [2015]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/7] ARM: dts: Use phandle notation for overriding nodes in Arndale Octa
    Date
    The phandle notation reduces possible mistakes when overriding nodes.

    Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
    ---
    arch/arm/boot/dts/exynos5420-arndale-octa.dts | 634 +++++++++++++-------------
    1 file changed, 317 insertions(+), 317 deletions(-)

    diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
    index 97346df31d41..7eb0e6b703bf 100644
    --- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
    +++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
    @@ -39,323 +39,6 @@
    };
    };

    - codec@11000000 {
    - samsung,mfc-r = <0x43000000 0x800000>;
    - samsung,mfc-l = <0x51000000 0x800000>;
    - };
    -
    - mmc@12200000 {
    - status = "okay";
    - broken-cd;
    - card-detect-delay = <200>;
    - samsung,dw-mshc-ciu-div = <3>;
    - samsung,dw-mshc-sdr-timing = <0 4>;
    - samsung,dw-mshc-ddr-timing = <0 2>;
    - pinctrl-names = "default";
    - pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus1 &sd0_bus4 &sd0_bus8>;
    - vmmc-supply = <&ldo10_reg>;
    - bus-width = <8>;
    - cap-mmc-highspeed;
    - };
    -
    - mmc@12220000 {
    - status = "okay";
    - card-detect-delay = <200>;
    - samsung,dw-mshc-ciu-div = <3>;
    - samsung,dw-mshc-sdr-timing = <2 3>;
    - samsung,dw-mshc-ddr-timing = <1 2>;
    - pinctrl-names = "default";
    - pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus1 &sd2_bus4>;
    - vmmc-supply = <&ldo19_reg>;
    - vqmmc-supply = <&ldo13_reg>;
    - bus-width = <4>;
    - cap-sd-highspeed;
    - };
    -
    - hsi2c_4: i2c@12CA0000 {
    - status = "okay";
    -
    - s2mps11_pmic@66 {
    - compatible = "samsung,s2mps11-pmic";
    - reg = <0x66>;
    - s2mps11,buck2-ramp-delay = <12>;
    - s2mps11,buck34-ramp-delay = <12>;
    - s2mps11,buck16-ramp-delay = <12>;
    - s2mps11,buck6-ramp-enable = <1>;
    - s2mps11,buck2-ramp-enable = <1>;
    - s2mps11,buck3-ramp-enable = <1>;
    - s2mps11,buck4-ramp-enable = <1>;
    -
    - interrupt-parent = <&gpx3>;
    - interrupts = <2 IRQ_TYPE_EDGE_FALLING>;
    - pinctrl-names = "default";
    - pinctrl-0 = <&s2mps11_irq>;
    -
    - s2mps11_osc: clocks {
    - #clock-cells = <1>;
    - clock-output-names = "s2mps11_ap",
    - "s2mps11_cp", "s2mps11_bt";
    - };
    -
    - regulators {
    - ldo1_reg: LDO1 {
    - regulator-name = "PVDD_ALIVE_1V0";
    - regulator-min-microvolt = <1000000>;
    - regulator-max-microvolt = <1000000>;
    - regulator-always-on;
    - };
    -
    - ldo2_reg: LDO2 {
    - regulator-name = "PVDD_APIO_1V8";
    - regulator-min-microvolt = <1800000>;
    - regulator-max-microvolt = <1800000>;
    - };
    -
    - ldo3_reg: LDO3 {
    - regulator-name = "PVDD_APIO_MMCON_1V8";
    - regulator-min-microvolt = <1800000>;
    - regulator-max-microvolt = <1800000>;
    - regulator-always-on;
    - };
    -
    - ldo4_reg: LDO4 {
    - regulator-name = "PVDD_ADC_1V8";
    - regulator-min-microvolt = <1800000>;
    - regulator-max-microvolt = <1800000>;
    - };
    -
    - ldo5_reg: LDO5 {
    - regulator-name = "PVDD_PLL_1V8";
    - regulator-min-microvolt = <1800000>;
    - regulator-max-microvolt = <1800000>;
    - regulator-always-on;
    - };
    -
    - ldo6_reg: LDO6 {
    - regulator-name = "PVDD_ANAIP_1V0";
    - regulator-min-microvolt = <1000000>;
    - regulator-max-microvolt = <1000000>;
    - };
    -
    - ldo7_reg: LDO7 {
    - regulator-name = "PVDD_ANAIP_1V8";
    - regulator-min-microvolt = <1800000>;
    - regulator-max-microvolt = <1800000>;
    - };
    -
    - ldo8_reg: LDO8 {
    - regulator-name = "PVDD_ABB_1V8";
    - regulator-min-microvolt = <1800000>;
    - regulator-max-microvolt = <1800000>;
    - };
    -
    - ldo9_reg: LDO9 {
    - regulator-name = "PVDD_USB_3V3";
    - regulator-min-microvolt = <3000000>;
    - regulator-max-microvolt = <3000000>;
    - regulator-always-on;
    - };
    -
    - ldo10_reg: LDO10 {
    - regulator-name = "PVDD_PRE_1V8";
    - regulator-min-microvolt = <1800000>;
    - regulator-max-microvolt = <1800000>;
    - regulator-always-on;
    - };
    -
    - ldo11_reg: LDO11 {
    - regulator-name = "PVDD_USB_1V0";
    - regulator-min-microvolt = <1000000>;
    - regulator-max-microvolt = <1000000>;
    - regulator-always-on;
    - };
    -
    - ldo12_reg: LDO12 {
    - regulator-name = "PVDD_HSIC_1V8";
    - regulator-min-microvolt = <1800000>;
    - regulator-max-microvolt = <1800000>;
    - };
    -
    - ldo13_reg: LDO13 {
    - regulator-name = "PVDD_APIO_MMCOFF_2V8";
    - regulator-min-microvolt = <2800000>;
    - regulator-max-microvolt = <2800000>;
    - };
    -
    - ldo15_reg: LDO15 {
    - regulator-name = "PVDD_PERI_2V8";
    - regulator-min-microvolt = <3300000>;
    - regulator-max-microvolt = <3300000>;
    - };
    -
    - ldo16_reg: LDO16 {
    - regulator-name = "PVDD_PERI_3V3";
    - regulator-min-microvolt = <2200000>;
    - regulator-max-microvolt = <2200000>;
    - };
    -
    - ldo18_reg: LDO18 {
    - regulator-name = "PVDD_EMMC_1V8";
    - regulator-min-microvolt = <1800000>;
    - regulator-max-microvolt = <1800000>;
    - };
    -
    - ldo19_reg: LDO19 {
    - regulator-name = "PVDD_TFLASH_2V8";
    - regulator-min-microvolt = <2800000>;
    - regulator-max-microvolt = <2800000>;
    - };
    -
    - ldo20_reg: LDO20 {
    - regulator-name = "PVDD_BTWIFI_1V8";
    - regulator-min-microvolt = <1800000>;
    - regulator-max-microvolt = <1800000>;
    - };
    -
    - ldo21_reg: LDO21 {
    - regulator-name = "PVDD_CAM1IO_1V8";
    - regulator-min-microvolt = <1800000>;
    - regulator-max-microvolt = <1800000>;
    - };
    -
    - ldo23_reg: LDO23 {
    - regulator-name = "PVDD_MIFS_1V1";
    - regulator-min-microvolt = <1200000>;
    - regulator-max-microvolt = <1200000>;
    - regulator-always-on;
    - };
    -
    - ldo24_reg: LDO24 {
    - regulator-name = "PVDD_CAM1_AVDD_2V8";
    - regulator-min-microvolt = <2800000>;
    - regulator-max-microvolt = <2800000>;
    - };
    -
    - ldo26_reg: LDO26 {
    - regulator-name = "PVDD_CAM0_AF_2V8";
    - regulator-min-microvolt = <3000000>;
    - regulator-max-microvolt = <3000000>;
    - };
    -
    - ldo27_reg: LDO27 {
    - regulator-name = "PVDD_G3DS_1V0";
    - regulator-min-microvolt = <1200000>;
    - regulator-max-microvolt = <1200000>;
    - };
    -
    - ldo28_reg: LDO28 {
    - regulator-name = "PVDD_TSP_3V3";
    - regulator-min-microvolt = <3300000>;
    - regulator-max-microvolt = <3300000>;
    - };
    -
    - ldo29_reg: LDO29 {
    - regulator-name = "PVDD_AUDIO_1V8";
    - regulator-min-microvolt = <1800000>;
    - regulator-max-microvolt = <1800000>;
    - };
    -
    - ldo31_reg: LDO31 {
    - regulator-name = "PVDD_PERI_1V8";
    - regulator-min-microvolt = <1800000>;
    - regulator-max-microvolt = <1800000>;
    - };
    -
    - ldo32_reg: LDO32 {
    - regulator-name = "PVDD_LCD_1V8";
    - regulator-min-microvolt = <1800000>;
    - regulator-max-microvolt = <1800000>;
    - };
    -
    - ldo33_reg: LDO33 {
    - regulator-name = "PVDD_CAM0IO_1V8";
    - regulator-min-microvolt = <1800000>;
    - regulator-max-microvolt = <1800000>;
    - };
    -
    - ldo35_reg: LDO35 {
    - regulator-name = "PVDD_CAM0_DVDD_1V2";
    - regulator-min-microvolt = <1200000>;
    - regulator-max-microvolt = <1200000>;
    - };
    -
    - ldo38_reg: LDO38 {
    - regulator-name = "PVDD_CAM0_AVDD_2V8";
    - regulator-min-microvolt = <2800000>;
    - regulator-max-microvolt = <2800000>;
    - };
    -
    - buck1_reg: BUCK1 {
    - regulator-name = "PVDD_MIF_1V1";
    - regulator-min-microvolt = <800000>;
    - regulator-max-microvolt = <1100000>;
    - regulator-always-on;
    - };
    -
    - buck2_reg: BUCK2 {
    - regulator-name = "vdd_arm";
    - regulator-min-microvolt = <800000>;
    - regulator-max-microvolt = <1000000>;
    - regulator-always-on;
    - };
    -
    - buck3_reg: BUCK3 {
    - regulator-name = "PVDD_INT_1V0";
    - regulator-min-microvolt = <800000>;
    - regulator-max-microvolt = <1000000>;
    - regulator-always-on;
    - };
    -
    - buck4_reg: BUCK4 {
    - regulator-name = "PVDD_G3D_1V0";
    - regulator-min-microvolt = <800000>;
    - regulator-max-microvolt = <1000000>;
    - };
    -
    - buck5_reg: BUCK5 {
    - regulator-name = "PVDD_LPDDR3_1V2";
    - regulator-min-microvolt = <800000>;
    - regulator-max-microvolt = <1200000>;
    - regulator-always-on;
    - };
    -
    - buck6_reg: BUCK6 {
    - regulator-name = "PVDD_KFC_1V0";
    - regulator-min-microvolt = <800000>;
    - regulator-max-microvolt = <1000000>;
    - regulator-always-on;
    - };
    -
    - buck7_reg: BUCK7 {
    - regulator-name = "VIN_LLDO_1V4";
    - regulator-min-microvolt = <800000>;
    - regulator-max-microvolt = <1400000>;
    - regulator-always-on;
    - };
    -
    - buck8_reg: BUCK8 {
    - regulator-name = "VIN_MLDO_2V0";
    - regulator-min-microvolt = <800000>;
    - regulator-max-microvolt = <2000000>;
    - regulator-always-on;
    - };
    -
    - buck9_reg: BUCK9 {
    - regulator-name = "VIN_HLDO_3V5";
    - regulator-min-microvolt = <3000000>;
    - regulator-max-microvolt = <3500000>;
    - regulator-always-on;
    - };
    -
    - buck10_reg: BUCK10 {
    - regulator-name = "PVDD_EMMCF_2V8";
    - regulator-min-microvolt = <2800000>;
    - regulator-max-microvolt = <2800000>;
    - };
    - };
    - };
    - };
    -
    gpio_keys {
    compatible = "gpio-keys";

    @@ -376,6 +59,323 @@
    status = "disabled";
    };

    +&hsi2c_4 {
    + status = "okay";
    +
    + s2mps11_pmic@66 {
    + compatible = "samsung,s2mps11-pmic";
    + reg = <0x66>;
    + s2mps11,buck2-ramp-delay = <12>;
    + s2mps11,buck34-ramp-delay = <12>;
    + s2mps11,buck16-ramp-delay = <12>;
    + s2mps11,buck6-ramp-enable = <1>;
    + s2mps11,buck2-ramp-enable = <1>;
    + s2mps11,buck3-ramp-enable = <1>;
    + s2mps11,buck4-ramp-enable = <1>;
    +
    + interrupt-parent = <&gpx3>;
    + interrupts = <2 IRQ_TYPE_EDGE_FALLING>;
    + pinctrl-names = "default";
    + pinctrl-0 = <&s2mps11_irq>;
    +
    + s2mps11_osc: clocks {
    + #clock-cells = <1>;
    + clock-output-names = "s2mps11_ap",
    + "s2mps11_cp", "s2mps11_bt";
    + };
    +
    + regulators {
    + ldo1_reg: LDO1 {
    + regulator-name = "PVDD_ALIVE_1V0";
    + regulator-min-microvolt = <1000000>;
    + regulator-max-microvolt = <1000000>;
    + regulator-always-on;
    + };
    +
    + ldo2_reg: LDO2 {
    + regulator-name = "PVDD_APIO_1V8";
    + regulator-min-microvolt = <1800000>;
    + regulator-max-microvolt = <1800000>;
    + };
    +
    + ldo3_reg: LDO3 {
    + regulator-name = "PVDD_APIO_MMCON_1V8";
    + regulator-min-microvolt = <1800000>;
    + regulator-max-microvolt = <1800000>;
    + regulator-always-on;
    + };
    +
    + ldo4_reg: LDO4 {
    + regulator-name = "PVDD_ADC_1V8";
    + regulator-min-microvolt = <1800000>;
    + regulator-max-microvolt = <1800000>;
    + };
    +
    + ldo5_reg: LDO5 {
    + regulator-name = "PVDD_PLL_1V8";
    + regulator-min-microvolt = <1800000>;
    + regulator-max-microvolt = <1800000>;
    + regulator-always-on;
    + };
    +
    + ldo6_reg: LDO6 {
    + regulator-name = "PVDD_ANAIP_1V0";
    + regulator-min-microvolt = <1000000>;
    + regulator-max-microvolt = <1000000>;
    + };
    +
    + ldo7_reg: LDO7 {
    + regulator-name = "PVDD_ANAIP_1V8";
    + regulator-min-microvolt = <1800000>;
    + regulator-max-microvolt = <1800000>;
    + };
    +
    + ldo8_reg: LDO8 {
    + regulator-name = "PVDD_ABB_1V8";
    + regulator-min-microvolt = <1800000>;
    + regulator-max-microvolt = <1800000>;
    + };
    +
    + ldo9_reg: LDO9 {
    + regulator-name = "PVDD_USB_3V3";
    + regulator-min-microvolt = <3000000>;
    + regulator-max-microvolt = <3000000>;
    + regulator-always-on;
    + };
    +
    + ldo10_reg: LDO10 {
    + regulator-name = "PVDD_PRE_1V8";
    + regulator-min-microvolt = <1800000>;
    + regulator-max-microvolt = <1800000>;
    + regulator-always-on;
    + };
    +
    + ldo11_reg: LDO11 {
    + regulator-name = "PVDD_USB_1V0";
    + regulator-min-microvolt = <1000000>;
    + regulator-max-microvolt = <1000000>;
    + regulator-always-on;
    + };
    +
    + ldo12_reg: LDO12 {
    + regulator-name = "PVDD_HSIC_1V8";
    + regulator-min-microvolt = <1800000>;
    + regulator-max-microvolt = <1800000>;
    + };
    +
    + ldo13_reg: LDO13 {
    + regulator-name = "PVDD_APIO_MMCOFF_2V8";
    + regulator-min-microvolt = <2800000>;
    + regulator-max-microvolt = <2800000>;
    + };
    +
    + ldo15_reg: LDO15 {
    + regulator-name = "PVDD_PERI_2V8";
    + regulator-min-microvolt = <3300000>;
    + regulator-max-microvolt = <3300000>;
    + };
    +
    + ldo16_reg: LDO16 {
    + regulator-name = "PVDD_PERI_3V3";
    + regulator-min-microvolt = <2200000>;
    + regulator-max-microvolt = <2200000>;
    + };
    +
    + ldo18_reg: LDO18 {
    + regulator-name = "PVDD_EMMC_1V8";
    + regulator-min-microvolt = <1800000>;
    + regulator-max-microvolt = <1800000>;
    + };
    +
    + ldo19_reg: LDO19 {
    + regulator-name = "PVDD_TFLASH_2V8";
    + regulator-min-microvolt = <2800000>;
    + regulator-max-microvolt = <2800000>;
    + };
    +
    + ldo20_reg: LDO20 {
    + regulator-name = "PVDD_BTWIFI_1V8";
    + regulator-min-microvolt = <1800000>;
    + regulator-max-microvolt = <1800000>;
    + };
    +
    + ldo21_reg: LDO21 {
    + regulator-name = "PVDD_CAM1IO_1V8";
    + regulator-min-microvolt = <1800000>;
    + regulator-max-microvolt = <1800000>;
    + };
    +
    + ldo23_reg: LDO23 {
    + regulator-name = "PVDD_MIFS_1V1";
    + regulator-min-microvolt = <1200000>;
    + regulator-max-microvolt = <1200000>;
    + regulator-always-on;
    + };
    +
    + ldo24_reg: LDO24 {
    + regulator-name = "PVDD_CAM1_AVDD_2V8";
    + regulator-min-microvolt = <2800000>;
    + regulator-max-microvolt = <2800000>;
    + };
    +
    + ldo26_reg: LDO26 {
    + regulator-name = "PVDD_CAM0_AF_2V8";
    + regulator-min-microvolt = <3000000>;
    + regulator-max-microvolt = <3000000>;
    + };
    +
    + ldo27_reg: LDO27 {
    + regulator-name = "PVDD_G3DS_1V0";
    + regulator-min-microvolt = <1200000>;
    + regulator-max-microvolt = <1200000>;
    + };
    +
    + ldo28_reg: LDO28 {
    + regulator-name = "PVDD_TSP_3V3";
    + regulator-min-microvolt = <3300000>;
    + regulator-max-microvolt = <3300000>;
    + };
    +
    + ldo29_reg: LDO29 {
    + regulator-name = "PVDD_AUDIO_1V8";
    + regulator-min-microvolt = <1800000>;
    + regulator-max-microvolt = <1800000>;
    + };
    +
    + ldo31_reg: LDO31 {
    + regulator-name = "PVDD_PERI_1V8";
    + regulator-min-microvolt = <1800000>;
    + regulator-max-microvolt = <1800000>;
    + };
    +
    + ldo32_reg: LDO32 {
    + regulator-name = "PVDD_LCD_1V8";
    + regulator-min-microvolt = <1800000>;
    + regulator-max-microvolt = <1800000>;
    + };
    +
    + ldo33_reg: LDO33 {
    + regulator-name = "PVDD_CAM0IO_1V8";
    + regulator-min-microvolt = <1800000>;
    + regulator-max-microvolt = <1800000>;
    + };
    +
    + ldo35_reg: LDO35 {
    + regulator-name = "PVDD_CAM0_DVDD_1V2";
    + regulator-min-microvolt = <1200000>;
    + regulator-max-microvolt = <1200000>;
    + };
    +
    + ldo38_reg: LDO38 {
    + regulator-name = "PVDD_CAM0_AVDD_2V8";
    + regulator-min-microvolt = <2800000>;
    + regulator-max-microvolt = <2800000>;
    + };
    +
    + buck1_reg: BUCK1 {
    + regulator-name = "PVDD_MIF_1V1";
    + regulator-min-microvolt = <800000>;
    + regulator-max-microvolt = <1100000>;
    + regulator-always-on;
    + };
    +
    + buck2_reg: BUCK2 {
    + regulator-name = "vdd_arm";
    + regulator-min-microvolt = <800000>;
    + regulator-max-microvolt = <1000000>;
    + regulator-always-on;
    + };
    +
    + buck3_reg: BUCK3 {
    + regulator-name = "PVDD_INT_1V0";
    + regulator-min-microvolt = <800000>;
    + regulator-max-microvolt = <1000000>;
    + regulator-always-on;
    + };
    +
    + buck4_reg: BUCK4 {
    + regulator-name = "PVDD_G3D_1V0";
    + regulator-min-microvolt = <800000>;
    + regulator-max-microvolt = <1000000>;
    + };
    +
    + buck5_reg: BUCK5 {
    + regulator-name = "PVDD_LPDDR3_1V2";
    + regulator-min-microvolt = <800000>;
    + regulator-max-microvolt = <1200000>;
    + regulator-always-on;
    + };
    +
    + buck6_reg: BUCK6 {
    + regulator-name = "PVDD_KFC_1V0";
    + regulator-min-microvolt = <800000>;
    + regulator-max-microvolt = <1000000>;
    + regulator-always-on;
    + };
    +
    + buck7_reg: BUCK7 {
    + regulator-name = "VIN_LLDO_1V4";
    + regulator-min-microvolt = <800000>;
    + regulator-max-microvolt = <1400000>;
    + regulator-always-on;
    + };
    +
    + buck8_reg: BUCK8 {
    + regulator-name = "VIN_MLDO_2V0";
    + regulator-min-microvolt = <800000>;
    + regulator-max-microvolt = <2000000>;
    + regulator-always-on;
    + };
    +
    + buck9_reg: BUCK9 {
    + regulator-name = "VIN_HLDO_3V5";
    + regulator-min-microvolt = <3000000>;
    + regulator-max-microvolt = <3500000>;
    + regulator-always-on;
    + };
    +
    + buck10_reg: BUCK10 {
    + regulator-name = "PVDD_EMMCF_2V8";
    + regulator-min-microvolt = <2800000>;
    + regulator-max-microvolt = <2800000>;
    + };
    + };
    + };
    +};
    +
    +&mfc {
    + samsung,mfc-r = <0x43000000 0x800000>;
    + samsung,mfc-l = <0x51000000 0x800000>;
    +};
    +
    +&mmc_0 {
    + status = "okay";
    + broken-cd;
    + card-detect-delay = <200>;
    + samsung,dw-mshc-ciu-div = <3>;
    + samsung,dw-mshc-sdr-timing = <0 4>;
    + samsung,dw-mshc-ddr-timing = <0 2>;
    + pinctrl-names = "default";
    + pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus1 &sd0_bus4 &sd0_bus8>;
    + vmmc-supply = <&ldo10_reg>;
    + bus-width = <8>;
    + cap-mmc-highspeed;
    +};
    +
    +&mmc_2 {
    + status = "okay";
    + card-detect-delay = <200>;
    + samsung,dw-mshc-ciu-div = <3>;
    + samsung,dw-mshc-sdr-timing = <2 3>;
    + samsung,dw-mshc-ddr-timing = <1 2>;
    + pinctrl-names = "default";
    + pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus1 &sd2_bus4>;
    + vmmc-supply = <&ldo19_reg>;
    + vqmmc-supply = <&ldo13_reg>;
    + bus-width = <4>;
    + cap-sd-highspeed;
    +};
    +
    &rtc {
    status = "okay";
    clocks = <&clock CLK_RTC>, <&s2mps11_osc S2MPS11_CLK_AP>;
    --
    2.1.0


    \
     
     \ /
      Last update: 2015-04-12 15:01    [W:2.732 / U:0.328 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site