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 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx51-zii-scu2-mezz.dts
diff --git
a/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts
b/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts
index 26cf08549df401e61325ceb017fea2a7848cefa8..243d1c8cab0a13c52f80593e7dec76df104389cd 100644
(file)
--- a/
arch/arm/boot/dts/imx51-zii-scu2-mezz.dts
+++ b/
arch/arm/boot/dts/imx51-zii-scu2-mezz.dts
@@
-342,6
+342,14
@@
vcc-supply = <&vusb2_reg>;
};
+&vpu {
+ status = "disabled";
+};
+
+&wdog1 {
+ status = "disabled";
+};
+
&iomuxc {
pinctrl_ecspi1: ecspi1grp {
fsl,pins = <