1
0
Fork 0
alistair23-linux/arch/arm/mach-omap1
Linus Torvalds 13509c3a9d Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c changes from Wolfram Sang:
 - new drivers for exynos5, bcm kona, and st micro
 - bigger overhauls for drivers mxs and rcar
 - typical driver bugfixes, cleanups, improvements
 - got rid of the superfluous 'driver' member in i2c_client struct This
   touches a few drivers in other subsystems.  All acked.

* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (38 commits)
  i2c: bcm-kona: fix error return code in bcm_kona_i2c_probe()
  i2c: i2c-eg20t: do not print error message in syslog if no ACK received
  i2c: bcm-kona: Introduce Broadcom I2C Driver
  i2c: cbus-gpio: Fix device tree binding
  i2c: wmt: add missing clk_disable_unprepare() on error
  i2c: designware: add new ACPI IDs
  i2c: i801: Add Device IDs for Intel Wildcat Point-LP PCH
  i2c: exynos5: Remove incorrect clk_disable_unprepare
  i2c: i2c-st: Add ST I2C controller
  i2c: exynos5: add High Speed I2C controller driver
  i2c: rcar: fixup rcar type naming
  i2c: scmi: remove some bogus NULL checks
  i2c: sh_mobile & rcar: Enable the driver on all ARM platforms
  i2c: sh_mobile: Convert to clk_prepare/unprepare
  i2c: mux: gpio: use reg value for i2c_add_mux_adapter
  i2c: mux: gpio: use gpio_set_value_cansleep()
  i2c: Include linux/of.h header
  i2c: mxs: Fix PIO mode on i.MX23
  i2c: mxs: Rework the PIO mode operation
  i2c: mxs: distinguish i.MX23 and i.MX28 based I2C controller
  ...
2013-11-18 15:50:07 -08:00
..
include/mach ARM: DRA7: id: Add cpu detection support for DRA7xx based SoCs' 2013-08-13 16:58:08 +05:30
Kconfig ARM: OMAP1: remove "config MACH_OMAP_HTCWIZARD" 2013-04-01 08:52:27 -07:00
Makefile mailbox/omap: move the OMAP mailbox framework to drivers 2013-06-11 11:41:51 -05:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
ams-delta-fiq-handler.S ARM: OMAP1: Move board-ams-delta.h from plat to mach 2012-09-20 15:02:19 -07:00
ams-delta-fiq.c ARM: OMAP1: Move board-ams-delta.h from plat to mach 2012-09-20 15:02:19 -07:00
board-ams-delta.c Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
board-fsample.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-generic.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-h2-mmc.c ARM: OMAP: Split plat/mmc.h into local headers and platform_data 2012-10-15 12:09:43 -07:00
board-h2.c ARM: OMAP1: Remove legacy irda.h and irda setup from board files 2013-06-18 00:12:34 -07:00
board-h2.h
board-h3-mmc.c ARM: OMAP: Split plat/mmc.h into local headers and platform_data 2012-10-15 12:09:43 -07:00
board-h3.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-h3.h ARM: OMAP: No need to include board-h3.h from hardware.h 2009-03-23 18:07:33 -07:00
board-htcherald.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-innovator.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-nand.c ARM: OMAP1: board files: deduplicate and clean some NAND-related code 2012-04-13 06:34:31 -06:00
board-nokia770.c ARM: OMAP1: nokia770: enable Tahvo 2013-06-18 03:12:13 -07:00
board-osk.c misc: (at24) move header to linux/platform_data/ 2013-09-30 06:02:34 +02:00
board-palmte.c ARM: OMAP1: Remove legacy irda.h and irda setup from board files 2013-06-18 00:12:34 -07:00
board-palmtt.c ARM: OMAP1: Remove legacy irda.h and irda setup from board files 2013-06-18 00:12:34 -07:00
board-palmz71.c ARM: OMAP1: Remove legacy irda.h and irda setup from board files 2013-06-18 00:12:34 -07:00
board-perseus2.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-sx1-mmc.c ARM: OMAP: Split plat/mmc.h into local headers and platform_data 2012-10-15 12:09:43 -07:00
board-sx1.c ARM: OMAP1: Remove legacy irda.h and irda setup from board files 2013-06-18 00:12:34 -07:00
board-voiceblue.c reboot: arm: change reboot_mode to use enum reboot_mode 2013-07-09 10:33:29 -07:00
clock.c ARM: OMAP: Split sram.h to local headers and minimal shared header 2012-10-31 10:14:13 -07:00
clock.h ARM: OMAP: clock: split plat/clkdev_omap.h into OMAP1/2 files 2012-10-18 16:23:30 -07:00
clock_data.c ARM: OMAP1: fix USB host on 1710 2013-03-13 04:10:57 -06:00
common.h ARM: mach-omap1: Fix omap1510_fpga_init_irq() implicit declarations. 2013-10-08 11:04:22 -07:00
devices.c ARM: OMAP1: Remove duplicated DMA channel definitions 2013-06-18 00:12:34 -07:00
dma.c ARM: OMAP1: Remove dma.h 2013-06-18 00:12:34 -07:00
fb.c ARM: OMAP: Split fb.c to remove last remaining cpu_is_omap usage 2012-12-17 10:50:40 -08:00
flash.c ARM: OMAP1: Move plat/tc.h to mach/tc.h for omap1 2012-10-17 11:36:40 -07:00
fpga.c ARM: OMAP: remove deprecated IRQF_DISABLED 2013-10-03 13:24:36 -07:00
fpga.h ARM: OMAP: Fix relative includes for fpga.h 2012-10-31 15:37:14 -07:00
gpio7xx.c ARM: OMAP1: Fix a bunch of GPIO related section warnings after initdata got corrected 2013-10-18 10:50:51 -07:00
gpio15xx.c ARM: OMAP1: Fix a bunch of GPIO related section warnings after initdata got corrected 2013-10-18 10:50:51 -07:00
gpio16xx.c ARM: OMAP1: Fix a bunch of GPIO related section warnings after initdata got corrected 2013-10-18 10:50:51 -07:00
i2c.c ARM: OMAP: Fix i2c cmdline initcall for multiplatform 2013-01-11 11:24:19 -08:00
id.c ARM: OMAP: Split plat/cpu.h into local soc.h for mach-omap1 and mach-omap2 2012-10-18 16:23:46 -07:00
io.c ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h 2012-11-30 08:41:50 -08:00
iomap.h ARM: OMAP1: Remove relative includes 2012-10-31 15:37:14 -07:00
irq.c ARM: OMAP: Split plat/cpu.h into local soc.h for mach-omap1 and mach-omap2 2012-10-18 16:23:46 -07:00
lcd_dma.c ARM: OMAP1: Remove dma.h 2013-06-18 00:12:34 -07:00
mcbsp.c ARM: OMAP1: Remove McBSP DMA channel definitions 2013-06-18 00:12:34 -07:00
mmc.h ARM: OMAP: Split plat/mmc.h into local headers and platform_data 2012-10-15 12:09:43 -07:00
mux.c ARM: OMAP1: Make plat/mux.h omap1 only 2012-09-20 14:54:57 -07:00
ocpi.c ARM: OMAP1: OCPI: move to mach-omap1/ 2012-04-13 06:34:27 -06:00
opp.h ARM: OMAP1: Move dpll1 rates selection from config to runtime 2011-12-08 18:02:23 -08:00
opp_data.c ARM: OMAP: clock: split plat/clkdev_omap.h into OMAP1/2 files 2012-10-18 16:23:30 -07:00
pm.c ARM: OMAP: remove deprecated IRQF_DISABLED 2013-10-03 13:24:36 -07:00
pm.h ARM: 6649/1: omap: use fncpy to copy the PM code functions to SRAM 2011-02-04 14:26:08 +00:00
pm_bus.c ARM: OMAP1: fix build breakage introduced by commit 25c7d49ed4 2012-10-26 13:19:06 -06:00
reset.c reboot: arm: change reboot_mode to use enum reboot_mode 2013-07-09 10:33:29 -07:00
serial.c ARM: OMAP: Make plat/fpga.h local to arch/arm/plat-omap 2012-10-17 11:36:37 -07:00
sleep.S ARM: OMAP1: Remove relative includes 2012-10-31 15:37:14 -07:00
soc.h ARM: OMAP1: Remove relative includes 2012-10-31 15:37:14 -07:00
sram-init.c ARM: OMAP: Move omap1 specific code to local sram.c 2012-10-31 10:14:14 -07:00
sram.S ARM: OMAP: Remove remaining includes for mach/io.h 2012-03-06 21:34:38 -06:00
sram.h ARM: OMAP: Split sram.h to local headers and minimal shared header 2012-10-31 10:14:13 -07:00
time.c ARM: OMAP: remove deprecated IRQF_DISABLED 2013-10-03 13:24:36 -07:00
timer.c ARM: OMAP: Add platform data header for DMTIMERs 2012-11-16 10:35:08 -06:00
timer32k.c ARM: OMAP: remove deprecated IRQF_DISABLED 2013-10-03 13:24:36 -07:00
usb.c ARM: OMAP1: fix omap_udc registration 2013-04-08 13:59:51 -07:00