diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-22 16:23:58 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-22 16:23:58 (GMT) |
| commit | d34dc4f9e88e4b6beefb819e4e743fd6160a9b75 (patch) | |
| tree | 81c6938c282161cc3eb037e101a28f36d154d02c /arch/arm64/boot/dts/arm | |
| parent | 2144de826e1eeac0c2e30a22029b3330d8bb813c (diff) | |
| parent | bb1518f39bec1b3061425ad378793cf9c4bdb3d2 (diff) | |
| download | linux-d34dc4f9e88e4b6beefb819e4e743fd6160a9b75.tar.xz | |
Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC 64-bit changes from Olof Johansson:
"Mostly DT updates for arm64, but also a couple of Kconfig additions.
Main contents:
- Qualcomm MSM8916/APQ8016
- Spreadtrum SC9836
- Xilinx ZynqMP
- pincontrol entries for MediaTek MT8173"
* tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
arm64: dts: add interrupt-affinity property to pmu node for juno
arm64: dts: Add Qualcomm APQ8016 SBC evaluation board dts
arm64: dts: Add Qualcomm MSM8916 SoC and evaluation board dts
arm64: dts: sprd: adding coresight entries to Spreadtrum SC9836
arm64: Add support for Spreadtrum's Sharkl64 Platform in Kconfig and defconfig
arm64: dts: Add support for Spreadtrum SC9836 SoC in dts and Makefile
ARM64: Add new Xilinx ZynqMP SoC
arm64: qcom: Add support for Qualcomm MSM8916 SoC
arm64: dts: mt8173: Add pinctrl/GPIO/EINT node for mt8173.
arm64: mediatek: Select PINCTRL for Mediatek platform
Diffstat (limited to 'arch/arm64/boot/dts/arm')
| -rw-r--r-- | arch/arm64/boot/dts/arm/juno.dts | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts index 133ee59..5e9110a 100644 --- a/arch/arm64/boot/dts/arm/juno.dts +++ b/arch/arm64/boot/dts/arm/juno.dts @@ -120,12 +120,18 @@ pmu { compatible = "arm,armv8-pmuv3"; - interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>, + interrupts = <GIC_SPI 02 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 02 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>; + <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; + interrupt-affinity = <&A57_0>, + <&A57_1>, + <&A53_0>, + <&A53_1>, + <&A53_2>, + <&A53_3>; }; /include/ "juno-clocks.dtsi" |