aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2018-09-08 10:04:37 -0700
committerOlof Johansson <olof@lixom.net>2018-09-08 10:04:37 -0700
commita132bb90414bfad4f8ee23cb45fe6946a89b167d (patch)
tree59bb37c1d11f0173294672ede292b4926f2e6e9c
parent6b45a2b1c0bc2aec84d1c56a1976ca9c8a621ecb (diff)
parentd177c8b61d6b4ef360b1c2682e4d8e3bae01738b (diff)
downloadlinux-yocto-a132bb90414bfad4f8ee23cb45fe6946a89b167d.tar.gz
linux-yocto-a132bb90414bfad4f8ee23cb45fe6946a89b167d.tar.bz2
linux-yocto-a132bb90414bfad4f8ee23cb45fe6946a89b167d.zip
Merge tag 'sunxi-fixes-for-4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes
Allwinner fixes for 4.19 Just one fix for H6 mmc on the Pine H64: the mmc bus width was missing from the device tree. This was added in 4.19-rc1. * tag 'sunxi-fixes-for-4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: arm64: allwinner: dts: h6: fix Pine H64 MMC bus width Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
index ceffc40810ee..48daec7f78ba 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
@@ -46,6 +46,7 @@
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_cldo1>;
cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
+ bus-width = <4>;
status = "okay";
};
@@ -56,6 +57,7 @@
vqmmc-supply = <&reg_bldo2>;
non-removable;
cap-mmc-hw-reset;
+ bus-width = <8>;
status = "okay";
};