openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

UniPhier ARM SoC fixes for v4.15 

- Fix IRQ number of PXs3 SoC
 - Remove redundant interrupt-parent properties
 - Fix arm64 DT path in MAINTAINERS
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJaHrtJAAoJED2LAQed4NsGFv4P/1MkOEG6nt12PzMafnFZATKT
 tHAysRO2Xv08mxaAb8hi+hR/dlZIUSizo5H3OYURs/UfPLnUIpALCrs4nKiVRCo4
 LxTPVBSAm5fcQWq51vxL89D7ZtXqaMpYTnHS/u4LKRMN+2u0G3Ojbyl+CxbMf1pW
 PBHclfWLsJlO3Q6P1L/QRcN7kCOvWkG3JfXZWNRASvZJCglu0xvMwjHZf5R5Kiiv
 Y0kBiFsSfywIc+ON9q+VwKcxCvahSDdQl1Bpwuv0LmaweMxrUyflWUcSFvS/qhfa
 H9s/yWYvP0I+TVL+133+KpPXn71O+B848sbG0N9/jkNNaZv84a4qYSmmkF3c/8+/
 Fr1tltfgqVeaDFXHecczdLWQ85MbecUGPVWpa1fpK8P7BixYPyjQprakP5IjOqHJ
 GDqsfGKtJA6l92jzcyYaQhkbtvK8H5zkj7US37eKjNPhgxhMBNTjcGSFnHby+GZw
 5kZAtAQkKXtBqlVRk3lsinBSisJ4wgOAW1qWBHYXk1WAlIKBRxUN1BMkKVC60XS3
 z9hRy79DbMlCHjPcOIaBCRqjRxwRtjb9as425BUuq4H+Ed1nPT0qWpKRW+5/vyHM
 eIUkijjEtPW5oYIV9vEbqkS64+vFVPy9XeDFp5PZoTLfbJAWrRkadzJ0bCksokj+
 Ho/3nRWWoJplGcm27bwc
 =pame
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2017-12-02 17:00:35 -08:00
parent a760576b68 0308cadcec
commit 8bd30f2298
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

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

1
arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts
View File

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

1
arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
View File

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

3
arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts
View File

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