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

Commit 9d863391 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

Merge "ARM: mediatek: soc updates for v4.1" from Matthias Brugger:

- enable the pin controller in Kconfig
- Add PMIC wrapper for MT8135 and MT8173 SoCs

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

:
  soc: mediatek: Add PMIC wrapper for MT8135 and MT8173 SoCs
  ARM: mediatek: enable the pin controller

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 47f36e49 1f022d84

arch/arm/mach-mediatek/Kconfig

+1 −0
Original line number Diff line number Diff line 
menuconfig ARCH_MEDIATEK

	bool "Mediatek MT65xx & MT81xx SoC" if ARCH_MULTI_V7

	select ARM_GIC

	select PINCTRL

	select MTK_TIMER

	help

	  Support for Mediatek MT65xx & MT81xx SoCs

drivers/soc/Kconfig

+1 −0
Original line number Diff line number Diff line 
menu "SOC (System On Chip) specific Drivers"



source "drivers/soc/mediatek/Kconfig"

source "drivers/soc/qcom/Kconfig"

source "drivers/soc/ti/Kconfig"

source "drivers/soc/versatile/Kconfig"

drivers/soc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
# Makefile for the Linux Kernel SOC specific device drivers.

#



obj-$(CONFIG_ARCH_MEDIATEK)	+= mediatek/

obj-$(CONFIG_ARCH_QCOM)		+= qcom/

obj-$(CONFIG_ARCH_TEGRA)	+= tegra/

obj-$(CONFIG_SOC_TI)		+= ti/

drivers/soc/mediatek/Kconfig

0 → 100644
+11 −0
Original line number Diff line number Diff line 
#

# MediaTek SoC drivers

#

config MTK_PMIC_WRAP

	tristate "MediaTek PMIC Wrapper Support"

	depends on ARCH_MEDIATEK

	select REGMAP

	help

	  Say yes here to add support for MediaTek PMIC Wrapper found

	  on different MediaTek SoCs. The PMIC wrapper is a proprietary

	  hardware to connect the PMIC.

drivers/soc/mediatek/Makefile

0 → 100644
+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_MTK_PMIC_WRAP) += mtk-pmic-wrap.o