Commit abc3f126 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'imx/imx6q' into next/soc 

Conflicts:
	Documentation/devicetree/bindings/arm/fsl.txt
	arch/arm/Kconfig
	arch/arm/Kconfig.debug
	arch/arm/plat-mxc/include/mach/common.h
parents b8df0ea2 8bcb9765

Documentation/devicetree/bindings/arm/fsl.txt

+7 −0
Original line number Diff line number Diff line 
Freescale i.MX Platforms Device Tree Bindings

-----------------------------------------------



i.MX51 Babbage Board

Required root node properties:

    - compatible = "fsl,imx51-babbage", "fsl,imx51";
@@ -17,3 +20,7 @@ Required root node properties: 
i.MX53 Smart Mobile Reference Design Board

Required root node properties:

    - compatible = "fsl,imx53-smd", "fsl,imx53";



i.MX6 Quad SABRE Automotive Board

Required root node properties:

    - compatible = "fsl,imx6q-sabreauto", "fsl,imx6q";

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -793,6 +793,13 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Maintained

F:	arch/arm/mach-mx5/



ARM/FREESCALE IMX6

M:	Shawn Guo <shawn.guo@linaro.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

T:	git git://git.linaro.org/people/shawnguo/linux-2.6.git

F:	arch/arm/mach-imx/*imx6*



ARM/GLOMATION GESBC9312SX MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1435,7 +1435,7 @@ config SMP 
	depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \

		 ARCH_EXYNOS4 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \

		 ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE || ARCH_HIGHBANK

		 ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE || ARCH_HIGHBANK || SOC_IMX6Q

	select USE_GENERIC_SMP_HELPERS

	select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP

	help

arch/arm/Kconfig.debug

+112 −12
Original line number Diff line number Diff line
@@ -135,6 +135,118 @@ choice 
		  Say Y here if you want the debug print routines to direct

		  their output to the UART on Highbank based devices.



	config DEBUG_IMX1_UART

		bool "i.MX1 Debug UART"

		depends on SOC_IMX1

		help

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

		  on i.MX1.



	config DEBUG_IMX23_UART

		bool "i.MX23 Debug UART"

		depends on SOC_IMX23

		help

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

		  on i.MX23.



	config DEBUG_IMX25_UART

		bool "i.MX25 Debug UART"

		depends on SOC_IMX25

		help

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

		  on i.MX25.



	config DEBUG_IMX21_IMX27_UART

		bool "i.MX21 and i.MX27 Debug UART"

		depends on SOC_IMX21 || SOC_IMX27

		help

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

		  on i.MX21 or i.MX27.



	config DEBUG_IMX28_UART

		bool "i.MX28 Debug UART"

		depends on SOC_IMX28

		help

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

		  on i.MX28.



	config DEBUG_IMX31_IMX35_UART

		bool "i.MX31 and i.MX35 Debug UART"

		depends on SOC_IMX31 || SOC_IMX35

		help

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

		  on i.MX31 or i.MX35.



	config DEBUG_IMX51_UART

		bool "i.MX51 Debug UART"

		depends on SOC_IMX51

		help

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

		  on i.MX51.



	config DEBUG_IMX50_IMX53_UART

		bool "i.MX50 and i.MX53 Debug UART"

		depends on SOC_IMX50 || SOC_IMX53

		help

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

		  on i.MX50 or i.MX53.



	config DEBUG_IMX6Q_UART

		bool "i.MX6Q Debug UART"

		depends on SOC_IMX6Q

		help

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

		  on i.MX6Q.



	config DEBUG_S3C_UART0

		depends on PLAT_SAMSUNG

		bool "Use S3C UART 0 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct

		  their output to UART 0. The port must have been initialised

		  by the boot-loader before use.



		  The uncompressor code port configuration is now handled

		  by CONFIG_S3C_LOWLEVEL_UART_PORT.



	config DEBUG_S3C_UART1

		depends on PLAT_SAMSUNG

		bool "Use S3C UART 1 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct

		  their output to UART 1. The port must have been initialised

		  by the boot-loader before use.



		  The uncompressor code port configuration is now handled

		  by CONFIG_S3C_LOWLEVEL_UART_PORT.



	config DEBUG_S3C_UART2

		depends on PLAT_SAMSUNG

		bool "Use S3C UART 2 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct

		  their output to UART 2. The port must have been initialised

		  by the boot-loader before use.



		  The uncompressor code port configuration is now handled

		  by CONFIG_S3C_LOWLEVEL_UART_PORT.



	config DEBUG_REALVIEW_STD_PORT

		bool "RealView Default UART"

		depends on ARCH_REALVIEW

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the serial port on RealView EB, PB11MP, PBA8

		  and PBX platforms.



	config DEBUG_REALVIEW_PB1176_PORT

		bool "RealView PB1176 UART"

		depends on MACH_REALVIEW_PB1176

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the standard serial port on the RealView

		  PB1176 platform.



endchoice



config EARLY_PRINTK
@@ -153,18 +265,6 @@ config OC_ETM 
	  buffer driver that will allow you to collect traces of the

	  kernel code.



config DEBUG_S3C_UART

	depends on PLAT_SAMSUNG

	int "S3C UART to use for low-level debug"

	default "0"

	help

	  Choice for UART for kernel low-level using S3C UARTS,

	  should be between zero and two. The port must have been

	  initialised by the boot-loader before use.



	  The uncompressor code port configuration is now handled

	  by CONFIG_S3C_LOWLEVEL_UART_PORT.



config ARM_KPROBES_TEST

	tristate "Kprobes test module"

	depends on KPROBES && MODULES

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ machine-$(CONFIG_ARCH_MMP) := mmp 
machine-$(CONFIG_ARCH_MSM)		:= msm

machine-$(CONFIG_ARCH_MV78XX0)		:= mv78xx0

machine-$(CONFIG_ARCH_IMX_V4_V5)	:= imx

machine-$(CONFIG_ARCH_MX3)		:= imx

machine-$(CONFIG_ARCH_IMX_V6_V7)	:= imx

machine-$(CONFIG_ARCH_MX5)		:= mx5

machine-$(CONFIG_ARCH_MXS)		:= mxs

machine-$(CONFIG_ARCH_NETX)		:= netx