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

Commit 17282b98 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'omap-fixes-for-linus' of... 

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

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (39 commits)
  omap: delete unused bootloader tag variables
  omap: Devkit8000: Remove unused pins
  omap: Devkit8000: Change position of init calls
  omap: Devkit8000: Remove unnecessary include file
  omap: Devkit8000: Fix typo in pin name
  omap: Devkit8000: Add missing package selection
  omap: Devkit8000: Fix typo in supplies
  n8x0_defconfig: remove CONFIG_NILFS2_FS override
  omap: board-sdp-flash.c: Fix typos in debug output
  omap4: Fix McBSP4 base address
  omap: rx51_defconfig: Remove CONFIG_SYSFS_DEPRECATED*=y options
  omap: rx51_defconfig: Remove duplicate phonet
  omap: fix a gpmc nand problem
  AM3517: initialize i2c subsystem after mux subsystem
  omap: remove one of the define of INT_34XX_BENCH_MPU_EMUL
  omap: fix the compile error if CONFIG_MTD_NAND_OMAP2 is notenabled
  OMAP4: Clocks: Change SPI Instance Names
  omap: Devkit8000: Fix wrong usb port on Devkit8000
  OMAP4: Fix for CONTROL register Base
  OMAP4-HSMMC: FIX for MMC5 Controller IRQ Base
  ...
parents 58927533 223e632c

arch/arm/configs/n8x0_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -1058,7 +1058,6 @@ CONFIG_JFFS2_CMODE_PRIORITY=y 
# CONFIG_ROMFS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

# CONFIG_NILFS2_FS is not set

CONFIG_NETWORK_FILESYSTEMS=y

# CONFIG_NFS_FS is not set

# CONFIG_NFSD is not set

arch/arm/configs/omap_zoom2_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ CONFIG_DEVKMEM=y 
CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=32

CONFIG_SERIAL_8250_RUNTIME_UARTS=4

CONFIG_SERIAL_8250_RUNTIME_UARTS=1

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_MANY_PORTS=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

arch/arm/configs/omap_zoom3_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ CONFIG_DEVKMEM=y 
CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=32

CONFIG_SERIAL_8250_RUNTIME_UARTS=4

CONFIG_SERIAL_8250_RUNTIME_UARTS=1

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_MANY_PORTS=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

arch/arm/configs/rx51_defconfig

+0 −3
Original line number Diff line number Diff line
@@ -59,8 +59,6 @@ CONFIG_FAIR_GROUP_SCHED=y 
CONFIG_USER_SCHED=y

# CONFIG_CGROUP_SCHED is not set

# CONFIG_CGROUPS is not set

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

# CONFIG_RELAY is not set

# CONFIG_NAMESPACES is not set

CONFIG_BLK_DEV_INITRD=y
@@ -480,7 +478,6 @@ CONFIG_BT_HIDP=m 
# CONFIG_BT_HCIBFUSB is not set

# CONFIG_BT_HCIVHCI is not set

# CONFIG_AF_RXRPC is not set

# CONFIG_PHONET is not set

CONFIG_WIRELESS=y

CONFIG_CFG80211=y

# CONFIG_CFG80211_REG_DEBUG is not set

arch/arm/mach-omap1/timer32k.c

+0 −15
Original line number Diff line number Diff line
@@ -68,12 +68,6 @@ struct sys_timer omap_timer; 
 * ---------------------------------------------------------------------------

 */



#if defined(CONFIG_ARCH_OMAP16XX)

#define TIMER_32K_SYNCHRONIZED		0xfffbc410

#else

#error OMAP 32KHz timer does not currently work on 15XX!

#endif



/* 16xx specific defines */

#define OMAP1_32K_TIMER_BASE		0xfffb9000

#define OMAP1_32K_TIMER_CR		0x08
@@ -150,15 +144,6 @@ static struct clock_event_device clockevent_32k_timer = { 
	.set_mode	= omap_32k_timer_set_mode,

};



/*

 * The 32KHz synchronized timer is an additional timer on 16xx.

 * It is always running.

 */

static inline unsigned long omap_32k_sync_timer_read(void)

{

	return omap_readl(TIMER_32K_SYNCHRONIZED);

}



static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id)

{

	struct clock_event_device *evt = &clockevent_32k_timer;