Merge branch 'master' of git://git.denx.de/u-boot-samsung
This commit is contained in:
@@ -32,6 +32,7 @@
|
||||
|
||||
adc@12D10000 {
|
||||
u-boot,dm-pre-reloc;
|
||||
vdd-supply = <&ldo4_reg>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
@@ -44,6 +45,7 @@
|
||||
regulator-name = "vdd_ldo1";
|
||||
regulator-min-microvolt = <1000000>;
|
||||
regulator-max-microvolt = <1000000>;
|
||||
regulator-ramp-delay = <12000>;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
@@ -51,18 +53,21 @@
|
||||
regulator-name = "vddq_mmc0";
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
regulator-ramp-delay = <12000>;
|
||||
};
|
||||
|
||||
ldo4_reg: LDO4 {
|
||||
regulator-name = "vdd_adc";
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
regulator-ramp-delay = <12000>;
|
||||
};
|
||||
|
||||
ldo5_reg: LDO5 {
|
||||
regulator-name = "vdd_ldo5";
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
regulator-ramp-delay = <12000>;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
@@ -70,6 +75,7 @@
|
||||
regulator-name = "vdd_ldo6";
|
||||
regulator-min-microvolt = <1000000>;
|
||||
regulator-max-microvolt = <1000000>;
|
||||
regulator-ramp-delay = <12000>;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
@@ -77,6 +83,7 @@
|
||||
regulator-name = "vdd_ldo7";
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
regulator-ramp-delay = <12000>;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
@@ -84,6 +91,7 @@
|
||||
regulator-name = "vdd_ldo8";
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
regulator-ramp-delay = <12000>;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
@@ -91,6 +99,7 @@
|
||||
regulator-name = "vdd_ldo9";
|
||||
regulator-min-microvolt = <3000000>;
|
||||
regulator-max-microvolt = <3000000>;
|
||||
regulator-ramp-delay = <12000>;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
@@ -98,6 +107,7 @@
|
||||
regulator-name = "vdd_ldo10";
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
regulator-ramp-delay = <12000>;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
@@ -105,6 +115,7 @@
|
||||
regulator-name = "vdd_ldo11";
|
||||
regulator-min-microvolt = <1000000>;
|
||||
regulator-max-microvolt = <1000000>;
|
||||
regulator-ramp-delay = <12000>;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
@@ -112,6 +123,7 @@
|
||||
regulator-name = "vdd_ldo12";
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
regulator-ramp-delay = <12000>;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
@@ -119,12 +131,14 @@
|
||||
regulator-name = "vddq_mmc2";
|
||||
regulator-min-microvolt = <2800000>;
|
||||
regulator-max-microvolt = <2800000>;
|
||||
regulator-ramp-delay = <12000>;
|
||||
};
|
||||
|
||||
ldo15_reg: LDO15 {
|
||||
regulator-name = "vdd_ldo15";
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
regulator-ramp-delay = <12000>;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
@@ -132,6 +146,7 @@
|
||||
regulator-name = "vdd_ldo16";
|
||||
regulator-min-microvolt = <2200000>;
|
||||
regulator-max-microvolt = <2200000>;
|
||||
regulator-ramp-delay = <12000>;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
@@ -139,6 +154,7 @@
|
||||
regulator-name = "vdd_ldo17";
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
regulator-ramp-delay = <12000>;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
@@ -146,18 +162,21 @@
|
||||
regulator-name = "vdd_emmc_1V8";
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
regulator-ramp-delay = <12000>;
|
||||
};
|
||||
|
||||
ldo19_reg: LDO19 {
|
||||
regulator-name = "vdd_sd";
|
||||
regulator-min-microvolt = <2800000>;
|
||||
regulator-max-microvolt = <2800000>;
|
||||
regulator-ramp-delay = <12000>;
|
||||
};
|
||||
|
||||
ldo24_reg: LDO24 {
|
||||
regulator-name = "tsp_io";
|
||||
regulator-min-microvolt = <2800000>;
|
||||
regulator-max-microvolt = <2800000>;
|
||||
regulator-ramp-delay = <12000>;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
@@ -165,6 +184,7 @@
|
||||
regulator-name = "vdd_ldo26";
|
||||
regulator-min-microvolt = <3000000>;
|
||||
regulator-max-microvolt = <3000000>;
|
||||
regulator-ramp-delay = <12000>;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
@@ -256,7 +276,7 @@
|
||||
};
|
||||
|
||||
serial@12C20000 {
|
||||
status="okay";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
mmc@12200000 {
|
||||
|
||||
Reference in New Issue
Block a user