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

Commit 6bea7562 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Pull "Add earlyprintk to mt8127 and mt8135 and update Kconfig entry for
Mediatek SoCs" from Matthias Brugger:

Here comes the pull request which add earlyprintk support for mt8127 and mt8135.
Apart from that the Kconfig entry for the Mediatek architecture was fixed.

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

:
  ARM: mediatek: Fix description for mediatek SoCs
  ARM: mediatek: Add earlyprintk support for mt8127 & mt8135

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ff6f08ab af49f5a2

arch/arm/Kconfig.debug

+20 −0
Original line number Diff line number Diff line
@@ -885,6 +885,22 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  for Mediatek mt6589 based platforms on UART0.



	config DEBUG_MT8127_UART0

		bool "Mediatek mt8127 UART0"

		depends on ARCH_MEDIATEK

		select DEBUG_UART_8250

		help

		  Say Y here if you want kernel low-level debugging support

		  for Mediatek mt8127 based platforms on UART0.



	config DEBUG_MT8135_UART3

		bool "Mediatek mt8135 UART3"

		depends on ARCH_MEDIATEK

		select DEBUG_UART_8250

		help

		  Say Y here if you want kernel low-level debugging support

		  for Mediatek mt8135 based platforms on UART3.



	config DEBUG_VEXPRESS_UART0_DETECT

		bool "Autodetect UART0 on Versatile Express Cortex-A core tiles"

		depends on ARCH_VEXPRESS && CPU_CP15_MMU
@@ -1133,7 +1149,9 @@ config DEBUG_UART_PHYS 
	default 0x10126000 if DEBUG_RK3X_UART1

	default 0x101f1000 if ARCH_VERSATILE

	default 0x101fb000 if DEBUG_NOMADIK_UART

	default 0x11002000 if DEBUG_MT8127_UART0

	default 0x11006000 if DEBUG_MT6589_UART0

	default 0x11009000 if DEBUG_MT8135_UART3

	default 0x16000000 if ARCH_INTEGRATOR

	default 0x18000300 if DEBUG_BCM_5301X

	default 0x1c090000 if DEBUG_VEXPRESS_UART0_RS1
@@ -1202,7 +1220,9 @@ config DEBUG_UART_VIRT 
	default 0xf01fb000 if DEBUG_NOMADIK_UART

	default 0xf0201000 if DEBUG_BCM2835

	default 0xf1000300 if DEBUG_BCM_5301X

	default 0xf1002000 if DEBUG_MT8127_UART0

	default 0xf1006000 if DEBUG_MT6589_UART0

	default 0xf1009000 if DEBUG_MT8135_UART3

	default 0xf11f1000 if ARCH_VERSATILE

	default 0xf1600000 if ARCH_INTEGRATOR

	default 0xf1c28000 if DEBUG_SUNXI_UART0

arch/arm/mach-mediatek/Kconfig

+2 −2
Original line number Diff line number Diff line 
config ARCH_MEDIATEK

	bool "Mediatek MT6589 SoC" if ARCH_MULTI_V7

	bool "Mediatek MT65xx & MT81xx SoC" if ARCH_MULTI_V7

	select ARM_GIC

	select MTK_TIMER

	help

	  Support for Mediatek Cortex-A7 Quad-Core-SoC MT6589.
 
	  Support for Mediatek MT65xx & MT81xx SoCs