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

Commit 2a85927c authored by Sascha Hauer's avatar Sascha Hauer
Browse files

Merge branch 'imx-for-2.6.38' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-for-2.6.38

parents 3561d43f 124bf94a

arch/arm/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -154,7 +154,7 @@ machine-$(CONFIG_ARCH_MSM) := msm 
machine-$(CONFIG_ARCH_MV78XX0)		:= mv78xx0

machine-$(CONFIG_ARCH_MV78XX0)		:= mv78xx0

machine-$(CONFIG_ARCH_MX1)		:= imx

machine-$(CONFIG_ARCH_MX1)		:= imx

machine-$(CONFIG_ARCH_MX2)		:= imx

machine-$(CONFIG_ARCH_MX2)		:= imx

machine-$(CONFIG_ARCH_MX25)		:= mx25

machine-$(CONFIG_ARCH_MX25)		:= imx

machine-$(CONFIG_ARCH_MX3)		:= mx3

machine-$(CONFIG_ARCH_MX3)		:= mx3

machine-$(CONFIG_ARCH_MX5)		:= mx5

machine-$(CONFIG_ARCH_MX5)		:= mx5

machine-$(CONFIG_ARCH_MXC91231)		:= mxc91231

machine-$(CONFIG_ARCH_MXC91231)		:= mxc91231

arch/arm/configs/mx3_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -84,6 +84,7 @@ CONFIG_SERIAL_IMX_CONSOLE=y 
CONFIG_I2C=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_IMX=y

CONFIG_I2C_IMX=y

CONFIG_SPI=y

CONFIG_W1=y

CONFIG_W1=y

CONFIG_W1_MASTER_MXC=y

CONFIG_W1_MASTER_MXC=y

CONFIG_W1_SLAVE_THERM=y

CONFIG_W1_SLAVE_THERM=y

arch/arm/mach-imx/Kconfig

+108 −20
Original line number Original line Diff line number Diff line 
config IMX_HAVE_DMA_V1

config IMX_HAVE_DMA_V1

	bool

	bool





if ARCH_MX1



config SOC_IMX1

config SOC_IMX1

	bool

	select CPU_ARM920T

	select CPU_ARM920T

	select IMX_HAVE_DMA_V1

	select IMX_HAVE_DMA_V1

	select IMX_HAVE_IOMUX_V1

	select IMX_HAVE_IOMUX_V1



config SOC_IMX21

	bool

	bool

	select CPU_ARM926T

	select ARCH_MXC_AUDMUX_V1

	select IMX_HAVE_DMA_V1

	select IMX_HAVE_IOMUX_V1



config SOC_IMX25

	bool

	select CPU_ARM926T

	select ARCH_MXC_AUDMUX_V2

	select ARCH_MXC_IOMUX_V3



config SOC_IMX27

	bool

	select CPU_ARM926T

	select ARCH_MXC_AUDMUX_V1

	select IMX_HAVE_DMA_V1

	select IMX_HAVE_IOMUX_V1



if ARCH_MX1





comment "MX1 platforms:"

comment "MX1 platforms:"

config MACH_MXLADS

config MACH_MXLADS
@@ -31,33 +51,17 @@ endif 




if ARCH_MX2

if ARCH_MX2





config SOC_IMX21

	select CPU_ARM926T

	select ARCH_MXC_AUDMUX_V1

	select IMX_HAVE_DMA_V1

	select IMX_HAVE_IOMUX_V1

	bool



config SOC_IMX27

	select CPU_ARM926T

	select ARCH_MXC_AUDMUX_V1

	select IMX_HAVE_DMA_V1

	select IMX_HAVE_IOMUX_V1

	bool



choice

choice

	prompt "CPUs:"

	prompt "CPUs:"

	default MACH_MX21

	default MACH_MX21





config MACH_MX21

config MACH_MX21

	bool "i.MX21 support"

	bool "i.MX21 support"

	select SOC_IMX21

	help

	help

	  This enables support for Freescale's MX2 based i.MX21 processor.

	  This enables support for Freescale's MX2 based i.MX21 processor.





config MACH_MX27

config MACH_MX27

	bool "i.MX27 support"

	bool "i.MX27 support"

	select SOC_IMX27

	help

	help

	  This enables support for Freescale's MX2 based i.MX27 processor.

	  This enables support for Freescale's MX2 based i.MX27 processor.
@@ -71,7 +75,10 @@ comment "MX21 platforms:" 




config MACH_MX21ADS

config MACH_MX21ADS

	bool "MX21ADS platform"

	bool "MX21ADS platform"

	select SOC_IMX21

	select IMX_HAVE_PLATFORM_IMX_FB

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_NAND

	help

	help

	  Include support for MX21ADS platform. This includes specific

	  Include support for MX21ADS platform. This includes specific
@@ -79,24 +86,78 @@ config MACH_MX21ADS 




endif

endif





if ARCH_MX25



comment "MX25 platforms:"



config MACH_MX25_3DS

	bool "Support MX25PDK (3DS) Platform"

	select SOC_IMX25

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMXDI_RTC

	select IMX_HAVE_PLATFORM_IMX_FB

	select IMX_HAVE_PLATFORM_IMX_KEYPAD

	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



config MACH_EUKREA_CPUIMX25

	bool "Support Eukrea CPUIMX25 Platform"

	select SOC_IMX25

	select IMX_HAVE_PLATFORM_FLEXCAN

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMXDI_RTC

	select IMX_HAVE_PLATFORM_IMX_FB

	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



choice

	prompt "Baseboard"

	depends on MACH_EUKREA_CPUIMX25

	default MACH_EUKREA_MBIMXSD25_BASEBOARD



config MACH_EUKREA_MBIMXSD25_BASEBOARD

	bool "Eukrea MBIMXSD development board"

	select IMX_HAVE_PLATFORM_IMX_SSI

	help

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

	  MBIMXSD evaluation board.



endchoice



endif



if MACH_MX27

if MACH_MX27





comment "MX27 platforms:"

comment "MX27 platforms:"





config MACH_MX27ADS

config MACH_MX27ADS

	bool "MX27ADS platform"

	bool "MX27ADS platform"

	select SOC_IMX27

	select IMX_HAVE_PLATFORM_IMX_FB

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_W1

	help

	help

	  Include support for MX27ADS platform. This includes specific

	  Include support for MX27ADS platform. This includes specific

	  configurations for the board and its peripherals.

	  configurations for the board and its peripherals.





config MACH_PCM038

config MACH_PCM038

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

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

	select SOC_IMX27

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_W1

	select IMX_HAVE_PLATFORM_SPI_IMX

	select IMX_HAVE_PLATFORM_SPI_IMX

	select MXC_ULPI if USB_ULPI

	select MXC_ULPI if USB_ULPI

	help

	help
@@ -109,8 +170,9 @@ choice 
	default MACH_PCM970_BASEBOARD

	default MACH_PCM970_BASEBOARD





config MACH_PCM970_BASEBOARD

config MACH_PCM970_BASEBOARD

	prompt "PHYTEC PCM970 development board"

	bool "PHYTEC PCM970 development board"

	bool

	select IMX_HAVE_PLATFORM_IMX_FB

	select IMX_HAVE_PLATFORM_MXC_MMC

	help

	help

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

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

	  PCM970 evaluation board.

	  PCM970 evaluation board.
@@ -119,9 +181,14 @@ endchoice 




config MACH_CPUIMX27

config MACH_CPUIMX27

	bool "Eukrea CPUIMX27 module"

	bool "Eukrea CPUIMX27 module"

	select SOC_IMX27

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_W1

	select MXC_ULPI if USB_ULPI

	select MXC_ULPI if USB_ULPI

	help

	help

	  Include support for Eukrea CPUIMX27 platform. This includes

	  Include support for Eukrea CPUIMX27 platform. This includes
@@ -130,6 +197,7 @@ config MACH_CPUIMX27 
config MACH_EUKREA_CPUIMX27_USESDHC2

config MACH_EUKREA_CPUIMX27_USESDHC2

	bool "CPUIMX27 integrates SDHC2 module"

	bool "CPUIMX27 integrates SDHC2 module"

	depends on MACH_CPUIMX27

	depends on MACH_CPUIMX27

	select IMX_HAVE_PLATFORM_MXC_MMC

	help

	help

	  This adds support for the internal SDHC2 used on CPUIMX27

	  This adds support for the internal SDHC2 used on CPUIMX27

	  for wifi or eMMC.

	  for wifi or eMMC.
@@ -148,8 +216,11 @@ choice 




config MACH_EUKREA_MBIMX27_BASEBOARD

config MACH_EUKREA_MBIMX27_BASEBOARD

	bool "Eukrea MBIMX27 development board"

	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_SSI

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_SPI_IMX

	select IMX_HAVE_PLATFORM_SPI_IMX

	help

	help

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

	  This adds board specific devices that can be found on Eukrea's
@@ -159,15 +230,21 @@ endchoice 




config MACH_MX27_3DS

config MACH_MX27_3DS

	bool "MX27PDK platform"

	bool "MX27PDK platform"

	select SOC_IMX27

	select IMX_HAVE_PLATFORM_IMX_KEYPAD

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_MMC

	help

	help

	  Include support for MX27PDK platform. This includes specific

	  Include support for MX27PDK platform. This includes specific

	  configurations for the board and its peripherals.

	  configurations for the board and its peripherals.





config MACH_IMX27_VISSTRIM_M10

config MACH_IMX27_VISSTRIM_M10

	bool "Vista Silicon i.MX27 Visstrim_m10"

	bool "Vista Silicon i.MX27 Visstrim_m10"

	select SOC_IMX27

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_MXC_EHCI

	help

	help

	  Include support for Visstrim_m10 platform and its different variants.

	  Include support for Visstrim_m10 platform and its different variants.

	  This includes specific configurations for the board and its

	  This includes specific configurations for the board and its
@@ -175,6 +252,7 @@ config MACH_IMX27_VISSTRIM_M10 




config MACH_IMX27LITE

config MACH_IMX27LITE

	bool "LogicPD MX27 LITEKIT platform"

	bool "LogicPD MX27 LITEKIT platform"

	select SOC_IMX27

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_UART

	help

	help

	  Include support for MX27 LITEKIT platform. This includes specific

	  Include support for MX27 LITEKIT platform. This includes specific
@@ -182,10 +260,17 @@ config MACH_IMX27LITE 




config MACH_PCA100

config MACH_PCA100

	bool "Phytec phyCARD-s (pca100)"

	bool "Phytec phyCARD-s (pca100)"

	select SOC_IMX27

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_FB

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_UART

	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_NAND

	select IMX_HAVE_PLATFORM_MXC_W1

	select IMX_HAVE_PLATFORM_SPI_IMX

	select IMX_HAVE_PLATFORM_SPI_IMX

	select MXC_ULPI if USB_ULPI

	select MXC_ULPI if USB_ULPI

	help

	help
@@ -194,8 +279,11 @@ config MACH_PCA100 




config MACH_MXT_TD60

config MACH_MXT_TD60

	bool "Maxtrack i-MXT TD60"

	bool "Maxtrack i-MXT TD60"

	select SOC_IMX27

	select IMX_HAVE_PLATFORM_IMX_FB

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_NAND

	help

	help

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

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

arch/arm/mach-imx/Makefile

+6 −2
Original line number Original line Diff line number Diff line
@@ -4,13 +4,13 @@ 




# Object file lists.

# Object file lists.





obj-y	:=  devices.o



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

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





obj-$(CONFIG_ARCH_MX1) += clock-imx1.o mm-imx1.o

obj-$(CONFIG_ARCH_MX1) += clock-imx1.o mm-imx1.o

obj-$(CONFIG_MACH_MX21) += clock-imx21.o mm-imx21.o

obj-$(CONFIG_MACH_MX21) += clock-imx21.o mm-imx21.o





obj-$(CONFIG_ARCH_MX25) += clock-imx25.o mm-imx25.o



obj-$(CONFIG_MACH_MX27) += cpu-imx27.o pm-imx27.o

obj-$(CONFIG_MACH_MX27) += cpu-imx27.o pm-imx27.o

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

obj-$(CONFIG_MACH_MX27) += clock-imx27.o mm-imx27.o
@@ -22,6 +22,10 @@ obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o 




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

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





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



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

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

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

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

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

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

arch/arm/mach-imx/Makefile.boot

+4 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,10 @@ zreladdr-$(CONFIG_MACH_MX21) := 0xC0008000 
params_phys-$(CONFIG_MACH_MX21)	:= 0xC0000100

params_phys-$(CONFIG_MACH_MX21)	:= 0xC0000100

initrd_phys-$(CONFIG_MACH_MX21)	:= 0xC0800000

initrd_phys-$(CONFIG_MACH_MX21)	:= 0xC0800000





zreladdr-$(CONFIG_ARCH_MX25)	:= 0x80008000

params_phys-$(CONFIG_ARCH_MX25)	:= 0x80000100

initrd_phys-$(CONFIG_ARCH_MX25)	:= 0x80800000



zreladdr-$(CONFIG_MACH_MX27)	:= 0xA0008000

zreladdr-$(CONFIG_MACH_MX27)	:= 0xA0008000

params_phys-$(CONFIG_MACH_MX27)	:= 0xA0000100

params_phys-$(CONFIG_MACH_MX27)	:= 0xA0000100

initrd_phys-$(CONFIG_MACH_MX27)	:= 0xA0800000
 
initrd_phys-$(CONFIG_MACH_MX27)	:= 0xA0800000