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 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
berlin2q-marvell-dmp.dts
diff --git
a/arch/arm/boot/dts/berlin2q-marvell-dmp.dts
b/arch/arm/boot/dts/berlin2q-marvell-dmp.dts
index f485308840abb87bb8aa2f8fcc7a26c71fc229db..57aa5f8a7c774d106ba12c819836d5b4ce195791 100644
(file)
--- a/
arch/arm/boot/dts/berlin2q-marvell-dmp.dts
+++ b/
arch/arm/boot/dts/berlin2q-marvell-dmp.dts
@@
-48,7
+48,7
@@
reg = <0x00000000 0x80000000>;
};
reg = <0x00000000 0x80000000>;
};
- cho
o
sen {
+ chosen {
bootargs = "earlyprintk";
stdout-path = "serial0:115200n8";
};
bootargs = "earlyprintk";
stdout-path = "serial0:115200n8";
};
@@
-58,7
+58,7
@@
#address-cells = <1>;
#size-cells = <0>;
#address-cells = <1>;
#size-cells = <0>;
- reg_usb0_vbus: regulator
@
0 {
+ reg_usb0_vbus: regulator
_usb
0 {
compatible = "regulator-fixed";
regulator-name = "usb0_vbus";
regulator-min-microvolt = <5000000>;
compatible = "regulator-fixed";
regulator-name = "usb0_vbus";
regulator-min-microvolt = <5000000>;
@@
-67,7
+67,7
@@
enable-active-high;
};
enable-active-high;
};
- reg_usb1_vbus: regulator
@
1 {
+ reg_usb1_vbus: regulator
_usb
1 {
compatible = "regulator-fixed";
regulator-name = "usb1_vbus";
regulator-min-microvolt = <5000000>;
compatible = "regulator-fixed";
regulator-name = "usb1_vbus";
regulator-min-microvolt = <5000000>;
@@
-76,7
+76,7
@@
enable-active-high;
};
enable-active-high;
};
- reg_usb2_vbus: regulator
@
2 {
+ reg_usb2_vbus: regulator
_usb
2 {
compatible = "regulator-fixed";
regulator-name = "usb2_vbus";
regulator-min-microvolt = <5000000>;
compatible = "regulator-fixed";
regulator-name = "usb2_vbus";
regulator-min-microvolt = <5000000>;
@@
-85,7
+85,7
@@
enable-active-high;
};
enable-active-high;
};
- reg_sdio1_vmmc: regulator
@3
{
+ reg_sdio1_vmmc: regulator
_sdio1_vmmc
{
compatible = "regulator-fixed";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
compatible = "regulator-fixed";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
@@
-95,7
+95,7
@@
gpio = <&portb 21 GPIO_ACTIVE_HIGH>;
};
gpio = <&portb 21 GPIO_ACTIVE_HIGH>;
};
- reg_sdio1_vqmmc: regulator
@4
{
+ reg_sdio1_vqmmc: regulator
_sido1_vqmmc
{
compatible = "regulator-gpio";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
compatible = "regulator-gpio";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;