Commit 8bd30f22 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'uniphier-fixes-v4.15' of...

Merge tag 'uniphier-fixes-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into fixes

UniPhier ARM SoC fixes for v4.15

- Fix IRQ number of PXs3 SoC
- Remove redundant interrupt-parent properties
- Fix arm64 DT path in MAINTAINERS

* tag 'uniphier-fixes-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  MAINTAINERS: exclude other Socionext SoC DT files from ARM/UNIPHIER entry
  arm64: dts: uniphier: remove unnecessary interrupt-parent
  arm64: dts: uniphier: correct on-board device IRQ number for PXs3
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a760576b 0308cadc
...@@ -2046,7 +2046,7 @@ F: arch/arm/boot/dts/uniphier* ...@@ -2046,7 +2046,7 @@ F: arch/arm/boot/dts/uniphier*
F: arch/arm/include/asm/hardware/cache-uniphier.h F: arch/arm/include/asm/hardware/cache-uniphier.h
F: arch/arm/mach-uniphier/ F: arch/arm/mach-uniphier/
F: arch/arm/mm/cache-uniphier.c F: arch/arm/mm/cache-uniphier.c
F: arch/arm64/boot/dts/socionext/ F: arch/arm64/boot/dts/socionext/uniphier*
F: drivers/bus/uniphier-system-bus.c F: drivers/bus/uniphier-system-bus.c
F: drivers/clk/uniphier/ F: drivers/clk/uniphier/
F: drivers/gpio/gpio-uniphier.c F: drivers/gpio/gpio-uniphier.c
......
...@@ -40,7 +40,6 @@ memory@80000000 { ...@@ -40,7 +40,6 @@ memory@80000000 {
}; };
&ethsc { &ethsc {
interrupt-parent = <&gpio>;
interrupts = <0 8>; interrupts = <0 8>;
}; };
......
...@@ -40,7 +40,6 @@ memory@80000000 { ...@@ -40,7 +40,6 @@ memory@80000000 {
}; };
&ethsc { &ethsc {
interrupt-parent = <&gpio>;
interrupts = <0 8>; interrupts = <0 8>;
}; };
......
...@@ -38,8 +38,7 @@ memory@80000000 { ...@@ -38,8 +38,7 @@ memory@80000000 {
}; };
&ethsc { &ethsc {
interrupt-parent = <&gpio>; interrupts = <4 8>;
interrupts = <0 8>;
}; };
&serial0 { &serial0 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment