diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-02-11 11:33:33 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-02-11 11:33:33 +0100 |
| commit | 7980033bea8a74692fdb987c44ec91b0be8e752b (patch) | |
| tree | 02b57329465d397b3a20468a683e56d1cda88cf6 /arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | |
| parent | x86/cpufeature: Update _static_cpu_has() to use all named variables (diff) | |
| parent | Merge tag 'nfsd-4.16' of git://linux-nfs.org/~bfields/linux (diff) | |
| download | linux-7980033bea8a74692fdb987c44ec91b0be8e752b.tar.xz linux-7980033bea8a74692fdb987c44ec91b0be8e752b.zip | |
Merge branch 'linus' into x86/urgent, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts')
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts index 9bf16bb7c491..09f34f7ef084 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts @@ -118,6 +118,7 @@ /* Micrel KSZ9031 (0x00221620) */ reg = <3>; interrupt-parent = <&gpio_intc>; + /* MAC_INTR on GPIOZ_15 */ interrupts = <29 IRQ_TYPE_LEVEL_LOW>; }; }; |