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 tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
axp81x.dtsi
diff --git
a/arch/arm/boot/dts/axp81x.dtsi
b/arch/arm/boot/dts/axp81x.dtsi
index 043c717dcef1a2cb3be16c02037fc9702d6741ad..bd83962d3627fa1bd0423da3c31c3f96343050d1 100644
(file)
--- a/
arch/arm/boot/dts/axp81x.dtsi
+++ b/
arch/arm/boot/dts/axp81x.dtsi
@@
-48,6
+48,11
@@
interrupt-controller;
#interrupt-cells = <1>;
+ ac_power_supply: ac-power-supply {
+ compatible = "x-powers,axp813-ac-power-supply";
+ status = "disabled";
+ };
+
axp_adc: adc {
compatible = "x-powers,axp813-adc";
#io-channel-cells = <1>;