Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable (d5b7d8c2) · Commits · e / devices / android_kernel_fairphone_FP5

arch/arm/mach-mx2/Kconfig

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6,11 +6,13 @@ choice

	config MACH_MX21		config MACH_MX21
	bool "i.MX21 support"		bool "i.MX21 support"
			select ARCH_MXC_AUDMUX_V1
	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 ARCH_MXC_AUDMUX_V1
	help		help
	This enables support for Freescale's MX2 based i.MX27 processor.		This enables support for Freescale's MX2 based i.MX27 processor.

arch/arm/mach-mx2/clock_imx27.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -651,8 +651,8 @@ static struct clk_lookup lookups[] = {
	_REGISTER_CLOCK("mxc-ehci.1", "usb_ahb", usb_clk1)		_REGISTER_CLOCK("mxc-ehci.1", "usb_ahb", usb_clk1)
	_REGISTER_CLOCK("mxc-ehci.2", "usb", usb_clk)		_REGISTER_CLOCK("mxc-ehci.2", "usb", usb_clk)
	_REGISTER_CLOCK("mxc-ehci.2", "usb_ahb", usb_clk1)		_REGISTER_CLOCK("mxc-ehci.2", "usb_ahb", usb_clk1)
	_REGISTER_CLOCK(NULL, "ssi1", ssi1_clk)		_REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk)
	_REGISTER_CLOCK(NULL, "ssi2", ssi2_clk)		_REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)
	_REGISTER_CLOCK("mxc_nand.0", NULL, nfc_clk)		_REGISTER_CLOCK("mxc_nand.0", NULL, nfc_clk)
	_REGISTER_CLOCK(NULL, "vpu", vpu_clk)		_REGISTER_CLOCK(NULL, "vpu", vpu_clk)
	_REGISTER_CLOCK(NULL, "dma", dma_clk)		_REGISTER_CLOCK(NULL, "dma", dma_clk)

arch/arm/mach-mx2/devices.c

+78 −0

Original line number	Original line	Diff line number	Diff line
	@@ -530,6 +530,84 @@ struct platform_device mxc_usbh2 = {
	};		};
	#endif		#endif

			static struct resource imx_ssi_resources0[] = {
			{
			.start = SSI1_BASE_ADDR,
			.end = SSI1_BASE_ADDR + 0x6F,
			.flags = IORESOURCE_MEM,
			}, {
			.start = MXC_INT_SSI1,
			.end = MXC_INT_SSI1,
			.flags = IORESOURCE_IRQ,
			}, {
			.name = "tx0",
			.start = DMA_REQ_SSI1_TX0,
			.end = DMA_REQ_SSI1_TX0,
			.flags = IORESOURCE_DMA,
			}, {
			.name = "rx0",
			.start = DMA_REQ_SSI1_RX0,
			.end = DMA_REQ_SSI1_RX0,
			.flags = IORESOURCE_DMA,
			}, {
			.name = "tx1",
			.start = DMA_REQ_SSI1_TX1,
			.end = DMA_REQ_SSI1_TX1,
			.flags = IORESOURCE_DMA,
			}, {
			.name = "rx1",
			.start = DMA_REQ_SSI1_RX1,
			.end = DMA_REQ_SSI1_RX1,
			.flags = IORESOURCE_DMA,
			},
			};

			static struct resource imx_ssi_resources1[] = {
			{
			.start = SSI2_BASE_ADDR,
			.end = SSI2_BASE_ADDR + 0x6F,
			.flags = IORESOURCE_MEM,
			}, {
			.start = MXC_INT_SSI2,
			.end = MXC_INT_SSI2,
			.flags = IORESOURCE_IRQ,
			}, {
			.name = "tx0",
			.start = DMA_REQ_SSI2_TX0,
			.end = DMA_REQ_SSI2_TX0,
			.flags = IORESOURCE_DMA,
			}, {
			.name = "rx0",
			.start = DMA_REQ_SSI2_RX0,
			.end = DMA_REQ_SSI2_RX0,
			.flags = IORESOURCE_DMA,
			}, {
			.name = "tx1",
			.start = DMA_REQ_SSI2_TX1,
			.end = DMA_REQ_SSI2_TX1,
			.flags = IORESOURCE_DMA,
			}, {
			.name = "rx1",
			.start = DMA_REQ_SSI2_RX1,
			.end = DMA_REQ_SSI2_RX1,
			.flags = IORESOURCE_DMA,
			},
			};

			struct platform_device imx_ssi_device0 = {
			.name = "imx-ssi",
			.id = 0,
			.num_resources = ARRAY_SIZE(imx_ssi_resources0),
			.resource = imx_ssi_resources0,
			};

			struct platform_device imx_ssi_device1 = {
			.name = "imx-ssi",
			.id = 1,
			.num_resources = ARRAY_SIZE(imx_ssi_resources1),
			.resource = imx_ssi_resources1,
			};

	/* GPIO port description */		/* GPIO port description */
	static struct mxc_gpio_port imx_gpio_ports[] = {		static struct mxc_gpio_port imx_gpio_ports[] = {
	{		{

arch/arm/mach-mx2/devices.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -26,4 +26,5 @@ extern struct platform_device mxc_usbh2;
	extern struct platform_device mxc_spi_device0;		extern struct platform_device mxc_spi_device0;
	extern struct platform_device mxc_spi_device1;		extern struct platform_device mxc_spi_device1;
	extern struct platform_device mxc_spi_device2;		extern struct platform_device mxc_spi_device2;
			extern struct platform_device imx_ssi_device0;
			extern struct platform_device imx_ssi_device1;

arch/arm/mach-mx2/pca100.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -237,7 +237,7 @@ MACHINE_START(PCA100, "phyCARD-i.MX27")
	.io_pg_offst = ((AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc,		.io_pg_offst = ((AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc,
	.boot_params = PHYS_OFFSET + 0x100,		.boot_params = PHYS_OFFSET + 0x100,
	.map_io = mx27_map_io,		.map_io = mx27_map_io,
	.init_irq = mxc_init_irq,		.init_irq = mx27_init_irq,
	.init_machine = pca100_init,		.init_machine = pca100_init,
	.timer = &pca100_timer,		.timer = &pca100_timer,
	MACHINE_END		MACHINE_END