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 tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sun8i-r40-bananapi-m2-ultra.dts
diff --git
a/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts
b/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts
index ea15073f0c79cef2ab234b6f274993727a7cbcd8..2fc62ef0cb3e983bc7beae5ab9e4851ec064fc59 100644
(file)
--- a/
arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts
+++ b/
arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts
@@
-164,6
+164,10
@@
#include "axp22x.dtsi"
+&ir0 {
+ status = "okay";
+};
+
&mmc0 {
vmmc-supply = <®_dcdc1>;
bus-width = <4>;