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

Commit 7063c88c authored by Russell King's avatar Russell King Committed by Russell King
Browse files

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

parents f4b9a988 4177662e

arch/arm/configs/rx51_defconfig

+4 −3
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ CONFIG_ALIGNMENT_TRAP=y 
#

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="init=/sbin/preinit ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs rootflags=bulk_read,no_chk_data_crc rw console=ttyMTD,log console=tty0"

CONFIG_CMDLINE="init=/sbin/preinit ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs rootflags=bulk_read,no_chk_data_crc rw console=ttyMTD,log console=tty0 console=ttyS2,115200n8"

# CONFIG_XIP_KERNEL is not set

# CONFIG_KEXEC is not set
@@ -1354,7 +1354,7 @@ CONFIG_USB_OTG_UTILS=y 
# CONFIG_USB_GPIO_VBUS is not set

# CONFIG_ISP1301_OMAP is not set

CONFIG_TWL4030_USB=y

CONFIG_MMC=m

CONFIG_MMC=y

# CONFIG_MMC_DEBUG is not set

# CONFIG_MMC_UNSAFE_RESUME is not set
@@ -1449,7 +1449,8 @@ CONFIG_RTC_DRV_TWL4030=m 
# on-CPU RTC drivers

#

# CONFIG_DMADEVICES is not set

# CONFIG_REGULATOR is not set

CONFIG_REGULATOR=y

CONFIG_REGULATOR_TWL4030=y

# CONFIG_UIO is not set

# CONFIG_STAGING is not set

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

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static struct platform_device overo_smsc911x_device = { 
	.name		= "smsc911x",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(overo_smsc911x_resources),

	.resource	= &overo_smsc911x_resources,

	.resource	= overo_smsc911x_resources,

	.dev		= {

		.platform_data = &overo_smsc911x_config,

	},

arch/arm/mach-omap2/board-rx51-peripherals.c

+5 −0
Original line number Diff line number Diff line
@@ -278,6 +278,10 @@ static struct twl4030_gpio_platform_data rx51_gpio_data = { 
	.setup			= rx51_twlgpio_setup,

};



static struct twl4030_usb_data rx51_usb_data = {

	.usb_mode		= T2_USB_MODE_ULPI,

};



static struct twl4030_platform_data rx51_twldata = {

	.irq_base		= TWL4030_IRQ_BASE,

	.irq_end		= TWL4030_IRQ_END,
@@ -286,6 +290,7 @@ static struct twl4030_platform_data rx51_twldata = { 
	.gpio			= &rx51_gpio_data,

	.keypad			= &rx51_kp_data,

	.madc			= &rx51_madc_data,

	.usb			= &rx51_usb_data,



	.vaux1			= &rx51_vaux1,

	.vaux2			= &rx51_vaux2,

arch/arm/mach-omap2/mmc-twl4030.c

+6 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ static int twl_mmc_late_init(struct device *dev) 
				if (i != 0)

					break;

				ret = PTR_ERR(reg);

				hsmmc[i].vcc = NULL;

				goto err;

			}

			hsmmc[i].vcc = reg;
@@ -165,8 +166,13 @@ static int twl_mmc_late_init(struct device *dev) 
static void twl_mmc_cleanup(struct device *dev)

{

	struct omap_mmc_platform_data *mmc = dev->platform_data;

	int i;



	gpio_free(mmc->slots[0].switch_pin);

	for(i = 0; i < ARRAY_SIZE(hsmmc); i++) {

		regulator_put(hsmmc[i].vcc);

		regulator_put(hsmmc[i].vcc_aux);

	}

}



#ifdef CONFIG_PM

arch/arm/plat-omap/dma.c

+3 −1
Original line number Diff line number Diff line
@@ -946,7 +946,9 @@ void omap_start_dma(int lch) 


			cur_lch = next_lch;

		} while (next_lch != -1);

	} else if (cpu_class_is_omap2()) {

	} else if (cpu_is_omap242x() ||

		(cpu_is_omap243x() &&  omap_type() <= OMAP2430_REV_ES1_0)) {



		/* Errata: Need to write lch even if not using chaining */

		dma_write(lch, CLNK_CTRL(lch));

	}