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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[sfrench/cifs-2.6.git]
/
arch
/
arm64
/
boot
/
dts
/
socionext
/
uniphier-ld20-ref.dts
diff --git
a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
index 1ca0c8620dc5ac33118a72beb5b586ab8ff0ce2f..d99e3731358c4aed8f7933fb49a8ba4db7a290b0 100644
(file)
--- a/
arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
+++ b/
arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
@@
-40,13
+40,22
@@
};
ðsc {
- interrupts = <0 48 4>;
+ interrupt-parent = <&gpio>;
+ interrupts = <0 8>;
};
&serial0 {
status = "okay";
};
+&gpio {
+ xirq0 {
+ gpio-hog;
+ gpios = <120 0>;
+ input;
+ };
+};
+
&i2c0 {
status = "okay";
};