aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-04-17 09:19:45 -0400
committerTom Rini <trini@konsulko.com>2019-04-17 09:19:45 -0400
commit4b37f36d68ebb79cdc7d68a539de71e28e954d11 (patch)
treec982cc1d42e8eeb28dc1dc31d027e1fe145f113d /arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts
parent14b8c420b88a90e7ca0c979a2ee413bf459941e8 (diff)
parentf8c8669760610b2949d8d9ccaeef8231a44d4205 (diff)
downloadu-boot-4b37f36d68ebb79cdc7d68a539de71e28e954d11.zip
u-boot-4b37f36d68ebb79cdc7d68a539de71e28e954d11.tar.gz
u-boot-4b37f36d68ebb79cdc7d68a539de71e28e954d11.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
- Convert DM_MMC and DM_SCSI - A20, R40, H6 Linux dts(i) sync - CLK, RESET support for sunxi, sun8_emac net drivers
Diffstat (limited to 'arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts')
-rw-r--r--arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts b/arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts
index d99e7b1..2337b44 100644
--- a/arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts
+++ b/arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts
@@ -54,8 +54,6 @@
};
&mmc2 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc2_pins_a>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
non-removable;