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

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

Merge branches 'fixes' and 'devel-stable' into for-linus

parents dfad549d 5f183860

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -365,6 +365,7 @@ config ARCH_MXC 
	select GENERIC_CLOCKEVENTS

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select HAVE_SCHED_CLOCK

	help

	  Support for Freescale MXC/iMX-based family of processors

arch/arm/include/asm/mach/udc_pxa2xx.h

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ struct pxa2xx_udc_mach_info { 
	 * VBUS IRQ and omit the methods above.  Store the GPIO number

	 * here.  Note that sometimes the signals go through inverters...

	 */

	bool	gpio_vbus_inverted;

	int	gpio_vbus;			/* high == vbus present */

	bool	gpio_pullup_inverted;

	int	gpio_pullup;			/* high == pullup activated */

};

arch/arm/mach-imx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ config MACH_IMX27_VISSTRIM_M10 
	bool "Vista Silicon i.MX27 Visstrim_m10"

	select SOC_IMX27

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_MXC_EHCI

arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c

+7 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <mach/mx25.h>

#include <mach/imx-uart.h>

#include <mach/audmux.h>

#include <mach/esdhc.h>



#include "devices-imx25.h"
@@ -242,6 +243,11 @@ struct imx_ssi_platform_data eukrea_mbimxsd_ssi_pdata __initconst = { 
	.flags = IMX_SSI_SYN | IMX_SSI_NET | IMX_SSI_USE_I2S_SLAVE,

};



static struct esdhc_platform_data sd1_pdata = {

	.cd_gpio = GPIO_SD1CD,

	.wp_gpio = -EINVAL,

};



/*

 * system init for baseboard usage. Will be called by cpuimx25 init.

 *
@@ -275,7 +281,7 @@ void __init eukrea_mbimxsd25_baseboard_init(void) 
	imx25_add_imx_ssi(0, &eukrea_mbimxsd_ssi_pdata);



	imx25_add_flexcan1(NULL);

	imx25_add_sdhci_esdhc_imx(0, NULL);

	imx25_add_sdhci_esdhc_imx(0, &sd1_pdata);



	gpio_request(GPIO_LED1, "LED1");

	gpio_direction_output(GPIO_LED1, 1);

arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c

+11 −3
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <mach/ipu.h>

#include <mach/mx3fb.h>

#include <mach/audmux.h>

#include <mach/esdhc.h>



#include "devices-imx35.h"

#include "devices.h"
@@ -163,11 +164,14 @@ static iomux_v3_cfg_t eukrea_mbimxsd_pads[] = { 
	MX35_PAD_SD1_DATA1__ESDHC1_DAT1,

	MX35_PAD_SD1_DATA2__ESDHC1_DAT2,

	MX35_PAD_SD1_DATA3__ESDHC1_DAT3,

	/* SD1 CD */

	MX35_PAD_LD18__GPIO3_24,

};



#define GPIO_LED1	IMX_GPIO_NR(3, 29)

#define GPIO_SWITCH1	IMX_GPIO_NR(3, 25)

#define GPIO_LCDPWR	(4)

#define GPIO_LCDPWR	IMX_GPIO_NR(1, 4)

#define GPIO_SD1CD	IMX_GPIO_NR(3, 24)



static void eukrea_mbimxsd_lcd_power_set(struct plat_lcd_data *pd,

				   unsigned int power)
@@ -254,6 +258,11 @@ struct imx_ssi_platform_data eukrea_mbimxsd_ssi_pdata __initconst = { 
	.flags = IMX_SSI_SYN | IMX_SSI_NET | IMX_SSI_USE_I2S_SLAVE,

};



static struct esdhc_platform_data sd1_pdata = {

	.cd_gpio = GPIO_SD1CD,

	.wp_gpio = -EINVAL,

};



/*

 * system init for baseboard usage. Will be called by cpuimx35 init.

 *
@@ -289,7 +298,7 @@ void __init eukrea_mbimxsd35_baseboard_init(void) 
	imx35_add_imx_ssi(0, &eukrea_mbimxsd_ssi_pdata);



	imx35_add_flexcan1(NULL);

	imx35_add_sdhci_esdhc_imx(0, NULL);

	imx35_add_sdhci_esdhc_imx(0, &sd1_pdata);



	gpio_request(GPIO_LED1, "LED1");

	gpio_direction_output(GPIO_LED1, 1);
@@ -301,7 +310,6 @@ void __init eukrea_mbimxsd35_baseboard_init(void) 


	gpio_request(GPIO_LCDPWR, "LCDPWR");

	gpio_direction_output(GPIO_LCDPWR, 1);

	gpio_free(GPIO_LCDPWR);



	i2c_register_board_info(0, eukrea_mbimxsd_i2c_devices,

				ARRAY_SIZE(eukrea_mbimxsd_i2c_devices));