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

Commit 1087f4db authored by Olof Johansson's avatar Olof Johansson
Browse files

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

From Shawn Guo:
imx soc changes for 3.9

 - Sort out imx DEBUG_LL uart port selection
 - A couple of imx_v6_v7_defconfig updates

* tag 'imx-soc-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: imx_v6_v7_defconfig: enable anatop regulator and snvs rtc
  ARM: imx: support DEBUG_LL uart port selection for all i.MX SoCs
  ARM: imx: use separated debug uart symbol for imx31 and imx35
  ARM: imx_v6_v7_defconfig: Select IPUV3 driver
parents d37d79ed 26246919

arch/arm/Kconfig.debug

+22 −9
Original line number Diff line number Diff line
@@ -205,12 +205,19 @@ choice 
		  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

	config DEBUG_IMX31_UART

		bool "i.MX31 Debug UART"

		depends on SOC_IMX31

		help

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

		  on i.MX31 or i.MX35.

		  on i.MX31.



	config DEBUG_IMX35_UART

		bool "i.MX35 Debug UART"

		depends on SOC_IMX35

		help

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

		  on i.MX35.



	config DEBUG_IMX51_UART

		bool "i.MX51 Debug UART"
@@ -471,11 +478,16 @@ choice 


endchoice



config DEBUG_IMX6Q_UART_PORT

	int "i.MX6Q Debug UART Port (1-5)" if DEBUG_IMX6Q_UART

	range 1 5

config DEBUG_IMX_UART_PORT

	int "i.MX Debug UART Port Selection" if DEBUG_IMX1_UART || \

						DEBUG_IMX25_UART || \

						DEBUG_IMX21_IMX27_UART || \

						DEBUG_IMX31_UART || \

						DEBUG_IMX35_UART || \

						DEBUG_IMX51_UART || \

						DEBUG_IMX50_IMX53_UART || \

						DEBUG_IMX6Q_UART

	default 1

	depends on SOC_IMX6Q

	help

	  Choose UART port on which kernel low-level debug messages

	  should be output.
@@ -516,7 +528,8 @@ config DEBUG_LL_INCLUDE 
	default "debug/imx.S" if DEBUG_IMX1_UART || \

				 DEBUG_IMX25_UART || \

				 DEBUG_IMX21_IMX27_UART || \

				 DEBUG_IMX31_IMX35_UART || \

				 DEBUG_IMX31_UART || \

				 DEBUG_IMX35_UART || \

				 DEBUG_IMX51_UART || \

				 DEBUG_IMX53_UART ||\

				 DEBUG_IMX6Q_UART

arch/arm/configs/imx_v6_v7_defconfig

+7 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ CONFIG_MFD_MC13XXX_I2C=y 
CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_DA9052=y

CONFIG_REGULATOR_ANATOP=y

CONFIG_REGULATOR_MC13783=y

CONFIG_REGULATOR_MC13892=y

CONFIG_MEDIA_SUPPORT=y
@@ -159,6 +160,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y 
CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_SOC_CAMERA=y

CONFIG_SOC_CAMERA_OV2640=y

CONFIG_DRM=y

CONFIG_VIDEO_MX3=y

CONFIG_FB=y

CONFIG_LCD_PLATFORM=y
@@ -197,9 +199,14 @@ CONFIG_RTC_CLASS=y 
CONFIG_RTC_INTF_DEV_UIE_EMUL=y

CONFIG_RTC_DRV_MC13XXX=y

CONFIG_RTC_DRV_MXC=y

CONFIG_RTC_DRV_SNVS=y

CONFIG_DMADEVICES=y

CONFIG_IMX_SDMA=y

CONFIG_MXS_DMA=y

CONFIG_STAGING=y

CONFIG_DRM_IMX=y

CONFIG_DRM_IMX_IPUV3_CORE=y

CONFIG_DRM_IMX_IPUV3=y

CONFIG_COMMON_CLK_DEBUG=y

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT2_FS=y

arch/arm/include/debug/imx-uart.h

0 → 100644
+88 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 Freescale Semiconductor, Inc.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef __DEBUG_IMX_UART_H

#define __DEBUG_IMX_UART_H



#define IMX1_UART1_BASE_ADDR	0x00206000

#define IMX1_UART2_BASE_ADDR	0x00207000

#define IMX1_UART_BASE_ADDR(n)	IMX1_UART##n##_BASE_ADDR

#define IMX1_UART_BASE(n)	IMX1_UART_BASE_ADDR(n)



#define IMX21_UART1_BASE_ADDR	0x1000a000

#define IMX21_UART2_BASE_ADDR	0x1000b000

#define IMX21_UART3_BASE_ADDR	0x1000c000

#define IMX21_UART4_BASE_ADDR	0x1000d000

#define IMX21_UART_BASE_ADDR(n)	IMX21_UART##n##_BASE_ADDR

#define IMX21_UART_BASE(n)	IMX21_UART_BASE_ADDR(n)



#define IMX25_UART1_BASE_ADDR	0x43f90000

#define IMX25_UART2_BASE_ADDR	0x43f94000

#define IMX25_UART3_BASE_ADDR	0x5000c000

#define IMX25_UART4_BASE_ADDR	0x50008000

#define IMX25_UART5_BASE_ADDR	0x5002c000

#define IMX25_UART_BASE_ADDR(n)	IMX25_UART##n##_BASE_ADDR

#define IMX25_UART_BASE(n)	IMX25_UART_BASE_ADDR(n)



#define IMX31_UART1_BASE_ADDR	0x43f90000

#define IMX31_UART2_BASE_ADDR	0x43f94000

#define IMX31_UART3_BASE_ADDR	0x5000c000

#define IMX31_UART4_BASE_ADDR	0x43fb0000

#define IMX31_UART5_BASE_ADDR	0x43fb4000

#define IMX31_UART_BASE_ADDR(n)	IMX31_UART##n##_BASE_ADDR

#define IMX31_UART_BASE(n)	IMX31_UART_BASE_ADDR(n)



#define IMX35_UART1_BASE_ADDR	0x43f90000

#define IMX35_UART2_BASE_ADDR	0x43f94000

#define IMX35_UART3_BASE_ADDR	0x5000c000

#define IMX35_UART_BASE_ADDR(n)	IMX35_UART##n##_BASE_ADDR

#define IMX35_UART_BASE(n)	IMX35_UART_BASE_ADDR(n)



#define IMX51_UART1_BASE_ADDR	0x73fbc000

#define IMX51_UART2_BASE_ADDR	0x73fc0000

#define IMX51_UART3_BASE_ADDR	0x7000c000

#define IMX51_UART_BASE_ADDR(n)	IMX51_UART##n##_BASE_ADDR

#define IMX51_UART_BASE(n)	IMX51_UART_BASE_ADDR(n)



#define IMX53_UART1_BASE_ADDR	0x53fbc000

#define IMX53_UART2_BASE_ADDR	0x53fc0000

#define IMX53_UART3_BASE_ADDR	0x5000c000

#define IMX53_UART4_BASE_ADDR	0x53ff0000

#define IMX53_UART5_BASE_ADDR	0x63f90000

#define IMX53_UART_BASE_ADDR(n)	IMX53_UART##n##_BASE_ADDR

#define IMX53_UART_BASE(n)	IMX53_UART_BASE_ADDR(n)



#define IMX6Q_UART1_BASE_ADDR	0x02020000

#define IMX6Q_UART2_BASE_ADDR	0x021e8000

#define IMX6Q_UART3_BASE_ADDR	0x021ec000

#define IMX6Q_UART4_BASE_ADDR	0x021f0000

#define IMX6Q_UART5_BASE_ADDR	0x021f4000

#define IMX6Q_UART_BASE_ADDR(n)	IMX6Q_UART##n##_BASE_ADDR

#define IMX6Q_UART_BASE(n)	IMX6Q_UART_BASE_ADDR(n)



#define IMX_DEBUG_UART_BASE(soc) soc##_UART_BASE(CONFIG_DEBUG_IMX_UART_PORT)



#ifdef CONFIG_DEBUG_IMX1_UART

#define UART_PADDR	IMX_DEBUG_UART_BASE(IMX1)

#elif defined(CONFIG_DEBUG_IMX21_IMX27_UART)

#define UART_PADDR	IMX_DEBUG_UART_BASE(IMX21)

#elif defined(CONFIG_DEBUG_IMX25_UART)

#define UART_PADDR	IMX_DEBUG_UART_BASE(IMX25)

#elif defined(CONFIG_DEBUG_IMX31_UART)

#define UART_PADDR	IMX_DEBUG_UART_BASE(IMX31)

#elif defined(CONFIG_DEBUG_IMX35_UART)

#define UART_PADDR	IMX_DEBUG_UART_BASE(IMX35)

#elif defined(CONFIG_DEBUG_IMX51_UART)

#define UART_PADDR	IMX_DEBUG_UART_BASE(IMX51)

#elif defined(CONFIG_DEBUG_IMX53_UART)

#define UART_PADDR	IMX_DEBUG_UART_BASE(IMX53)

#elif defined(CONFIG_DEBUG_IMX6Q_UART)

#define UART_PADDR	IMX_DEBUG_UART_BASE(IMX6Q)

#endif



#endif /* __DEBUG_IMX_UART_H */

arch/arm/include/debug/imx.S

+1 −28
Original line number Diff line number Diff line
@@ -10,35 +10,8 @@ 
 * published by the Free Software Foundation.

 *

 */

#define IMX6Q_UART1_BASE_ADDR	0x02020000

#define IMX6Q_UART2_BASE_ADDR	0x021e8000

#define IMX6Q_UART3_BASE_ADDR	0x021ec000

#define IMX6Q_UART4_BASE_ADDR	0x021f0000

#define IMX6Q_UART5_BASE_ADDR	0x021f4000



/*

 * IMX6Q_UART_BASE_ADDR is put in the middle to force the expansion

 * of IMX6Q_UART##n##_BASE_ADDR.

 */

#define IMX6Q_UART_BASE_ADDR(n)	IMX6Q_UART##n##_BASE_ADDR

#define IMX6Q_UART_BASE(n)	IMX6Q_UART_BASE_ADDR(n)

#define IMX6Q_DEBUG_UART_BASE	IMX6Q_UART_BASE(CONFIG_DEBUG_IMX6Q_UART_PORT)



#ifdef CONFIG_DEBUG_IMX1_UART

#define UART_PADDR	0x00206000

#elif defined (CONFIG_DEBUG_IMX25_UART)

#define UART_PADDR	0x43f90000

#elif defined (CONFIG_DEBUG_IMX21_IMX27_UART)

#define UART_PADDR	0x1000a000

#elif defined (CONFIG_DEBUG_IMX31_IMX35_UART)

#define UART_PADDR	0x43f90000

#elif defined (CONFIG_DEBUG_IMX51_UART)

#define UART_PADDR	0x73fbc000

#elif defined (CONFIG_DEBUG_IMX53_UART)

#define UART_PADDR	0x53fbc000

#elif defined (CONFIG_DEBUG_IMX6Q_UART)

#define UART_PADDR	IMX6Q_DEBUG_UART_BASE

#endif

#include "imx-uart.h"



/*

 * FIXME: This is a copy of IMX_IO_P2V in hardware.h, and needs to