Selaa lähdekoodia

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: Olof Johansson <olof@lixom.net>
Olof Johansson 7 vuotta sitten
vanhempi
commit
8bd30f2298

+ 1 - 1
MAINTAINERS

@@ -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

+ 0 - 1
arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts

@@ -40,7 +40,6 @@
 };
 };
 
 
 &ethsc {
 &ethsc {
-	interrupt-parent = <&gpio>;
 	interrupts = <0 8>;
 	interrupts = <0 8>;
 };
 };
 
 

+ 0 - 1
arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts

@@ -40,7 +40,6 @@
 };
 };
 
 
 &ethsc {
 &ethsc {
-	interrupt-parent = <&gpio>;
 	interrupts = <0 8>;
 	interrupts = <0 8>;
 };
 };
 
 

+ 1 - 2
arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts

@@ -38,8 +38,7 @@
 };
 };
 
 
 &ethsc {
 &ethsc {
-	interrupt-parent = <&gpio>;
-	interrupts = <0 8>;
+	interrupts = <4 8>;
 };
 };
 
 
 &serial0 {
 &serial0 {