projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
omap3-n950-n9.dtsi
diff --git
a/arch/arm/boot/dts/omap3-n950-n9.dtsi
b/arch/arm/boot/dts/omap3-n950-n9.dtsi
index
927b17f
..
5d8c4b4
100644
(file)
--- a/
arch/arm/boot/dts/omap3-n950-n9.dtsi
+++ b/
arch/arm/boot/dts/omap3-n950-n9.dtsi
@@
-24,12
+24,12
@@
};
};
};
};
- memory {
+ memory
@80000000
{
device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */
};
device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */
};
- vemmc: fixedregulator
@
0 {
+ vemmc: fixedregulator0 {
compatible = "regulator-fixed";
regulator-name = "VEMMC";
regulator-min-microvolt = <2900000>;
compatible = "regulator-fixed";
regulator-name = "VEMMC";
regulator-min-microvolt = <2900000>;
@@
-39,7
+39,7
@@
enable-active-high;
};
enable-active-high;
};
- vwlan_fixed: fixedregulator
@
2 {
+ vwlan_fixed: fixedregulator2 {
compatible = "regulator-fixed";
regulator-name = "VWLAN";
gpio = <&gpio2 3 GPIO_ACTIVE_HIGH>; /* gpio 35 */
compatible = "regulator-fixed";
regulator-name = "VWLAN";
gpio = <&gpio2 3 GPIO_ACTIVE_HIGH>; /* gpio 35 */