linux/arch/arm
Linus Torvalds 99bece775f Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c changes from Wolfram Sang:

 - an arbitration driver.  While the driver is quite simple, it caused
   discussion if we need additional arbitration on top of the one
   specified in the I2C standard.  Conclusion is that I accept a few
   generic mechanisms, but not very specific ones.

 - the core lost the detach_adapter() call.  It has no users anymore and
   was in the way for other cleanups.  attach_adapter() is sadly still
   there since there are users waiting to be converted.

 - the core gained a bus recovery infrastructure.  I2C defines a way to
   recover if the data line is stalled.  This mechanism is now in the
   core and drivers can now pass some data to make use of it.

 - bigger driver cleanups for designware, s3c2410

 - removing superfluous refcounting from drivers

 - removing Ben Dooks as second maintainer due to inactivity.  Thanks
   for all your work so far, Ben!

 - bugfixes, feature additions, devicetree fixups, simplifications...

* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (38 commits)
  i2c: xiic: must always write 16-bit words to TX_FIFO
  i2c: octeon: use HZ in timeout value
  i2c: octeon: Fix i2c fail problem when a process is terminated by a signal
  i2c: designware-pci: drop superfluous {get|put}_device
  i2c: designware-plat: drop superfluous {get|put}_device
  i2c: davinci: drop superfluous {get|put}_device
  MAINTAINERS: Ben Dooks is inactive regarding I2C
  i2c: mux: Add i2c-arb-gpio-challenge 'mux' driver
  i2c: at91: convert to dma_request_slave_channel_compat()
  i2c: mxs: do error checking and handling in PIO mode
  i2c: mxs: remove races in PIO code
  i2c-designware: switch to use runtime PM autosuspend
  i2c-designware: use usleep_range() in the busy-loop
  i2c-designware: enable/disable the controller properly
  i2c-designware: use dynamic adapter numbering on Lynxpoint
  i2c-designware-pci: use managed functions pcim_* and devm_*
  i2c-designware-pci: use dev_err() instead of printk()
  i2c-designware: move to managed functions (devm_*)
  i2c: remove CONFIG_HOTPLUG ifdefs
  i2c: s3c2410: Add SMBus emulation for block read
  ...
2013-05-02 14:38:53 -07:00
..
boot ARM: arm-soc platform updates for 3.10, part 1 2013-05-02 09:31:45 -07:00
common ARM: GIC: fix GIC cpumask initialization 2013-02-08 10:17:22 +00:00
configs ARM: arm-soc multiplatform updates for 3.10 2013-05-02 09:38:16 -07:00
crypto
include ARM: arm-soc multiplatform updates for 3.10 2013-05-02 09:38:16 -07:00
kernel ARM: arm-soc cleanup for 3.10 2013-05-02 09:03:55 -07:00
kvm Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2013-04-30 09:36:50 -07:00
lib ARM: 7685/1: delay: use private ticks_per_jiffy field for timer-based delay ops 2013-04-03 16:45:50 +01:00
mach-at91 ARM: arm-soc platform updates for 3.10, part 1 2013-05-02 09:31:45 -07:00
mach-bcm ARM: bcm281xx: Add timer driver (driver portion) 2013-03-28 10:58:55 -07:00
mach-bcm2835 ARM: bcm2835: convert to multi-platform 2013-03-12 22:30:45 -06:00
mach-clps711x The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-cns3xxx ARM: arm-soc multiplatform updates for 3.10 2013-05-02 09:38:16 -07:00
mach-davinci ARM: arm-soc platform updates for 3.10, part 1 2013-05-02 09:31:45 -07:00
mach-dove arm-soc: mvebu platform changes 2013-02-28 20:09:24 -08:00
mach-ebsa110 The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-ep93xx ARM: ep93xx: Fix wait for UART FIFO to be empty 2013-03-18 09:40:38 +11:00
mach-exynos ARM: arm-soc multiplatform updates for 3.10 2013-05-02 09:38:16 -07:00
mach-footbridge ARM: fix CONFIG_VIRT_TO_BUS handling 2013-03-18 13:49:57 +00:00
mach-gemini ARM: arm-soc cleanup for 3.10 2013-05-02 09:03:55 -07:00
mach-highbank ARM: arm-soc multiplatform updates for 3.10 2013-05-02 09:38:16 -07:00
mach-imx ARM: arm-soc multiplatform updates for 3.10 2013-05-02 09:38:16 -07:00
mach-integrator cpufreq: integrator: move cpufreq driver to drivers/cpufreq 2013-04-08 13:02:31 +02:00
mach-iop13xx Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-iop32x The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-iop33x The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-ixp4xx arm: Use generic idle loop 2013-04-08 17:39:24 +02:00
mach-kirkwood ARM: arm-soc device-tree updates for 3.10, part 1 2013-05-02 09:28:03 -07:00
mach-ks8695 Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-lpc32xx The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-mmp usb: patches for v3.10 merge window 2013-04-05 15:18:00 -07:00
mach-msm ARM: arm-soc multiplatform updates for 3.10 2013-05-02 09:38:16 -07:00
mach-mv78xx0 Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-mvebu Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2013-04-30 09:36:50 -07:00
mach-mxs ARM: arm-soc multiplatform updates for 3.10 2013-05-02 09:38:16 -07:00
mach-netx ARM: 7642/1: netx: bump IRQ offset to 64 2013-03-03 22:54:11 +00:00
mach-nomadik clocksource: nomadik-mtu: fix up clocksource/timer 2013-04-26 17:10:46 -07:00
mach-omap1 ARM: arm-soc cleanup for 3.10 2013-05-02 09:03:55 -07:00
mach-omap2 ARM: arm-soc multiplatform updates for 3.10 2013-05-02 09:38:16 -07:00
mach-orion5x ARM: arm-soc cleanup for 3.10 2013-05-02 09:03:55 -07:00
mach-picoxcell
mach-prima2 ARM: arm-soc multiplatform updates for 3.10 2013-05-02 09:38:16 -07:00
mach-pxa cpufreq: pxa2xx: move cpufreq driver to drivers/cpufreq 2013-04-08 13:02:31 +02:00
mach-realview ARM: Push selects for TWD/SCU into machine entries 2013-04-09 21:30:24 +02:00
mach-rpc The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-s3c24xx Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 2013-05-02 14:38:53 -07:00
mach-s3c64xx ARM: arm-soc multiplatform updates for 3.10 2013-05-02 09:38:16 -07:00
mach-s5p64x0 ARM: exynos: move debug-macro.S to include/debug/ 2013-04-19 13:51:21 +02:00
mach-s5pc100 ARM: arm-soc multiplatform updates for 3.10 2013-05-02 09:38:16 -07:00
mach-s5pv210 ARM: arm-soc multiplatform updates for 3.10 2013-05-02 09:38:16 -07:00
mach-sa1100 cpufreq: sa11x0: move cpufreq driver to drivers/cpufreq 2013-04-10 13:19:24 +02:00
mach-shark arm: Use generic idle loop 2013-04-08 17:39:24 +02:00
mach-shmobile ARM: arm-soc platform updates for 3.10, part 1 2013-05-02 09:31:45 -07:00
mach-socfpga Merge branch 'gic/cleanup' into next/soc 2013-04-28 15:06:56 -07:00
mach-spear ARM: arm-soc multiplatform updates for 3.10 2013-05-02 09:38:16 -07:00
mach-sunxi ARM: sunxi: Rework the restart code 2013-04-08 21:43:08 +02:00
mach-tegra Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 2013-05-02 14:38:53 -07:00
mach-u300 ARM: u300: fix ages old copy/paste bug 2013-04-26 17:07:38 -07:00
mach-ux500 ARM: arm-soc multiplatform updates for 3.10 2013-05-02 09:38:16 -07:00
mach-versatile Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-vexpress ARM: arm-soc multiplatform updates for 3.10 2013-05-02 09:38:16 -07:00
mach-virt irqchip: gic: Perform the gic_secondary_init() call via CPU notifier 2013-03-26 16:12:02 +00:00
mach-vt8500 arm-soc: soc-specific updates 2013-02-21 15:27:22 -08:00
mach-w90x900 arm: Use generic idle loop 2013-04-08 17:39:24 +02:00
mach-zynq ARM: Push selects for TWD/SCU into machine entries 2013-04-09 21:30:24 +02:00
mm mm/ARM: use free_highmem_page() to free highmem pages into buddy system 2013-04-29 15:54:31 -07:00
net filter: bpf_jit_comp: refactor and unify BPF JIT image dump output 2013-03-21 17:25:56 -04:00
nwfpe
oprofile
plat-iop
plat-omap arm-soc: late OMAP changes 2013-02-28 20:00:40 -08:00
plat-orion ARM: arm-soc cleanup for 3.10 2013-05-02 09:03:55 -07:00
plat-pxa
plat-samsung Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 2013-05-02 14:38:53 -07:00
plat-versatile irqchip: gic: Perform the gic_secondary_init() call via CPU notifier 2013-03-26 16:12:02 +00:00
tools
vfp ARM: Fix broken commit 0cc41e4a21 corrupting kernel messages 2013-03-01 21:09:59 +00:00
xen xen: implement updated XENMEM_add_to_physmap_range ABI 2013-02-19 22:01:55 -05:00
Kconfig ARM: arm-soc multiplatform updates for 3.10 2013-05-02 09:38:16 -07:00
Kconfig-nommu
Kconfig.debug Merge branch 'samsung/exynos-multiplatform' into next/multiplatform 2013-04-19 14:33:09 +02:00
Makefile ARM: arm-soc multiplatform updates for 3.10 2013-05-02 09:38:16 -07:00