Merge tag 'uniphier-fixes-v4.15' of... (8bd30f22) · Commits · 戴 / test

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>

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -2046,7 +2046,7 @@ F: arch/arm/boot/dts/uniphier*
		F: arch/arm/include/asm/hardware/cache-uniphier.h
		F: arch/arm/mach-uniphier/
		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/clk/uniphier/
		F: drivers/gpio/gpio-uniphier.c

arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts

+0 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@
		};

		&ethsc {
		interrupt-parent = <&gpio>;
		interrupts = <0 8>;
		};

arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts

+0 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@
		};

		&ethsc {
		interrupt-parent = <&gpio>;
		interrupts = <0 8>;
		};

arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts

+1 −2

Original line number	Diff line number	Diff line
		@@ -38,8 +38,7 @@
		};

		&ethsc {
		interrupt-parent = <&gpio>;
		interrupts = <0 8>;
		interrupts = <4 8>;
		};

		&serial0 {

Admin message