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 branch 'parisc-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sun8i-h3-nanopi-m1.dts
diff --git
a/arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts
b/arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts
index ec63d104b404b012b943ad76d256a857402afda1..3a2ccdb28afddf293e324210874fc2744497e3b9 100644
(file)
--- a/
arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts
+++ b/
arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts
@@
-55,6
+55,12
@@
status = "okay";
};
+&ir {
+ pinctrl-names = "default";
+ pinctrl-0 = <&ir_pins_a>;
+ status = "okay";
+};
+
&ohci1 {
status = "okay";
};