1. 25 May, 2007 36 commits
  2. 24 May, 2007 4 commits
    • Tony Lindgren's avatar
      Merge omap-drivers · 82ce7131
      Tony Lindgren authored
      Merge branches 'master' and 'omap-drivers'
      
      Conflicts:
      
      	arch/arm/configs/omap_h2_1610_defconfig
      	arch/arm/configs/omap_osk_5912_defconfig
      	arch/arm/mach-omap1/board-h2.c
      	arch/arm/mach-omap1/board-palmte.c
      	arch/arm/mach-omap2/Kconfig
      	arch/arm/mach-omap2/Makefile
      	arch/arm/mach-omap2/board-2430sdp.c
      	arch/arm/mach-omap2/board-apollon-keys.c
      	arch/arm/mach-omap2/board-h4.c
      	arch/arm/mach-omap2/board-n800-audio.c
      	arch/arm/mach-omap2/board-n800-dsp.c
      	arch/arm/mach-omap2/board-n800-usb.c
      	arch/arm/mach-omap2/devices.c
      	arch/arm/mach-omap2/io.c
      	arch/arm/mach-omap2/pm.c
      	arch/arm/plat-omap/Makefile
      	arch/arm/plat-omap/dsp/dsp_common.c
      	drivers/Makefile
      	drivers/i2c/busses/i2c-omap.c
      	drivers/i2c/chips/Kconfig
      	drivers/i2c/chips/Makefile
      	drivers/i2c/chips/menelaus.c
      	drivers/i2c/chips/tlv320aic23.c
      	drivers/i2c/chips/twl4030_core.c
      	include/asm-arm/arch-omap/board-2430sdp.h
      	include/asm-arm/arch-omap/eac.h
      	include/asm-arm/arch-omap/gpio.h
      	include/asm-arm/arch-omap/mmc.h
      	include/asm-arm/arch-omap/omap24xx.h
      	include/asm-arm/arch-omap/onenand.h
      	include/asm-arm/arch-omap/pm.h
      	include/asm-arm/arch-omap/twl4030.h
      	include/asm-arm/hardware/tsc2101.h
      	include/linux/i2c-id.h
      	net/ipv4/netfilter/Kconfig
      82ce7131
    • Dirk Behme's avatar
      ARM: OMAP: Fix warning in lcdc.c · c575f796
      Dirk Behme authored
      Fix warning
      
      drivers/video/omap/lcdc.c:878: warning: initialization from
      incompatible pointer type
      Signed-off-by: default avatarDirk Behme <dirk.behme@gmail.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      c575f796
    • Syed Mohammed Khasim's avatar
      I2C: Add high-speed support to omap-i2c · c986de6e
      Syed Mohammed Khasim authored
      Omap2430 has additional support for high-speed I2C.
      
      This patch moves I2C speed parameter (from module) to platform data.
      Also added basic High Speed support based on I2C bus speed.
      
      This patch is tested for high speed I2C (with TWL4030 Keypad) and works as
      expected.
      Signed-off-by: default avatarSyed Mohammed Khasim  <x0khasim@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      c986de6e
    • Syed Mohammed, Khasim's avatar
      Formating changes for Basic OMAP2430 High speed I2C · 24d1e2bc
      Syed Mohammed, Khasim authored
      Resubmitting after incorporating review comments
      
      This patch contains the formatting changes.
      Signed-off-by: default avatarSyed Mohammed Khasim  <x0khasim@ti.com>
      
      Files:
       drivers/i2c/busses/i2c-omap.c
      =============================================================================
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      24d1e2bc