projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
am335x-baltos.dtsi
diff --git
a/arch/arm/boot/dts/am335x-baltos.dtsi
b/arch/arm/boot/dts/am335x-baltos.dtsi
index
b689172
..
dd45d17
100644
(file)
--- a/
arch/arm/boot/dts/am335x-baltos.dtsi
+++ b/
arch/arm/boot/dts/am335x-baltos.dtsi
@@
-24,12
+24,12
@@
};
};
};
};
- memory {
+ memory
@80000000
{
device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB */
};
device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB */
};
- vbat: fixedregulator
@
0 {
+ vbat: fixedregulator0 {
compatible = "regulator-fixed";
regulator-name = "vbat";
regulator-min-microvolt = <5000000>;
compatible = "regulator-fixed";
regulator-name = "vbat";
regulator-min-microvolt = <5000000>;
@@
-37,7
+37,7
@@
regulator-boot-on;
};
regulator-boot-on;
};
- wl12xx_vmmc: fixedregulator
@
2 {
+ wl12xx_vmmc: fixedregulator2 {
pinctrl-names = "default";
pinctrl-0 = <&wl12xx_gpio>;
compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&wl12xx_gpio>;
compatible = "regulator-fixed";