projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
sun7i-a20-m3.dts
diff --git
a/arch/arm/boot/dts/sun7i-a20-m3.dts
b/arch/arm/boot/dts/sun7i-a20-m3.dts
index
86f6981
..
43c9478
100644
(file)
--- a/
arch/arm/boot/dts/sun7i-a20-m3.dts
+++ b/
arch/arm/boot/dts/sun7i-a20-m3.dts
@@
-117,7
+117,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 */