Commit 75ea6358 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus/2639/i2c-2' of git://git.fluff.org/bjdooks/linux 

* 'for-linus/2639/i2c-2' of git://git.fluff.org/bjdooks/linux:
  i2c-pxa2xx: Don't clear isr bits too early
  i2c-pxa2xx: Fix register offsets
  i2c-pxa2xx: pass of_node from platform driver to adapter and publish
  i2c-pxa2xx: check timeout correctly
  i2c-pxa2xx: add support for shared IRQ handler
  i2c-pxa2xx: Add PCI support for PXA I2C controller
  ARM: pxa2xx: reorganize I2C files
  i2c-pxa2xx: use dynamic register layout
  i2c-mxs: set controller to pio queue mode after reset
  i2c-eg20t: support new device OKI SEMICONDUCTOR ML7213 IOH
  i2c/busses: Add support for Diolan U2C-12 USB-I2C adapter
parents 14577beb 97491ba3

Documentation/i2c/busses/i2c-diolan-u2c

0 → 100644
+26 −0
Original line number Diff line number Diff line 
Kernel driver i2c-diolan-u2c



Supported adapters:

  * Diolan U2C-12 I2C-USB adapter

    Documentation:

	http://www.diolan.com/i2c/u2c12.html



Author: Guenter Roeck <guenter.roeck@ericsson.com>



Description

-----------



This is the driver for the Diolan U2C-12 USB-I2C adapter.



The Diolan U2C-12 I2C-USB Adapter provides a low cost solution to connect

a computer to I2C slave devices using a USB interface. It also supports

connectivity to SPI devices.



This driver only supports the I2C interface of U2C-12. The driver does not use

interrupts.





Module parameters

-----------------



* frequency: I2C bus frequency

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -2138,6 +2138,12 @@ F: Documentation/serial/digiepca.txt 
F:	drivers/char/epca*

F:	drivers/char/digi*



DIOLAN U2C-12 I2C DRIVER

M:	Guenter Roeck <guenter.roeck@ericsson.com>

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	drivers/i2c/busses/i2c-diolan-u2c.c



DIRECTORY NOTIFICATION (DNOTIFY)

M:	Eric Paris <eparis@parisplace.org>

S:	Maintained

arch/arm/mach-mmp/include/mach/mmp2.h

+1 −1
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ extern void __init mmp2_init_irq(void); 
extern void mmp2_clear_pmic_int(void);



#include <linux/i2c.h>

#include <linux/i2c/pxa-i2c.h>

#include <mach/devices.h>

#include <plat/i2c.h>



extern struct pxa_device_desc mmp2_device_uart1;

extern struct pxa_device_desc mmp2_device_uart2;

arch/arm/mach-mmp/include/mach/pxa168.h

+1 −1
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ extern void __init pxa168_init_irq(void); 
extern void pxa168_clear_keypad_wakeup(void);



#include <linux/i2c.h>

#include <linux/i2c/pxa-i2c.h>

#include <mach/devices.h>

#include <plat/i2c.h>

#include <plat/pxa3xx_nand.h>

#include <video/pxa168fb.h>

#include <plat/pxa27x_keypad.h>

arch/arm/mach-mmp/include/mach/pxa910.h

+1 −1
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ extern struct sys_timer pxa910_timer; 
extern void __init pxa910_init_irq(void);



#include <linux/i2c.h>

#include <linux/i2c/pxa-i2c.h>

#include <mach/devices.h>

#include <plat/i2c.h>

#include <plat/pxa3xx_nand.h>



extern struct pxa_device_desc pxa910_device_uart1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE