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 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
am57xx-beagle-x15-common.dtsi
diff --git
a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
index 74d1d0dab336330bea3ca5c5f83b0be458f4f380..ab60035bc50c839db97ae2af621178d34a6569a8 100644
(file)
--- a/
arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
+++ b/
arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
@@
-388,7
+388,7
@@
};
&cpu0 {
-
cpu0
-supply = <&smps12_reg>;
+
vdd
-supply = <&smps12_reg>;
voltage-tolerance = <1>;
};