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

Commit 003e6348 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

parents 3e343d7a 655850ed

arch/arm/mach-omap1/board-innovator.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -416,13 +416,13 @@ static void __init innovator_init(void) 
#ifdef CONFIG_ARCH_OMAP15XX

#ifdef CONFIG_ARCH_OMAP15XX

	if (cpu_is_omap1510()) {

	if (cpu_is_omap1510()) {

		omap1_usb_init(&innovator1510_usb_config);

		omap1_usb_init(&innovator1510_usb_config);

		innovator_config[1].data = &innovator1510_lcd_config;

		innovator_config[0].data = &innovator1510_lcd_config;

	}

	}

#endif

#endif

#ifdef CONFIG_ARCH_OMAP16XX

#ifdef CONFIG_ARCH_OMAP16XX

	if (cpu_is_omap1610()) {

	if (cpu_is_omap1610()) {

		omap1_usb_init(&h2_usb_config);

		omap1_usb_init(&h2_usb_config);

		innovator_config[1].data = &innovator1610_lcd_config;

		innovator_config[0].data = &innovator1610_lcd_config;

	}

	}

#endif

#endif

	omap_board_config = innovator_config;

	omap_board_config = innovator_config;

arch/arm/mach-omap2/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -364,8 +364,8 @@ config OMAP3_SDRC_AC_TIMING 
	  going on could result in system crashes;

	  going on could result in system crashes;





config OMAP4_ERRATA_I688

config OMAP4_ERRATA_I688

	bool "OMAP4 errata: Async Bridge Corruption (BROKEN)"

	bool "OMAP4 errata: Async Bridge Corruption"

	depends on ARCH_OMAP4 && BROKEN

	depends on ARCH_OMAP4

	select ARCH_HAS_BARRIERS

	select ARCH_HAS_BARRIERS

	help

	help

	  If a data is stalled inside asynchronous bridge because of back

	  If a data is stalled inside asynchronous bridge because of back

arch/arm/mach-omap2/board-n8x0.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -371,7 +371,11 @@ static void n8x0_mmc_callback(void *data, u8 card_mask) 
	else

	else

		*openp = 0;

		*openp = 0;





#ifdef CONFIG_MMC_OMAP

	omap_mmc_notify_cover_event(mmc_device, index, *openp);

	omap_mmc_notify_cover_event(mmc_device, index, *openp);

#else

	pr_warn("MMC: notify cover event not available\n");

#endif

}

}





static int n8x0_mmc_late_init(struct device *dev)

static int n8x0_mmc_late_init(struct device *dev)

arch/arm/mach-omap2/board-omap3evm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -381,7 +381,7 @@ static int omap3evm_twl_gpio_setup(struct device *dev, 
	gpio_request_one(gpio + 7, GPIOF_OUT_INIT_LOW, "EN_DVI");

	gpio_request_one(gpio + 7, GPIOF_OUT_INIT_LOW, "EN_DVI");





	/* TWL4030_GPIO_MAX + 1 == ledB (out, active low LED) */

	/* TWL4030_GPIO_MAX + 1 == ledB (out, active low LED) */

	gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;

	gpio_leds[0].gpio = gpio + TWL4030_GPIO_MAX + 1;





	platform_device_register(&leds_gpio);

	platform_device_register(&leds_gpio);

arch/arm/mach-omap2/common.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -132,6 +132,7 @@ void omap3_map_io(void); 
void am33xx_map_io(void);

void am33xx_map_io(void);

void omap4_map_io(void);

void omap4_map_io(void);

void ti81xx_map_io(void);

void ti81xx_map_io(void);

void omap_barriers_init(void);





/**

/**

 * omap_test_timeout - busy-loop, testing a condition

 * omap_test_timeout - busy-loop, testing a condition