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

Commit 075cb105 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (31 commits)
  ARM: OMAP: Fix export.h or module.h includes
  ARM: OMAP: omap_device: Include linux/export.h
  ARM: OMAP2: Fix H4 matrix keyboard warning
  ARM: OMAP1: Remove unused omap-alsa.h
  ARM: OMAP1: Fix warnings about enabling 32 KiHz timer
  ARM: OMAP2+: timer: Remove omap_device_pm_latency
  ARM: OMAP2+: clock data: Remove redundant timer clkdev
  ARM: OMAP: Devkit8000: Remove double omap_mux_init_gpio
  ARM: OMAP: usb: musb: OMAP: Delete unused function
  MAINTAINERS: Update linux-omap git repository
  ARM: OMAP: change get_context_loss_count ret value to int
  ARM: OMAP4: hsmmc: configure SDMMC1_DR0 properly
  ARM: OMAP4: hsmmc: Fix Pbias configuration on regulator OFF
  ARM: OMAP3: hwmod: fix variant registration and remove SmartReflex from common list
  ARM: OMAP: I2C: Fix omap_register_i2c_bus() return value on success
  ARM: OMAP: dmtimer: Include linux/module.h
  ARM: OMAP2+: l3-noc: Include linux/module.h
  ARM: OMAP2+: devices: Fixes for McPDM
  ARM: OMAP: Fix errors and warnings when building for one board
  ARM: OMAP3: PM: restrict erratum i443 handling to OMAP3430 only
  ...
parents a3fbbde7 d30cc16c

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4673,7 +4673,7 @@ L: linux-omap@vger.kernel.org 
W:	http://www.muru.com/linux/omap/

W:	http://linux.omap.com/

Q:	http://patchwork.kernel.org/project/linux-omap/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git

S:	Maintained

F:	arch/arm/*omap*/

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

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include <plat/irda.h>

#include <plat/keypad.h>

#include <plat/common.h>

#include <plat/omap-alsa.h>



#include <linux/spi/spi.h>

#include <linux/spi/ads7846.h>

arch/arm/mach-omap1/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ void omap1_pm_idle(void) 
		return;

	}



#ifdef CONFIG_OMAP_MPU_TIMER

#if defined(CONFIG_OMAP_MPU_TIMER) && !defined(CONFIG_OMAP_DM_TIMER)

#warning Enable 32kHz OS timer in order to allow sleep states in idle

	use_idlect1 = use_idlect1 & ~(1 << 9);

#else

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

+0 −1
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ static int devkit8000_twl_gpio_setup(struct device *dev, 
{

	int ret;



	omap_mux_init_gpio(29, OMAP_PIN_INPUT);

	/* gpio + 0 is "mmc0_cd" (input/IRQ) */

	mmc[0].gpio_cd = gpio + 0;

	omap2_hsmmc_init(mmc);

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

+8 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
 * XXX: Still needed to boot until the i2c & twl driver is adapted to

 * device-tree

 */

#ifdef CONFIG_ARCH_OMAP4

static struct twl4030_platform_data sdp4430_twldata = {

	.irq_base	= TWL6030_IRQ_BASE,

	.irq_end	= TWL6030_IRQ_END,
@@ -37,7 +38,9 @@ static void __init omap4_i2c_init(void) 
{

	omap4_pmic_init("twl6030", &sdp4430_twldata);

}

#endif



#ifdef CONFIG_ARCH_OMAP3

static struct twl4030_platform_data beagle_twldata = {

	.irq_base	= TWL4030_IRQ_BASE,

	.irq_end	= TWL4030_IRQ_END,
@@ -47,6 +50,7 @@ static void __init omap3_i2c_init(void) 
{

	omap3_pmic_init("twl4030", &beagle_twldata);

}

#endif



static struct of_device_id omap_dt_match_table[] __initdata = {

	{ .compatible = "simple-bus", },
@@ -72,17 +76,21 @@ static void __init omap_generic_init(void) 
	of_platform_populate(NULL, omap_dt_match_table, NULL, NULL);

}



#ifdef CONFIG_ARCH_OMAP4

static void __init omap4_init(void)

{

	omap4_i2c_init();

	omap_generic_init();

}

#endif



#ifdef CONFIG_ARCH_OMAP3

static void __init omap3_init(void)

{

	omap3_i2c_init();

	omap_generic_init();

}

#endif



#if defined(CONFIG_SOC_OMAP2420)

static const char *omap242x_boards_compat[] __initdata = {