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

Commit 269f6a93 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'fixes-non-critical-part2' of... 

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

* 'fixes-non-critical-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP3+: PM: VP: fix integer truncation error
  ARM: OMAP2+: PM: fix wakeupgen warning when hotplug disabled
  ARM: OMAP2+: PM: fix section mismatch with omap2_init_processor_devices()
  ARM: OMAP2: Fix section warning for n8x0 when CONFIG_MMC_OMAP is not set
  ARM: OMAP2+: Fix omap24xx_io_desc warning if SoC subtypes are not selected
  ARM: OMAP1: Fix section mismatch for omap1_init_early()
  ARM: OMAP1: Fix typo in lcd_dma.c
  ARM: OMAP: mailbox: trivial whitespace fix
  ARM: OMAP: Remove definition cpu_is_omap4430()
  ARM: OMAP2+: included some headers twice
  ARM: OMAP: clock.c: included linux/debugfs.h twice
  ARM: OMAP: don't build hwspinlock in vain
  ARM: OMAP2+: ads7846_init: put gpio_pendown into pdata if it's provided
  ARM: omap: pandora: fix usbhs platform data
  ARM: OMAP: sram: Add am33xx SRAM support (minimal)
  ARM: OMAP2+: id: Add am33xx SoC type detection
  ARM: OMAP2+: GPMC: Export gpmc_enable_hwecc and gpmc_calculate_ecc
  ARM: OMAP: dmtimer: fix missing content/correction in low-power mode support
parents 412fe6b3 3223d007

arch/arm/mach-omap1/io.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ void __init omap16xx_map_io(void) 
/*

 * Common low-level hardware init for omap1.

 */

void omap1_init_early(void)

void __init omap1_init_early(void)

{

	omap_check_revision();

arch/arm/mach-omap1/lcd_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ EXPORT_SYMBOL(omap_set_lcd_dma_b1_mirror); 
void omap_set_lcd_dma_b1_vxres(unsigned long vxres)

{

	if (cpu_is_omap15xx()) {

		printk(KERN_ERR "DMA virtual resulotion is not supported "

		printk(KERN_ERR "DMA virtual resolution is not supported "

				"in 1510 mode\n");

		BUG();

	}

arch/arm/mach-omap2/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -265,6 +265,8 @@ obj-y += $(smc91x-m) $(smc91x-y) 


smsc911x-$(CONFIG_SMSC911X)		:= gpmc-smsc911x.o

obj-y					+= $(smsc911x-m) $(smsc911x-y)

obj-$(CONFIG_ARCH_OMAP4)		+= hwspinlock.o

ifneq ($(CONFIG_HWSPINLOCK_OMAP),)

obj-y					+= hwspinlock.o

endif



obj-y					+= common-board-devices.o twl-common.o

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

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/io.h>

#include <linux/smsc911x.h>

#include <linux/mmc/host.h>

#include <linux/gpio.h>



#include <mach/hardware.h>

#include <asm/mach-types.h>

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

+4 −4
Original line number Diff line number Diff line
@@ -36,10 +36,6 @@ 


#include "mux.h"



static int slot1_cover_open;

static int slot2_cover_open;

static struct device *mmc_device;



#define TUSB6010_ASYNC_CS	1

#define TUSB6010_SYNC_CS	4

#define TUSB6010_GPIO_INT	58
@@ -211,6 +207,10 @@ static struct omap_onenand_platform_data board_onenand_data[] = { 
#define N810_EMMC_VSD_GPIO	23

#define N810_EMMC_VIO_GPIO	9



static int slot1_cover_open;

static int slot2_cover_open;

static struct device *mmc_device;



static int n8x0_mmc_switch_slot(struct device *dev, int slot)

{

#ifdef CONFIG_MMC_DEBUG