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 branches 'for-4.8/alps', 'for-4.8/apple', 'for-4.8/i2c-hid', 'for-4.8/uhid...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
dm8148-evm.dts
diff --git
a/arch/arm/boot/dts/dm8148-evm.dts
b/arch/arm/boot/dts/dm8148-evm.dts
index cbc17b0794b102fb2f0862958203c19c1fe79dae..4128fa91823c98c6fb94870ccb2e5b69c31f35e0 100644
(file)
--- a/
arch/arm/boot/dts/dm8148-evm.dts
+++ b/
arch/arm/boot/dts/dm8148-evm.dts
@@
-93,6
+93,10
@@
};
};
+&mmc1 {
+ status = "disabled";
+};
+
&mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&sd1_pins>;
@@
-101,6
+105,10
@@
cd-gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
};
+&mmc3 {
+ status = "disabled";
+};
+
&pincntl {
sd1_pins: pinmux_sd1_pins {
pinctrl-single,pins = <