Commit d34dc4f9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2144de82 bb1518f3

arch/arm64/Kconfig

+17 −0
Original line number Diff line number Diff line
@@ -181,9 +181,16 @@ config ARCH_FSL_LS2085A 
config ARCH_MEDIATEK

	bool "Mediatek MT65xx & MT81xx ARMv8 SoC"

	select ARM_GIC

	select PINCTRL

	help

	  Support for Mediatek MT65xx & MT81xx ARMv8 SoCs



config ARCH_QCOM

	bool "Qualcomm Platforms"

	select PINCTRL

	help

	  This enables support for the ARMv8 based Qualcomm chipsets.



config ARCH_SEATTLE

	bool "AMD Seattle SoC Family"

	help
@@ -215,6 +222,11 @@ config ARCH_TEGRA_132_SOC 
	  but contains an NVIDIA Denver CPU complex in place of

	  Tegra124's "4+1" Cortex-A15 CPU complex.



config ARCH_SPRD

	bool "Spreadtrum SoC platform"

	help

	  Support for Spreadtrum ARM based SoCs



config ARCH_THUNDER

	bool "Cavium Inc. Thunder SoC Family"

	help
@@ -235,6 +247,11 @@ config ARCH_XGENE 
	help

	  This enables support for AppliedMicro X-Gene SOC Family



config ARCH_ZYNQMP

	bool "Xilinx ZynqMP Family"

	help

	  This enables support for Xilinx ZynqMP Family



endmenu



menu "Bus support"

arch/arm64/boot/dts/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -5,5 +5,8 @@ dts-dirs += cavium 
dts-dirs += exynos

dts-dirs += freescale

dts-dirs += mediatek

dts-dirs += qcom

dts-dirs += sprd

dts-dirs += xilinx



subdir-y	:= $(dts-dirs)

arch/arm64/boot/dts/arm/juno.dts

+10 −4
Original line number Diff line number Diff line
@@ -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"

arch/arm64/boot/dts/mediatek/mt8173-pinfunc.h

0 → 100644
+682 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm64/boot/dts/mediatek/mt8173.dtsi

+20 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "mt8173-pinfunc.h"



/ {

	compatible = "mediatek,mt8173";
@@ -105,6 +106,25 @@ 
		compatible = "simple-bus";

		ranges;



		syscfg_pctl_a: syscfg_pctl_a@10005000 {

			compatible = "mediatek,mt8173-pctl-a-syscfg", "syscon";

			reg = <0 0x10005000 0 0x1000>;

		};



		pio: pinctrl@0x10005000 {

			compatible = "mediatek,mt8173-pinctrl";

			reg = <0 0x1000B000 0 0x1000>;

			mediatek,pctl-regmap = <&syscfg_pctl_a>;

			pins-are-numbered;

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <2>;

			interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>,

						<GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>,

						<GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;

		};



		sysirq: intpol-controller@10200620 {

			compatible = "mediatek,mt8173-sysirq",

					"mediatek,mt6577-sysirq";

CRA Git | Maintained and supported by SUSTech CRA and CCSE