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 tag 'trace-v5.0-pre' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
vf610-zii-ssmb-spu3.dts
diff --git
a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts
b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts
index 757af56e8ee735c97dd14f9781992af5e16b311f..0d9fe5ac83a37574b48b1297021e2542fc872f32 100644
(file)
--- a/
arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts
+++ b/
arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts
@@
-99,6
+99,8
@@
non-removable;
no-1-8-v;
keep-power-in-suspend;
+ no-sdio;
+ no-sd;
status = "okay";
};
@@
-106,6
+108,7
@@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_esdhc1>;
bus-width = <4>;
+ no-sdio;
status = "okay";
};