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

Commit 8ea656bd 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-2.6 

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (21 commits)
  ARM: OMAP4: MMC: increase delay for pbias
  arm: omap2plus: move NAND_BLOCK_SIZE out of boards
  omap4: hwmod: Enable the keypad
  omap3: Free Beagle rev gpios when they are read, so others can read them later
  arm: omap3: beagle: Ensure msecure is mux'd to be able to set the RTC
  omap: rx51: Don't power up speaker amplifier at bootup
  omap: rx51: Set regulator V28_A always on
  ARM: OMAP4: MMC: no regulator off during probe for eMMC
  arm: omap2plus: fix ads7846 pendown gpio request
  ARM: OMAP2: Add missing iounmap in omap4430_phy_init
  ARM: omap4: Pass core and wakeup mux tables to omap4_mux_init
  ARM: omap2+: mux: Allow board mux settings to be NULL
  OMAP4: fix return value of omap4_l3_init
  OMAP: iovmm: fix SW flags passed by user
  arch/arm/mach-omap1/dma.c: Invert calls to platform_device_put and platform_device_del
  OMAP2+: mux: fix compilation warnings
  OMAP: SRAM: Fix warning: format '%08lx' expects type 'long unsigned int'
  arm: omap3: cm-t3517: fix section mismatch warning
  OMAP2+: Fix 9 section mismatch(es) warnings from mach-omap2/built-in.o
  ARM: OMAP2: Add missing include of linux/gpio.h
  ...
parents d205df99 1fcecf28

arch/arm/mach-omap1/dma.c

+6 −5
Original line number Diff line number Diff line
@@ -284,14 +284,15 @@ static int __init omap1_system_dma_init(void) 
	dma_base = ioremap(res[0].start, resource_size(&res[0]));

	if (!dma_base) {

		pr_err("%s: Unable to ioremap\n", __func__);

		return -ENODEV;

		ret = -ENODEV;

		goto exit_device_put;

	}



	ret = platform_device_add_resources(pdev, res, ARRAY_SIZE(res));

	if (ret) {

		dev_err(&pdev->dev, "%s: Unable to add resources for %s%d\n",

			__func__, pdev->name, pdev->id);

		goto exit_device_del;

		goto exit_device_put;

	}



	p = kzalloc(sizeof(struct omap_system_dma_plat_info), GFP_KERNEL);
@@ -299,7 +300,7 @@ static int __init omap1_system_dma_init(void) 
		dev_err(&pdev->dev, "%s: Unable to allocate 'p' for %s\n",

			__func__, pdev->name);

		ret = -ENOMEM;

		goto exit_device_put;

		goto exit_device_del;

	}



	d = kzalloc(sizeof(struct omap_dma_dev_attr), GFP_KERNEL);
@@ -380,10 +381,10 @@ static int __init omap1_system_dma_init(void) 
	kfree(d);

exit_release_p:

	kfree(p);

exit_device_put:

	platform_device_put(pdev);

exit_device_del:

	platform_device_del(pdev);

exit_device_put:

	platform_device_put(pdev);



	return ret;

}

arch/arm/mach-omap2/board-2430sdp.c

+1 −1
Original line number Diff line number Diff line
@@ -26,13 +26,13 @@ 
#include <linux/err.h>

#include <linux/clk.h>

#include <linux/io.h>

#include <linux/gpio.h>



#include <mach/hardware.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>



#include <mach/gpio.h>

#include <plat/board.h>

#include <plat/common.h>

#include <plat/gpmc.h>

arch/arm/mach-omap2/board-3430sdp.c

+3 −3
Original line number Diff line number Diff line
@@ -622,19 +622,19 @@ static struct omap_device_pad serial3_pads[] __initdata = { 
			 OMAP_MUX_MODE0),

};



static struct omap_board_data serial1_data = {

static struct omap_board_data serial1_data __initdata = {

	.id		= 0,

	.pads		= serial1_pads,

	.pads_cnt	= ARRAY_SIZE(serial1_pads),

};



static struct omap_board_data serial2_data = {

static struct omap_board_data serial2_data __initdata = {

	.id		= 1,

	.pads		= serial2_pads,

	.pads_cnt	= ARRAY_SIZE(serial2_pads),

};



static struct omap_board_data serial3_data = {

static struct omap_board_data serial3_data __initdata = {

	.id		= 2,

	.pads		= serial3_pads,

	.pads_cnt	= ARRAY_SIZE(serial3_pads),

arch/arm/mach-omap2/board-4430sdp.c

+6 −5
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static struct gpio sdp4430_eth_gpios[] __initdata = { 
	{ ETH_KS8851_IRQ,	GPIOF_IN,		"eth_irq"	},

};



static int omap_ethernet_init(void)

static int __init omap_ethernet_init(void)

{

	int status;
@@ -322,6 +322,7 @@ static struct omap2_hsmmc_info mmc[] = { 
		.gpio_wp	= -EINVAL,

		.nonremovable   = true,

		.ocr_mask	= MMC_VDD_29_30,

		.no_off_init	= true,

	},

	{

		.mmc		= 1,
@@ -681,19 +682,19 @@ static struct omap_device_pad serial4_pads[] __initdata = { 
			 OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),

};



static struct omap_board_data serial2_data = {

static struct omap_board_data serial2_data __initdata = {

	.id		= 1,

	.pads		= serial2_pads,

	.pads_cnt	= ARRAY_SIZE(serial2_pads),

};



static struct omap_board_data serial3_data = {

static struct omap_board_data serial3_data __initdata = {

	.id		= 2,

	.pads		= serial3_pads,

	.pads_cnt	= ARRAY_SIZE(serial3_pads),

};



static struct omap_board_data serial4_data = {

static struct omap_board_data serial4_data __initdata = {

	.id		= 3,

	.pads		= serial4_pads,

	.pads_cnt	= ARRAY_SIZE(serial4_pads),
@@ -729,7 +730,7 @@ static void __init omap_4430sdp_init(void) 


	if (omap_rev() == OMAP4430_REV_ES1_0)

		package = OMAP_PACKAGE_CBL;

	omap4_mux_init(board_mux, package);

	omap4_mux_init(board_mux, NULL, package);



	omap_board_config = sdp4430_config;

	omap_board_config_size = ARRAY_SIZE(sdp4430_config);

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

+1 −1
Original line number Diff line number Diff line
@@ -27,13 +27,13 @@ 
#include <linux/err.h>

#include <linux/clk.h>

#include <linux/smc91x.h>

#include <linux/gpio.h>



#include <mach/hardware.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/flash.h>



#include <mach/gpio.h>

#include <plat/led.h>

#include <plat/usb.h>

#include <plat/board.h>