git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sun8i-reference-design-tablet.dtsi
diff --git
a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
index d6bd15898db6d6cc880fe0abb4999712450dc50e..880096c7e2523aee4174a9ce7fce4d853cf8e882 100644
(file)
--- a/
arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
+++ b/
arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
@@
-85,8
+85,7
@@
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
vmmc-supply = <®_dcdc1>;
bus-width = <4>;
- cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */
- cd-inverted;
+ cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
status = "okay";
};
status = "okay";
};
@@
-125,6
+124,14
@@
#include "axp223.dtsi"
#include "axp223.dtsi"
+&ac_power_supply {
+ status = "okay";
+};
+
+&battery_power_supply {
+ status = "okay";
+};
+
®_aldo1 {
regulator-always-on;
regulator-min-microvolt = <3000000>;
®_aldo1 {
regulator-always-on;
regulator-min-microvolt = <3000000>;