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

Commit c721be28 authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable

parents 1e87347c 27ad4bf7

arch/arm/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -158,9 +158,8 @@ machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 
machine-$(CONFIG_ARCH_MX1)		:= imx

machine-$(CONFIG_ARCH_MX2)		:= imx

machine-$(CONFIG_ARCH_MX25)		:= imx

machine-$(CONFIG_ARCH_MX3)		:= mx3

machine-$(CONFIG_ARCH_MX3)		:= imx

machine-$(CONFIG_ARCH_MX5)		:= mx5

machine-$(CONFIG_ARCH_MXC91231)		:= mxc91231

machine-$(CONFIG_ARCH_MXS)		:= mxs

machine-$(CONFIG_ARCH_NETX)		:= netx

machine-$(CONFIG_ARCH_NOMADIK)		:= nomadik

arch/arm/configs/mx1_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ CONFIG_ARCH_MXC=y 
CONFIG_ARCH_MX1=y

CONFIG_ARCH_MX1ADS=y

CONFIG_MACH_SCB9328=y

CONFIG_MACH_APF9328=y

CONFIG_MXC_IRQ_PRIOR=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

arch/arm/configs/mx51_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y 
# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_MXC=y

CONFIG_ARCH_MX5=y

CONFIG_ARCH_MX51=y

CONFIG_MACH_MX51_BABBAGE=y

CONFIG_MACH_MX51_3DS=y

CONFIG_MACH_EUKREA_CPUIMX51=y

arch/arm/mach-imx/Kconfig

+286 −0
Original line number Diff line number Diff line 
config IMX_HAVE_DMA_V1

	bool

#

# ARCH_MX31 and ARCH_MX35 are left for compatibility

# Some usages assume that having one of them implies not having (e.g.) ARCH_MX2.

# To easily distinguish good and reviewed from unreviewed usages new (and IMHO

# more sensible) names are used: SOC_IMX31 and SOC_IMX35

config ARCH_MX31

	bool



config ARCH_MX35

	bool



config SOC_IMX1

	bool
@@ -31,6 +41,24 @@ config SOC_IMX27 
	select IMX_HAVE_IOMUX_V1

	select MXC_AVIC



config SOC_IMX31

	bool

	select CPU_V6

	select IMX_HAVE_PLATFORM_MXC_RNGA

	select ARCH_MXC_AUDMUX_V2

	select ARCH_MX31

	select MXC_AVIC



config SOC_IMX35

	bool

	select CPU_V6

	select ARCH_MXC_IOMUX_V3

	select ARCH_MXC_AUDMUX_V2

	select HAVE_EPIT

	select ARCH_MX35

	select MXC_AVIC





if ARCH_MX1



comment "MX1 platforms:"
@@ -40,6 +68,7 @@ config MACH_MXLADS 
config ARCH_MX1ADS

	bool "MX1ADS platform"

	select MACH_MXLADS

	select SOC_IMX1

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	help
@@ -51,6 +80,13 @@ config MACH_SCB9328 
	help

	  Say Y here if you are using a Synertronixx scb9328 board



config MACH_APF9328

	bool "APF9328"

	select SOC_IMX1

	select IMX_HAVE_PLATFORM_IMX_UART

	help

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



endif



if ARCH_MX2
@@ -129,6 +165,7 @@ choice 


config MACH_EUKREA_MBIMXSD25_BASEBOARD

	bool "Eukrea MBIMXSD development board"

	select IMX_HAVE_PLATFORM_GPIO_KEYS

	select IMX_HAVE_PLATFORM_IMX_SSI

	help

	  This adds board specific devices that can be found on Eukrea's
@@ -254,6 +291,7 @@ config MACH_MX27_3DS 
config MACH_IMX27_VISSTRIM_M10

	bool "Vista Silicon i.MX27 Visstrim_m10"

	select SOC_IMX27

	select IMX_HAVE_PLATFORM_GPIO_KEYS

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_UART
@@ -314,3 +352,251 @@ config MACH_IMX27IPCAM 
	  configurations for the board and its peripherals.



endif



if ARCH_MX3



comment "MX31 platforms:"



config MACH_MX31ADS

	bool "Support MX31ADS platforms"

	select SOC_IMX31

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_UART

	default y

	help

	  Include support for MX31ADS platform. This includes specific

	  configurations for the board and its peripherals.



config MACH_MX31ADS_WM1133_EV1

	bool "Support Wolfson Microelectronics 1133-EV1 module"

	depends on MACH_MX31ADS

	depends on MFD_WM8350_I2C

	depends on REGULATOR_WM8350

	select MFD_WM8350_CONFIG_MODE_0

	select MFD_WM8352_CONFIG_MODE_0

	help

	  Include support for the Wolfson Microelectronics 1133-EV1 PMU

	  and audio module for the MX31ADS platform.



config MACH_MX31LILLY

	bool "Support MX31 LILLY-1131 platforms (INCO startec)"

	select SOC_IMX31

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IPU_CORE

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_SPI_IMX

	select MXC_ULPI if USB_ULPI

	help

	  Include support for mx31 based LILLY1131 modules. This includes

	  specific configurations for the board and its peripherals.



config MACH_MX31LITE

	bool "Support MX31 LITEKIT (LogicPD)"

	select SOC_IMX31

	select MXC_ULPI if USB_ULPI

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_RTC

	select IMX_HAVE_PLATFORM_SPI_IMX

	help

	  Include support for MX31 LITEKIT platform. This includes specific

	  configurations for the board and its peripherals.



config MACH_PCM037

	bool "Support Phytec pcm037 (i.MX31) platforms"

	select SOC_IMX31

	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_IPU_CORE

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_W1

	select MXC_ULPI if USB_ULPI

	help

	  Include support for Phytec pcm037 platform. This includes

	  specific configurations for the board and its peripherals.



config MACH_PCM037_EET

	bool "Support pcm037 EET board extensions"

	depends on MACH_PCM037

	select IMX_HAVE_PLATFORM_GPIO_KEYS

	select IMX_HAVE_PLATFORM_SPI_IMX

	help

	  Add support for PCM037 EET baseboard extensions. If you are using the

	  OLED display with EET, use "video=mx3fb:CMEL-OLED" kernel

	  command-line parameter.



config MACH_MX31_3DS

	bool "Support MX31PDK (3DS)"

	select SOC_IMX31

	select MXC_DEBUG_BOARD

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_KEYPAD

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IPU_CORE

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_SPI_IMX

	select MXC_ULPI if USB_ULPI

	help

	  Include support for MX31PDK (3DS) platform. This includes specific

	  configurations for the board and its peripherals.



config MACH_MX31_3DS_MXC_NAND_USE_BBT

	bool "Make the MXC NAND driver use the in flash Bad Block Table"

	depends on MACH_MX31_3DS

	depends on MTD_NAND_MXC

	help

	  Enable this if you want that the MXC NAND driver uses the in flash

	  Bad Block Table to know what blocks are bad instead of scanning the

	  entire flash looking for bad block markers.



config MACH_MX31MOBOARD

	bool "Support mx31moboard platforms (EPFL Mobots group)"

	select SOC_IMX31

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IPU_CORE

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_SPI_IMX

	select MXC_ULPI if USB_ULPI

	help

	  Include support for mx31moboard platform. This includes specific

	  configurations for the board and its peripherals.



config MACH_QONG

	bool "Support Dave/DENX QongEVB-LITE platform"

	select SOC_IMX31

	select IMX_HAVE_PLATFORM_IMX_UART

	help

	  Include support for Dave/DENX QongEVB-LITE platform. This includes

	  specific configurations for the board and its peripherals.



config MACH_ARMADILLO5X0

	bool "Support Atmark Armadillo-500 Development Base Board"

	select SOC_IMX31

	select IMX_HAVE_PLATFORM_GPIO_KEYS

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IPU_CORE

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_MXC_NAND

	select MXC_ULPI if USB_ULPI

	help

	  Include support for Atmark Armadillo-500 platform. This includes

	  specific configurations for the board and its peripherals.



config MACH_KZM_ARM11_01

	bool "Support KZM-ARM11-01(Kyoto Microcomputer)"

	select SOC_IMX31

	select IMX_HAVE_PLATFORM_IMX_UART

	help

	  Include support for KZM-ARM11-01. This includes specific

	  configurations for the board and its peripherals.



config MACH_BUG

	bool "Support Buglabs BUGBase platform"

	select SOC_IMX31

	select IMX_HAVE_PLATFORM_IMX_UART

	default y

	help

	  Include support for BUGBase 1.3 platform. This includes specific

	  configurations for the board and its peripherals.



comment "MX35 platforms:"



config MACH_PCM043

	bool "Support Phytec pcm043 (i.MX35) platforms"

	select SOC_IMX35

	select IMX_HAVE_PLATFORM_FLEXCAN

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IPU_CORE

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

	select MXC_ULPI if USB_ULPI

	help

	  Include support for Phytec pcm043 platform. This includes

	  specific configurations for the board and its peripherals.



config MACH_MX35_3DS

	bool "Support MX35PDK platform"

	select SOC_IMX35

	select MXC_DEBUG_BOARD

	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_SDHCI_ESDHC_IMX

	help

	  Include support for MX35PDK platform. This includes specific

	  configurations for the board and its peripherals.



config MACH_EUKREA_CPUIMX35

	bool "Support Eukrea CPUIMX35 Platform"

	select SOC_IMX35

	select IMX_HAVE_PLATFORM_FLEXCAN

	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_SDHCI_ESDHC_IMX

	select MXC_ULPI if USB_ULPI

	help

	  Include support for Eukrea CPUIMX35 platform. This includes

	  specific configurations for the board and its peripherals.



choice

	prompt "Baseboard"

	depends on MACH_EUKREA_CPUIMX35

	default MACH_EUKREA_MBIMXSD35_BASEBOARD



config MACH_EUKREA_MBIMXSD35_BASEBOARD

	bool "Eukrea MBIMXSD development board"

	select IMX_HAVE_PLATFORM_GPIO_KEYS

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IPU_CORE

	help

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

	  MBIMXSD evaluation board.



endchoice



config MACH_VPR200

	bool "Support VPR200 platform"

	select SOC_IMX35

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_GPIO_KEYS

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IPU_CORE

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

	help

	  Include support for VPR200 platform. This includes specific

	  configurations for the board and its peripherals.



endif

arch/arm/mach-imx/Makefile

+31 −7
Original line number Diff line number Diff line 
#

# Makefile for the linux kernel.

#



# Object file lists.



obj-$(CONFIG_IMX_HAVE_DMA_V1) += dma-v1.o



obj-$(CONFIG_ARCH_MX1) += clock-imx1.o mm-imx1.o
@@ -14,18 +8,27 @@ obj-$(CONFIG_ARCH_MX25) += clock-imx25.o mm-imx25.o ehci-imx25.o 
obj-$(CONFIG_MACH_MX27) += cpu-imx27.o pm-imx27.o

obj-$(CONFIG_MACH_MX27) += clock-imx27.o mm-imx27.o ehci-imx27.o



obj-$(CONFIG_SOC_IMX31) += mm-imx31.o cpu-imx31.o clock-imx31.o iomux-imx31.o ehci-imx31.o

obj-$(CONFIG_SOC_IMX35) += mm-imx35.o cpu-imx35.o clock-imx35.o ehci-imx35.o

obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o



# Support for CMOS sensor interface

obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o



# 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



# i.MX21 based machines

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



# i.MX25 based machines

obj-$(CONFIG_MACH_MX25_3DS) += mach-mx25_3ds.o

obj-$(CONFIG_MACH_EUKREA_CPUIMX25) += mach-eukrea_cpuimx25.o

obj-$(CONFIG_MACH_EUKREA_MBIMXSD25_BASEBOARD) += eukrea_mbimxsd25-baseboard.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
@@ -37,3 +40,24 @@ 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_IMX27IPCAM) += mach-imx27ipcam.o



# i.MX31 based machines

obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o

obj-$(CONFIG_MACH_MX31LILLY) += mach-mx31lilly.o mx31lilly-db.o

obj-$(CONFIG_MACH_MX31LITE) += mach-mx31lite.o mx31lite-db.o

obj-$(CONFIG_MACH_PCM037) += mach-pcm037.o

obj-$(CONFIG_MACH_PCM037_EET) += mach-pcm037_eet.o

obj-$(CONFIG_MACH_MX31_3DS) += mach-mx31_3ds.o

obj-$(CONFIG_MACH_MX31MOBOARD) += mach-mx31moboard.o mx31moboard-devboard.o \

		mx31moboard-marxbot.o mx31moboard-smartbot.o

obj-$(CONFIG_MACH_QONG) += mach-qong.o

obj-$(CONFIG_MACH_ARMADILLO5X0) += mach-armadillo5x0.o

obj-$(CONFIG_MACH_KZM_ARM11_01) += mach-kzm_arm11_01.o

obj-$(CONFIG_MACH_BUG) += mach-bug.o



# i.MX35 based machines

obj-$(CONFIG_MACH_PCM043) += mach-pcm043.o

obj-$(CONFIG_MACH_MX35_3DS) += mach-mx35_3ds.o

obj-$(CONFIG_MACH_EUKREA_CPUIMX35) += mach-cpuimx35.o

obj-$(CONFIG_MACH_EUKREA_MBIMXSD35_BASEBOARD) += eukrea_mbimxsd35-baseboard.o

obj-$(CONFIG_MACH_VPR200) += mach-vpr200.o