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

Commit 3afdb0f3 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 71d8c5b1 f7fdaca9

arch/arm/configs/mx51_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ CONFIG_MMC=y 
CONFIG_MMC_BLOCK=m

CONFIG_MMC_SDHCI=m

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=m

CONFIG_LEDS_CLASS=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_INTF_DEV_UIE_EMUL=y

CONFIG_EXT2_FS=y

arch/arm/mach-imx/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ config MACH_MX25_3DS 
	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMXDI_RTC

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_FB

	select IMX_HAVE_PLATFORM_IMX_KEYPAD

	select IMX_HAVE_PLATFORM_IMX_UART
@@ -238,6 +239,7 @@ config MACH_MX27_3DS 
	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_KEYPAD

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI
@@ -265,6 +267,7 @@ config MACH_IMX27LITE 
	bool "LogicPD MX27 LITEKIT platform"

	select SOC_IMX27

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_SSI

	help

	  Include support for MX27 LITEKIT platform. This includes specific

	  configurations for the board and its peripherals.
@@ -300,4 +303,13 @@ config MACH_MXT_TD60 
	  Include support for i-MXT (aka td60) platform. This

	  includes specific configurations for the module and its peripherals.



config MACH_IMX27IPCAM

	bool "IMX27 IPCAM platform"

	select SOC_IMX27

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_UART

	help

	  Include support for IMX27 IPCAM platform. This includes specific

	  configurations for the board and its peripherals.



endif

arch/arm/mach-imx/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ obj-$(CONFIG_IMX_HAVE_DMA_V1) += dma-v1.o 
obj-$(CONFIG_ARCH_MX1) += clock-imx1.o mm-imx1.o

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



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

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

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



# Support for CMOS sensor interface

obj-$(CONFIG_MX1_VIDEO)	+= mx1-camera-fiq.o mx1-camera-fiq-ksym.o
@@ -36,3 +36,4 @@ 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_IMX27IPCAM) += mach-imx27ipcam.o

arch/arm/mach-imx/clock-imx1.c

+1 −0
Original line number Diff line number Diff line
@@ -592,6 +592,7 @@ static struct clk_lookup lookups[] __initdata = { 
	_REGISTER_CLOCK("imx-uart.2", NULL, uart_clk)

	_REGISTER_CLOCK("imx-i2c.0", NULL, i2c_clk)

	_REGISTER_CLOCK("imx1-cspi.0", NULL, spi_clk)

	_REGISTER_CLOCK("imx1-cspi.1", NULL, spi_clk)

	_REGISTER_CLOCK("imx-mmc.0", NULL, sdhc_clk)

	_REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk)

	_REGISTER_CLOCK(NULL, "mshc", mshc_clk)

arch/arm/mach-imx/clock-imx25.c

+3 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ DEFINE_CLOCK(esdhc1_per_clk, 0, CCM_CGCR0, 3, get_rate_esdhc1, NULL, 
DEFINE_CLOCK(esdhc2_ahb_clk, 0, CCM_CGCR0, 22, get_rate_esdhc2,	 NULL, NULL);

DEFINE_CLOCK(esdhc2_per_clk, 0, CCM_CGCR0,  4, get_rate_esdhc2,	 NULL,

		&esdhc2_ahb_clk);

DEFINE_CLOCK(sdma_ahb_clk, 0, CCM_CGCR0, 26, NULL,	 NULL, NULL);

DEFINE_CLOCK(fec_ahb_clk, 0, CCM_CGCR0, 23, NULL,	 NULL, NULL);

DEFINE_CLOCK(lcdc_ahb_clk, 0, CCM_CGCR0, 24, NULL,	 NULL, NULL);

DEFINE_CLOCK(lcdc_per_clk, 0, CCM_CGCR0,  7, NULL,	 NULL, &lcdc_ahb_clk);
@@ -253,6 +254,7 @@ DEFINE_CLOCK(lcdc_clk, 0, CCM_CGCR1, 29, get_rate_lcdc, NULL, &lcdc_per_clk); 
DEFINE_CLOCK(wdt_clk,    0, CCM_CGCR2, 19, get_rate_ipg, NULL,  NULL);

DEFINE_CLOCK(ssi1_clk,  0, CCM_CGCR2, 11, get_rate_ssi1, NULL, &ssi1_per_clk);

DEFINE_CLOCK(ssi2_clk,  1, CCM_CGCR2, 12, get_rate_ssi2, NULL, &ssi2_per_clk);

DEFINE_CLOCK(sdma_clk, 0, CCM_CGCR2,  6, get_rate_ipg, NULL, &sdma_ahb_clk);

DEFINE_CLOCK(esdhc1_clk,  0, CCM_CGCR1, 13, get_rate_esdhc1, NULL,

		&esdhc1_per_clk);

DEFINE_CLOCK(esdhc2_clk,  1, CCM_CGCR1, 14, get_rate_esdhc2, NULL,
@@ -304,6 +306,7 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK(NULL, "audmux", audmux_clk)

	_REGISTER_CLOCK("flexcan.0", NULL, can1_clk)

	_REGISTER_CLOCK("flexcan.1", NULL, can2_clk)

	_REGISTER_CLOCK("imx-sdma", NULL, sdma_clk)

};



int __init mx25_clocks_init(void)