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

Commit 0a831cec 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 5b88128f b9214b97

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ config ARCH_MXS 
	bool "Freescale MXS-based"

	select GENERIC_CLOCKEVENTS

	select ARCH_REQUIRE_GPIOLIB

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	help

	  Support for Freescale MXS-based family of processors

arch/arm/mach-imx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ config MACH_MX27_3DS 
	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_SPI_IMX

	select MXC_DEBUG_BOARD

	select MXC_ULPI if USB_ULPI

	help

	  Include support for MX27PDK platform. This includes specific

arch/arm/mach-imx/mach-mx27_3ds.c

+8 −2
Original line number Diff line number Diff line
@@ -37,12 +37,15 @@ 
#include <mach/common.h>

#include <mach/iomux-mx27.h>

#include <mach/ulpi.h>

#include <mach/irqs.h>

#include <mach/3ds_debugboard.h>



#include "devices-imx27.h"



#define SD1_EN_GPIO (GPIO_PORTB + 25)

#define OTG_PHY_RESET_GPIO (GPIO_PORTB + 23)

#define SPI2_SS0 (GPIO_PORTD + 21)

#define EXPIO_PARENT_INT	(MXC_INTERNAL_IRQS + GPIO_PORTC + 28)



static const int mx27pdk_pins[] __initconst = {

	/* UART1 */
@@ -215,10 +218,10 @@ static struct regulator_init_data vgen_init = { 


static struct mc13783_regulator_init_data mx27_3ds_regulators[] = {

	{

		.id = MC13783_REGU_VMMC1,

		.id = MC13783_REG_VMMC1,

		.init_data = &vmmc1_init,

	}, {

		.id = MC13783_REGU_VGEN,

		.id = MC13783_REG_VGEN,

		.init_data = &vgen_init,

	},

};
@@ -276,6 +279,9 @@ static void __init mx27pdk_init(void) 
	imx27_add_spi_imx1(&spi2_pdata);

	spi_register_board_info(mx27_3ds_spi_devs,

						ARRAY_SIZE(mx27_3ds_spi_devs));



	if (mxc_expio_init(MX27_CS5_BASE_ADDR, EXPIO_PARENT_INT))

		pr_warn("Init of the debugboard failed, all devices on the debugboard are unusable.\n");

}



static void __init mx27pdk_timer_init(void)

arch/arm/mach-mx3/mach-mx31_3ds.c

+2 −2
Original line number Diff line number Diff line
@@ -147,10 +147,10 @@ static struct mc13783_regulator_init_data mx31_3ds_regulators[] = { 
		.init_data = &pwgtx_init,

	}, {



		.id = MC13783_REGU_GPO1, /* Turn on 1.8V */

		.id = MC13783_REG_GPO1, /* Turn on 1.8V */

		.init_data = &gpo_init,

	}, {

		.id = MC13783_REGU_GPO3, /* Turn on 3.3V */

		.id = MC13783_REG_GPO3, /* Turn on 3.3V */

		.init_data = &gpo_init,

	},

};

arch/arm/mach-mx5/Kconfig

+20 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ config MACH_MX51_BABBAGE 
config MACH_MX51_3DS

	bool "Support MX51PDK (3DS)"

	select SOC_IMX51

	select IMX_HAVE_PLATFORM_IMX_KEYPAD

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

	select IMX_HAVE_PLATFORM_SPI_IMX
@@ -77,6 +78,7 @@ choice 
config MACH_EUKREA_MBIMX51_BASEBOARD

	prompt "Eukrea MBIMX51 development board"

	bool

	select IMX_HAVE_PLATFORM_IMX_KEYPAD

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

	help

	  This adds board specific devices that can be found on Eukrea's
@@ -124,10 +126,28 @@ config MACH_MX53_EVK 
	bool "Support MX53 EVK platforms"

	select SOC_IMX53

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

	select IMX_HAVE_PLATFORM_SPI_IMX

	help

	  Include support for MX53 EVK platform. This includes specific

	  configurations for the board and its peripherals.



config MACH_MX53_SMD

	bool "Support MX53 SMD platforms"

	select SOC_IMX53

	select IMX_HAVE_PLATFORM_IMX_UART

	help

	  Include support for MX53 SMD platform. This includes specific

	  configurations for the board and its peripherals.



config MACH_MX53_LOCO

	bool "Support MX53 LOCO platforms"

	select SOC_IMX53

	select IMX_HAVE_PLATFORM_IMX_UART

	help

	  Include support for MX53 LOCO platform. This includes specific

	  configurations for the board and its peripherals.



config MACH_MX50_RDP

	bool "Support MX50 reference design platform"