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

Merge tag 'v3.20-next-soc1' of https://github.com/mbgg/linux-mediatek into next/soc 

Merge "ARM: mediatek: soc changes for v3.20" from Matthias Brugger:

This adds config options for the different Mediatek SoC. We need this so that
the pinctrl driver does not bloat the kernel binary.

Apart we change the Kconfig description and add the config option for mt6592
low-level debug option.

* tag 'v3.20-next-soc1' of https://github.com/mbgg/linux-mediatek

:
  ARM: mediatek: Low-level-debug for mt6592
  ARM: mediatek: Add config options for mediatek SoCs.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 8a333cc7 60851d7a

arch/arm/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -1011,7 +1011,7 @@ choice 
		  for Mediatek mt6589 based platforms on UART0.



	config DEBUG_MT8127_UART0

		bool "Mediatek mt8127 UART0"

		bool "Mediatek mt8127/mt6592 UART0"

		depends on ARCH_MEDIATEK

		select DEBUG_UART_8250

		help

arch/arm/mach-mediatek/Kconfig

+21 −1
Original line number Diff line number Diff line 
config ARCH_MEDIATEK

menuconfig ARCH_MEDIATEK

	bool "Mediatek MT65xx & MT81xx SoC" if ARCH_MULTI_V7

	select ARM_GIC

	select MTK_TIMER

	help

	  Support for Mediatek MT65xx & MT81xx SoCs



if ARCH_MEDIATEK



config MACH_MT6589

	bool "MediaTek MT6589 SoCs support"

	default ARCH_MEDIATEK



config MACH_MT6592

	bool "MediaTek MT6592 SoCs support"

	default ARCH_MEDIATEK



config MACH_MT8127

	bool "MediaTek MT8127 SoCs support"

	default ARCH_MEDIATEK



config MACH_MT8135

	bool "MediaTek MT8135 SoCs support"

	default ARCH_MEDIATEK



endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE