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

Commit 5057bfaf 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: (214 commits)
  omap2: Initialize Menelaus and MMC for N8X0
  AM3517 EVM: correct typo - tca6416 mispelt as tca6516
  AM3517 EVM: Enable I2C support
  AM35x: Enable OMAP_MUX in defconfig
  AM35x: Add missing GPIO mux config for EHCI port
  Zoom3: Defconfig update
  omap: i2c: Fix muxing for command line enabled bus
  OMAP4: clock: Remove clock hacks from timer-gp.c
  OMAP4: clock: Add dummy clock nodes for interface clocks
  OMAP4: clock: Rename leaf clock nodes to end with a _ick or _fck
  OMAP2+ clock: revise omap2_clk_{disable,enable}()
  OMAP2/3 clock: combine OMAP2 & 3 boot-time MPU rate change code
  OMAP clockdomain: if no autodeps exist, don't try to add or remove them
  OMAP hwmod: add hwmod class support
  OMAP hwmod: convert header files with static allocations into C files
  OMAP hwmod: convert hwmod to use hardware clock names rather than clkdev dev+con
  OMAP clock: add omap_clk_get_by_name() for use by OMAP hwmod core code
  OMAP3: clock: add capability to change rate of dpll4_m5_ck_3630
  OMAP4 clock: drop the ALWAYS_ENABLED clock flag
  OMAP clock: drop RATE_FIXED clock flag
  ...
parents 6c0ad5df d702d121

arch/arm/configs/am3517_evm_defconfig

+41 −2
Original line number Original line Diff line number Diff line
@@ -201,7 +201,7 @@ CONFIG_ARCH_OMAP3=y 
# CONFIG_OMAP_DEBUG_POWERDOMAIN is not set

# CONFIG_OMAP_DEBUG_POWERDOMAIN is not set

# CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set

# CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set

CONFIG_OMAP_RESET_CLOCKS=y

CONFIG_OMAP_RESET_CLOCKS=y

# CONFIG_OMAP_MUX is not set

CONFIG_OMAP_MUX=y

# CONFIG_OMAP_MCBSP is not set

# CONFIG_OMAP_MCBSP is not set

# CONFIG_OMAP_MBOX_FWK is not set

# CONFIG_OMAP_MBOX_FWK is not set

# CONFIG_OMAP_MPU_TIMER is not set

# CONFIG_OMAP_MPU_TIMER is not set
@@ -590,7 +590,46 @@ CONFIG_HW_RANDOM=y 
# CONFIG_R3964 is not set

# CONFIG_R3964 is not set

# CONFIG_RAW_DRIVER is not set

# CONFIG_RAW_DRIVER is not set

# CONFIG_TCG_TPM is not set

# CONFIG_TCG_TPM is not set

# CONFIG_I2C is not set

CONFIG_I2C=y

CONFIG_I2C_BOARDINFO=y

CONFIG_I2C_COMPAT=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_HELPER_AUTO=y



#

# I2C Hardware Bus support

#



#

# I2C system bus drivers (mostly embedded / system-on-chip)

#

# CONFIG_I2C_DESIGNWARE is not set

# CONFIG_I2C_GPIO is not set

# CONFIG_I2C_OCORES is not set

CONFIG_I2C_OMAP=y

# CONFIG_I2C_SIMTEC is not set



#

# External I2C/SMBus adapter drivers

#

# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_TAOS_EVM is not set

# CONFIG_I2C_TINY_USB is not set



#

# Other I2C/SMBus bus drivers

#

# CONFIG_I2C_PCA_PLATFORM is not set

# CONFIG_I2C_STUB is not set



#

# Miscellaneous I2C Chip support

#

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_CHIP is not set

# CONFIG_SPI is not set

# CONFIG_SPI is not set





#

#

arch/arm/configs/devkit8000_defconfig

0 → 100644
+1889 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/igep0020_defconfig

+309 −216

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/omap3_defconfig

+143 −37

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/omap3_evm_defconfig

+4 −2
Original line number Original line Diff line number Diff line
@@ -187,6 +187,8 @@ CONFIG_ARCH_OMAP3=y 
#

#

# OMAP Feature Selections

# OMAP Feature Selections

#

#

CONFIG_OMAP_SMARTREFLEX=y

# CONFIG_OMAP_SMARTREFLEX_TESTING is not set

# CONFIG_OMAP_DEBUG_POWERDOMAIN is not set

# CONFIG_OMAP_DEBUG_POWERDOMAIN is not set

# CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set

# CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set

CONFIG_OMAP_RESET_CLOCKS=y

CONFIG_OMAP_RESET_CLOCKS=y
@@ -333,7 +335,7 @@ CONFIG_BINFMT_MISC=y 
# Power management options

# Power management options

#

#

CONFIG_PM=y

CONFIG_PM=y

# CONFIG_PM_DEBUG is not set

CONFIG_PM_DEBUG=y

CONFIG_PM_SLEEP=y

CONFIG_PM_SLEEP=y

CONFIG_SUSPEND=y

CONFIG_SUSPEND=y

CONFIG_SUSPEND_FREEZER=y

CONFIG_SUSPEND_FREEZER=y
@@ -1339,7 +1341,7 @@ CONFIG_ENABLE_MUST_CHECK=y 
CONFIG_FRAME_WARN=1024

CONFIG_FRAME_WARN=1024

CONFIG_MAGIC_SYSRQ=y

CONFIG_MAGIC_SYSRQ=y

# CONFIG_UNUSED_SYMBOLS is not set

# CONFIG_UNUSED_SYMBOLS is not set

# CONFIG_DEBUG_FS is not set

CONFIG_DEBUG_FS=y

# CONFIG_HEADERS_CHECK is not set

# CONFIG_HEADERS_CHECK is not set

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_KERNEL=y

# CONFIG_DEBUG_SHIRQ is not set

# CONFIG_DEBUG_SHIRQ is not set