Merge branch 'imx/soc' into imx/dt

		simple-audio-card,cpu {

			sound-dai = <&sai2>;

			master-clkdir-out;

			frame-master;

			bitclock-master;

		};

CONFIG_ARCH_MULTI_V5=y

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_MXC=y

CONFIG_MXC_IRQ_PRIOR=y

CONFIG_ARCH_MX1ADS=y

CONFIG_MACH_SCB9328=y

CONFIG_MACH_APF9328=y

CONFIG_MACH_MX21ADS=y

CONFIG_MACH_EUKREA_CPUIMX25SD=y

CONFIG_MACH_IMX25_DT=y

CONFIG_MACH_MX27ADS=y

CONFIG_MACH_PCM038=y

CONFIG_MACH_CPUIMX27=y

CONFIG_MACH_EUKREA_CPUIMX27_USESDHC2=y

CONFIG_MACH_EUKREA_CPUIMX27_USEUART4=y

CONFIG_MACH_MX27_3DS=y

CONFIG_MACH_IMX27_VISSTRIM_M10=y

CONFIG_MACH_PCA100=y

CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_FPE_NWFPE=y

CONFIG_FPE_NWFPE_XP=y

CONFIG_PM_DEBUG=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_IMX_WEIM=y

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_UBI=y

CONFIG_EEPROM_AT24=y

CONFIG_EEPROM_AT25=y

CONFIG_ATA=y

CONFIG_BLK_DEV_SD=y

CONFIG_ATA=y

CONFIG_PATA_IMX=y

CONFIG_NETDEVICES=y

CONFIG_CS89x0=y

CONFIG_SERIAL_IMX=y

CONFIG_SERIAL_IMX_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_IMX=y

CONFIG_SPI=y

CONFIG_SPI_IMX=y

CONFIG_SPI_SPIDEV=y

CONFIG_GPIO_SYSFS=y

CONFIG_SOC_CAMERA_OV2640=y

CONFIG_FB=y

CONFIG_FB_IMX=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_LCD_L4F00242T03=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

CONFIG_SOUND=y

CONFIG_MACH_PCM043=y

CONFIG_MACH_MX35_3DS=y

CONFIG_MACH_VPR200=y

CONFIG_SOC_IMX51=y

CONFIG_SOC_IMX50=y

CONFIG_SOC_IMX51=y

CONFIG_SOC_IMX53=y

CONFIG_SOC_IMX6Q=y

CONFIG_SOC_IMX6SL=y

CONFIG_EEPROM_AT25=y

# CONFIG_SCSI_PROC_FS is not set

CONFIG_BLK_DEV_SD=y

CONFIG_SCSI_MULTI_LUN=y

CONFIG_SCSI_CONSTANTS=y

CONFIG_SCSI_LOGGING=y

CONFIG_SCSI_SCAN_ASYNC=y

CONFIG_SERIAL_FSL_LPUART=y

CONFIG_SERIAL_FSL_LPUART_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_MXC_RNGA=y

# CONFIG_I2C_COMPAT is not set

CONFIG_I2C_CHARDEV=y

# CONFIG_I2C_HELPER_AUTO is not set

CONFIG_I2C_ALGOPCF=m

CONFIG_I2C_ALGOPCA=m

CONFIG_I2C_IMX=y

CONFIG_SPI=y

CONFIG_SPI_IMX=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_MC9S08DZ60=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_LCD_L4F00242T03=y

CONFIG_LCD_PLATFORM=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_BACKLIGHT_PWM=y

CONFIG_BACKLIGHT_GPIO=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_SOC=y

CONFIG_SND_SOC_FSL_SAI=y

CONFIG_SND_IMX_SOC=y

CONFIG_SND_SOC_PHYCORE_AC97=y

CONFIG_SND_SOC_EUKREA_TLV320=y

CONFIG_SND_SOC_IMX_SGTL5000=y

CONFIG_SND_SOC_IMX_SPDIF=y

CONFIG_SND_SOC_IMX_MC13783=y

CONFIG_SND_SIMPLE_CARD=y

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_MXC=y

CONFIG_LEDS_TRIGGER_GPIO=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_INTF_DEV_UIE_EMUL=y

CONFIG_RTC_DRV_ISL1208=y

CONFIG_RTC_DRV_PCF8563=y

CONFIG_RTC_DRV_MC13XXX=y

CONFIG_RTC_DRV_MXC=y

CONFIG_DRM_IMX_PARALLEL_DISPLAY=y

CONFIG_DRM_IMX_TVE=y

CONFIG_DRM_IMX_LDB=y

CONFIG_DRM_IMX_IPUV3_CORE=y

CONFIG_DRM_IMX_IPUV3=y

CONFIG_DRM_IMX_HDMI=y

# CONFIG_IOMMU_SUPPORT is not set

	select CPU_ARM920T

	select IMX_HAVE_IOMUX_V1

	select MXC_AVIC

	select PINCTRL_IMX1

config SOC_IMX21

	bool

if ARCH_MULTI_V4T

comment "MX1 platforms:"

config MACH_MXLADS

	bool

config ARCH_MX1ADS

	bool "MX1ADS platform"

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select MACH_MXLADS

	select SOC_IMX1

	help

	  Say Y here if you are using Motorola MX1ADS/MXLADS boards

config MACH_SCB9328

	bool "Synertronixx scb9328"

	help

	  Say Yes here if you are using the Armadeus APF9328 development board

config MACH_IMX1_DT

	bool "Support i.MX1 platforms from device tree"

	select SOC_IMX1

	help

	  Include support for Freescale i.MX1 based platforms

	  using the device tree for discovery.

endif

if ARCH_MULTI_V5

	  Include support for MX27ADS platform. This includes specific

	  configurations for the board and its peripherals.

config MACH_PCM038

	bool "Phytec phyCORE-i.MX27 CPU module (pcm038)"

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_W1

	select IMX_HAVE_PLATFORM_SPI_IMX

	select USB_ULPI_VIEWPORT if USB_ULPI

	select SOC_IMX27

	help

	  Include support for phyCORE-i.MX27 (aka pcm038) platform. This

	  includes specific configurations for the module and its peripherals.

choice

	prompt "Baseboard"

	depends on MACH_PCM038

	default MACH_PCM970_BASEBOARD

config MACH_PCM970_BASEBOARD

	bool "PHYTEC PCM970 development board"

	select IMX_HAVE_PLATFORM_IMX_FB

	select IMX_HAVE_PLATFORM_MXC_MMC

	help

	  This adds board specific devices that can be found on Phytec's

	  PCM970 evaluation board.

endchoice

config MACH_CPUIMX27

	bool "Eukrea CPUIMX27 module"

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_W1

	select USB_ULPI_VIEWPORT if USB_ULPI

	select SOC_IMX27

	help

	  Include support for Eukrea CPUIMX27 platform. This includes

	  specific configurations for the module and its peripherals.

config MACH_EUKREA_CPUIMX27_USESDHC2

	bool "CPUIMX27 integrates SDHC2 module"

	depends on MACH_CPUIMX27

	select IMX_HAVE_PLATFORM_MXC_MMC

	help

	  This adds support for the internal SDHC2 used on CPUIMX27

	  for wifi or eMMC.

config MACH_EUKREA_CPUIMX27_USEUART4

	bool "CPUIMX27 integrates UART4 module"

	depends on MACH_CPUIMX27

	help

	  This adds support for the internal UART4 used on CPUIMX27

	  for bluetooth.

choice

	prompt "Baseboard"

	depends on MACH_CPUIMX27

	default MACH_EUKREA_MBIMX27_BASEBOARD

config MACH_EUKREA_MBIMX27_BASEBOARD

	bool "Eukrea MBIMX27 development board"

	select IMX_HAVE_PLATFORM_IMX_FB

	select IMX_HAVE_PLATFORM_IMX_KEYPAD

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_SPI_IMX

	select LEDS_GPIO_REGISTER

	help

	  This adds board specific devices that can be found on Eukrea's

	  MBIMX27 evaluation board.

endchoice

config MACH_MX27_3DS

	bool "MX27PDK platform"

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	  Include support for phyCARD-s (aka pca100) platform. This

	  includes specific configurations for the module and its peripherals.

config MACH_MXT_TD60

	bool "Maxtrack i-MXT TD60"

	select IMX_HAVE_PLATFORM_IMX_FB

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_MXC_NAND

	select SOC_IMX27

	help

	  Include support for i-MXT (aka td60) platform. This

	  includes specific configurations for the module and its peripherals.

config MACH_IMX27_DT

	bool "Support i.MX27 platforms from device tree"

	select SOC_IMX27

obj-$(CONFIG_COMMON_CLK) += clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-gate2.o \

			    clk-pfd.o clk-busy.o clk.o \

			    clk-fixup-div.o clk-fixup-mux.o

			    clk-fixup-div.o clk-fixup-mux.o \

			    clk-gate-exclusive.o

obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o

obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o

endif

# i.MX1 based machines

obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o

obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o

obj-$(CONFIG_MACH_APF9328) += mach-apf9328.o

obj-$(CONFIG_MACH_IMX1_DT) += imx1-dt.o

# i.MX21 based machines

obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o

# i.MX27 based machines

obj-$(CONFIG_MACH_MX27ADS) += mach-mx27ads.o

obj-$(CONFIG_MACH_PCM038) += mach-pcm038.o

obj-$(CONFIG_MACH_PCM970_BASEBOARD) += pcm970-baseboard.o

obj-$(CONFIG_MACH_MX27_3DS) += mach-mx27_3ds.o

obj-$(CONFIG_MACH_IMX27_VISSTRIM_M10) += mach-imx27_visstrim_m10.o

obj-$(CONFIG_MACH_CPUIMX27) += mach-cpuimx27.o

obj-$(CONFIG_MACH_EUKREA_MBIMX27_BASEBOARD) += eukrea_mbimx27-baseboard.o

obj-$(CONFIG_MACH_PCA100) += mach-pca100.o

obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_td60.o

obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o

# i.MX31 based machines