Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb1518f3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v4.0-next-arm64' of https://github.com/mbgg/linux-mediatek into next/arm64 

Merge "ARM: mediatek: arm64 changes for 4.1" from Matthias Brugger:

- Select PINCTRL for Mediatek platform
- Add pinctrl/GPIO/EINT node for mt8173.

* tag 'v4.0-next-arm64' of https://github.com/mbgg/linux-mediatek

:
  arm64: dts: mt8173: Add pinctrl/GPIO/EINT node for mt8173.
  arm64: mediatek: Select PINCTRL for Mediatek platform

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2b01311a 359f9365

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ 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

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";