From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 20 Jun 2013 00:14:59 +0000 (+0200)
Subject: Merge tag 'imx-soc-3.11' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e5051b8472c2fde91e44d906c9a2e516a10b60b2;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'imx-soc-3.11' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc

From Shawn Guo:

imx soc changes for 3.11:

* New SoCs i.MX6 Sololite and Vybrid VF610 support
* imx5 and imx6 clock fixes and additions
* Update clock driver to use of_clk_init() function
* Refactor restart routine mxc_restart() to get it work for DT boot
  as well
* Clean up mxc specific ulpi access ops
* imx defconfig updates

* tag 'imx-soc-3.11' of git://git.linaro.org/people/shawnguo/linux-2.6: (29 commits)
  ARM: imx_v6_v7_defconfig: Enable Vybrid VF610
  ARM: imx_v6_v7_defconfig: Enable imx-wm8962 by default
  ARM: clk-imx6qdl: Add clko1 configuration for imx6qdl-sabresd
  ARM: imx_v6_v7_defconfig: Enable PWM and backlight options
  ARM: imx: Remove mxc specific ulpi access ops
  ARM: imx: add initial support for VF610
  ARM: imx: add VF610 clock support
  ARM: imx_v6_v7_defconfig: enable parallel display
  ARM: imx: clk: No need to initialize phandle struct
  ARM: imx: irq-common: Include header to avoid sparse warning
  ARM: imx: Enable mx6 solo-lite support
  ARM: imx6: use common of_clk_init() call to initialize clocks
  ARM: imx6q: call of_clk_init() to register fixed rate clocks
  ARM: imx: imx_v6_v7_defconfig: Select CONFIG_DRM_IMX_TVE
  ARM: i.MX6: clk: add different DualLite MLB clock config
  ARM i.MX5: Add S/PDIF clocks
  ARM i.MX53: Add SATA clock
  ARM: imx6q: clk: add the eim_slow clock
  ARM: imx: remove MLB PLL from pllv3
  ARM: imx: disable pll8_mlb in mx6q_clks
  ...

Conflicts:
	arch/arm/Kconfig.debug (simple add/add conflict)

Includes an update to 3.10-rc6

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

e5051b8472c2fde91e44d906c9a2e516a10b60b2
diff --cc arch/arm/Kconfig.debug
index 7ef6f145f964,29f7623553c1..394d2a4064e1
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -251,20 -251,13 +251,27 @@@ choic
  		  Say Y here if you want kernel low-level debugging support
  		  on i.MX6Q/DL.
  
+ 	config DEBUG_IMX6SL_UART
+ 		bool "i.MX6SL Debug UART"
+ 		depends on SOC_IMX6SL
+ 		help
+ 		  Say Y here if you want kernel low-level debugging support
+ 		  on i.MX6SL.
+ 
 +	config DEBUG_KEYSTONE_UART0
 +		bool "Kernel low-level debugging on KEYSTONE2 using UART0"
 +		depends on ARCH_KEYSTONE
 +		help
 +		  Say Y here if you want the debug print routines to direct
 +		  their output to UART0 serial port on KEYSTONE2 devices.
 +
 +	config DEBUG_KEYSTONE_UART1
 +		bool "Kernel low-level debugging on KEYSTONE2 using UART1"
 +		depends on ARCH_KEYSTONE
 +		help
 +		  Say Y here if you want the debug print routines to direct
 +		  their output to UART1 serial port on KEYSTONE2 devices.
 +
  	config DEBUG_MMP_UART2
  		bool "Kernel low-level debugging message via MMP UART2"
  		depends on ARCH_MMP
@@@ -677,11 -639,9 +685,12 @@@ config DEBUG_LL_INCLUD
  				 DEBUG_IMX35_UART || \
  				 DEBUG_IMX51_UART || \
  				 DEBUG_IMX53_UART ||\
- 				 DEBUG_IMX6Q_UART
+ 				 DEBUG_IMX6Q_UART || \
+ 				 DEBUG_IMX6SL_UART
 -	default "debug/mvebu.S" if DEBUG_MVEBU_UART
 +	default "debug/keystone.S" if DEBUG_KEYSTONE_UART0 || \
 +				      DEBUG_KEYSTONE_UART1
 +	default "debug/mvebu.S" if DEBUG_MVEBU_UART || \
 +				   DEBUG_MVEBU_UART_ALTERNATE
  	default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART
  	default "debug/nomadik.S" if DEBUG_NOMADIK_UART
  	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART