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

Commit 9c3936cb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (75 commits)
  omap3: Fix OMAP35XX_REV macros
  omap: serial: fix non-empty uart fifo read abort
  omap3: Zoom2/3: Update hsmmc board config params
  omap3 : Enable TWL4030 Keypad for Zoom2 and Zoom3 boards
  omap3: id code detection 3525 vs 3515
  omap3: rx51: Use wl1251 in SPI mode 3
  omap3: zoom2/3: make MMC slot work again
  omap1: htcherald: Update defconfig to include mux support
  omap1: LCD_DMA: Use some define rather than a hexadecimal
  omap: header: remove unused data-type
  omap: arch/arm/plat-omap/devices.c - sort alphabetically
  omap: Correcting GPMC_CONFIG1_DEVICETYPE_NAND
  OMAP3: serial - allow platforms specify which UARTs to initialize
  omap3: cm-t35: add mux initialization
  OMAP4: Sync up omap4430 defconfig
  OMAP4: Remove the secondary wait loop
  OMAP4: AuxCoreBoot registers only accessible in secure mode
  OMAP4: Fix SRAM base and size
  OMAP4: Fix cpu detection
  omap3: pandora: board file updates for .33
  ...
parents 5de76b18 5ccf1978

Documentation/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -1787,6 +1787,11 @@ and is between 256 and 4096 characters. It is defined in the file 
			waiting for the ACK, so if this is set too high

			interrupts *may* be lost!



	omap_mux=	[OMAP] Override bootloader pin multiplexing.

			Format: <mux_mode0.mode_name=value>...

			For example, to override I2C bus2:

			omap_mux=i2c2_scl.i2c2_scl=0x100,i2c2_sda.i2c2_sda=0x100



	opl3=		[HW,OSS]

			Format: <io>

arch/arm/configs/htcherald_defconfig

+6 −3
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.32-rc6

# Sat Nov 14 10:56:01 2009

# Linux kernel version: 2.6.32-rc8

# Sat Dec  5 12:16:24 2009

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -198,7 +198,9 @@ CONFIG_ARCH_OMAP1=y 
# OMAP Feature Selections

#

# CONFIG_OMAP_RESET_CLOCKS is not set

# CONFIG_OMAP_MUX is not set

CONFIG_OMAP_MUX=y

# CONFIG_OMAP_MUX_DEBUG is not set

CONFIG_OMAP_MUX_WARNINGS=y

CONFIG_OMAP_MCBSP=y

# CONFIG_OMAP_MBOX_FWK is not set

CONFIG_OMAP_MPU_TIMER=y
@@ -207,6 +209,7 @@ CONFIG_OMAP_LL_DEBUG_UART1=y 
# CONFIG_OMAP_LL_DEBUG_UART2 is not set

# CONFIG_OMAP_LL_DEBUG_UART3 is not set

# CONFIG_OMAP_LL_DEBUG_NONE is not set

CONFIG_OMAP_SERIAL_WAKE=y

# CONFIG_OMAP_PM_NONE is not set

CONFIG_OMAP_PM_NOOP=y