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

Commit 5ccf1978 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'for-next' into omap-for-linus

parents 24ed45aa 435bb827

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