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 branches 'for-4.16/upstream' and 'for-4.15/upstream-fixes' into for-linus
[sfrench/cifs-2.6.git]
/
arch
/
arm64
/
boot
/
dts
/
amlogic
/
meson-gxbb-p200.dts
diff --git
a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
index 2054a474e0a91dc58a883a9b4a563e32bcd9e32d..9bf16bb7c491bc08fd64456e6039dd91146ef51f 100644
(file)
--- a/
arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
+++ b/
arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
@@
-117,6
+117,8
@@
eth_phy0: ethernet-phy@3 {
/* Micrel KSZ9031 (0x00221620) */
reg = <3>;
+ interrupt-parent = <&gpio_intc>;
+ interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
};
};
};