projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-next-4.14' of git://people.freedesktop.org/~agd5f/linux into drm...
[linux-2.6-block.git]
/
arch
/
arm
/
boot
/
dts
/
sun7i-a20-olimex-som-evb.dts
diff --git
a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
index 1af5b46862cba9d5add598f2cbbbdf8f4ff86b53..64c8ef9a275626bb05a89285fca8add576501e0e 100644
(file)
--- a/
arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
+++ b/
arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
@@
-187,7
+187,7
@@
&mmc0 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>
, <&mmc0_cd_pin_reference_design>
;
+ pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */