Merge branch 'for-linus/i2c-33' of git://git.fluff.org/bjdooks/linux
* 'for-linus/i2c-33' of git://git.fluff.org/bjdooks/linux: i2c-eg20t: Change-company-name-OKI-SEMICONDUCTOR to LAPIS Semiconductor i2c-eg20t: Support new device LAPIS Semiconductor ML7831 IOH i2c-eg20t: modified the setting of transfer rate. i2c-eg20t: use i2c_add_numbered_adapter to get a fixed bus number i2c: OMAP: Add DT support for i2c controller I2C: OMAP: NACK without STP I2C: OMAP: correct SYSC register offset for OMAP4
This commit is contained in:
Linus Torvalds
commit
aa303f2c06
|
|
@ -0,0 +1,30 @@
|
|||
I2C for OMAP platforms
|
||||
|
||||
Required properties :
|
||||
- compatible : Must be "ti,omap3-i2c" or "ti,omap4-i2c"
|
||||
- ti,hwmods : Must be "i2c<n>", n being the instance number (1-based)
|
||||
- #address-cells = <1>;
|
||||
- #size-cells = <0>;
|
||||
|
||||
Recommended properties :
|
||||
- clock-frequency : Desired I2C bus clock frequency in Hz. Otherwise
|
||||
the default 100 kHz frequency will be used.
|
||||
|
||||
Optional properties:
|
||||
- Child nodes conforming to i2c bus binding
|
||||
|
||||
Note: Current implementation will fetch base address, irq and dma
|
||||
from omap hwmod data base during device registration.
|
||||
Future plan is to migrate hwmod data base contents into device tree
|
||||
blob so that, all the required data will be used from device tree dts
|
||||
file.
|
||||
|
||||
Examples :
|
||||
|
||||
i2c1: i2c@0 {
|
||||
compatible = "ti,omap3-i2c";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
ti,hwmods = "i2c1";
|
||||
clock-frequency = <400000>;
|
||||
};
|
||||
|
|
@ -682,19 +682,19 @@ config I2C_XILINX
|
|||
will be called xilinx_i2c.
|
||||
|
||||
config I2C_EG20T
|
||||
tristate "Intel EG20T PCH / OKI SEMICONDUCTOR IOH(ML7213/ML7223)"
|
||||
tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) I2C"
|
||||
depends on PCI
|
||||
help
|
||||
This driver is for PCH(Platform controller Hub) I2C of EG20T which
|
||||
is an IOH(Input/Output Hub) for x86 embedded processor.
|
||||
This driver can access PCH I2C bus device.
|
||||
|
||||
This driver also can be used for OKI SEMICONDUCTOR IOH(Input/
|
||||
Output Hub), ML7213 and ML7223.
|
||||
ML7213 IOH is for IVI(In-Vehicle Infotainment) use and ML7223 IOH is
|
||||
for MP(Media Phone) use.
|
||||
ML7213/ML7223 is companion chip for Intel Atom E6xx series.
|
||||
ML7213/ML7223 is completely compatible for Intel EG20T PCH.
|
||||
This driver also can be used for LAPIS Semiconductor IOH(Input/
|
||||
Output Hub), ML7213, ML7223 and ML7831.
|
||||
ML7213 IOH is for IVI(In-Vehicle Infotainment) use, ML7223 IOH is
|
||||
for MP(Media Phone) use and ML7831 IOH is for general purpose use.
|
||||
ML7213/ML7223/ML7831 is companion chip for Intel Atom E6xx series.
|
||||
ML7213/ML7223/ML7831 is completely compatible for Intel EG20T PCH.
|
||||
|
||||
comment "External I2C/SMBus adapter drivers"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2010 OKI SEMICONDUCTOR CO., LTD.
|
||||
* Copyright (C) 2011 LAPIS Semiconductor Co., Ltd.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -136,7 +136,8 @@
|
|||
/*
|
||||
Set the number of I2C instance max
|
||||
Intel EG20T PCH : 1ch
|
||||
OKI SEMICONDUCTOR ML7213 IOH : 2ch
|
||||
LAPIS Semiconductor ML7213 IOH : 2ch
|
||||
LAPIS Semiconductor ML7831 IOH : 1ch
|
||||
*/
|
||||
#define PCH_I2C_MAX_DEV 2
|
||||
|
||||
|
|
@ -180,15 +181,17 @@ static int pch_clk = 50000; /* specifies I2C clock speed in KHz */
|
|||
static wait_queue_head_t pch_event;
|
||||
static DEFINE_MUTEX(pch_mutex);
|
||||
|
||||
/* Definition for ML7213 by OKI SEMICONDUCTOR */
|
||||
/* Definition for ML7213 by LAPIS Semiconductor */
|
||||
#define PCI_VENDOR_ID_ROHM 0x10DB
|
||||
#define PCI_DEVICE_ID_ML7213_I2C 0x802D
|
||||
#define PCI_DEVICE_ID_ML7223_I2C 0x8010
|
||||
#define PCI_DEVICE_ID_ML7831_I2C 0x8817
|
||||
|
||||
static DEFINE_PCI_DEVICE_TABLE(pch_pcidev_id) = {
|
||||
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PCH_I2C), 1, },
|
||||
{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_I2C), 2, },
|
||||
{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_I2C), 1, },
|
||||
{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7831_I2C), 1, },
|
||||
{0,}
|
||||
};
|
||||
|
||||
|
|
@ -243,7 +246,7 @@ static void pch_i2c_init(struct i2c_algo_pch_data *adap)
|
|||
if (pch_clk > PCH_MAX_CLK)
|
||||
pch_clk = 62500;
|
||||
|
||||
pch_i2cbc = (pch_clk + (pch_i2c_speed * 4)) / pch_i2c_speed * 8;
|
||||
pch_i2cbc = (pch_clk + (pch_i2c_speed * 4)) / (pch_i2c_speed * 8);
|
||||
/* Set transfer speed in I2CBC */
|
||||
iowrite32(pch_i2cbc, p + PCH_I2CBC);
|
||||
|
||||
|
|
@ -918,7 +921,9 @@ static int __devinit pch_i2c_probe(struct pci_dev *pdev,
|
|||
pch_adap->dev.parent = &pdev->dev;
|
||||
|
||||
pch_i2c_init(&adap_info->pch_data[i]);
|
||||
ret = i2c_add_adapter(pch_adap);
|
||||
|
||||
pch_adap->nr = i;
|
||||
ret = i2c_add_numbered_adapter(pch_adap);
|
||||
if (ret) {
|
||||
pch_pci_err(pdev, "i2c_add_adapter[ch:%d] FAILED\n", i);
|
||||
goto err_add_adapter;
|
||||
|
|
@ -1058,8 +1063,8 @@ static void __exit pch_pci_exit(void)
|
|||
}
|
||||
module_exit(pch_pci_exit);
|
||||
|
||||
MODULE_DESCRIPTION("Intel EG20T PCH/OKI SEMICONDUCTOR ML7213 IOH I2C Driver");
|
||||
MODULE_DESCRIPTION("Intel EG20T PCH/LAPIS Semico ML7213/ML7223/ML7831 IOH I2C");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_AUTHOR("Tomoya MORINAGA. <tomoya-linux@dsn.okisemi.com>");
|
||||
MODULE_AUTHOR("Tomoya MORINAGA. <tomoya-linux@dsn.lapis-semi.com>");
|
||||
module_param(pch_i2c_speed, int, (S_IRUSR | S_IWUSR));
|
||||
module_param(pch_clk, int, (S_IRUSR | S_IWUSR));
|
||||
|
|
|
|||
|
|
@ -37,6 +37,9 @@
|
|||
#include <linux/platform_device.h>
|
||||
#include <linux/clk.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_i2c.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/i2c-omap.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
|
|
@ -182,7 +185,9 @@ struct omap_i2c_dev {
|
|||
u32 latency; /* maximum mpu wkup latency */
|
||||
void (*set_mpu_wkup_lat)(struct device *dev,
|
||||
long latency);
|
||||
u32 speed; /* Speed of bus in Khz */
|
||||
u32 speed; /* Speed of bus in kHz */
|
||||
u32 dtrev; /* extra revision from DT */
|
||||
u32 flags;
|
||||
u16 cmd_err;
|
||||
u8 *buf;
|
||||
u8 *regs;
|
||||
|
|
@ -235,7 +240,7 @@ static const u8 reg_map_ip_v2[] = {
|
|||
[OMAP_I2C_BUF_REG] = 0x94,
|
||||
[OMAP_I2C_CNT_REG] = 0x98,
|
||||
[OMAP_I2C_DATA_REG] = 0x9c,
|
||||
[OMAP_I2C_SYSC_REG] = 0x20,
|
||||
[OMAP_I2C_SYSC_REG] = 0x10,
|
||||
[OMAP_I2C_CON_REG] = 0xa4,
|
||||
[OMAP_I2C_OA_REG] = 0xa8,
|
||||
[OMAP_I2C_SA_REG] = 0xac,
|
||||
|
|
@ -266,11 +271,7 @@ static inline u16 omap_i2c_read_reg(struct omap_i2c_dev *i2c_dev, int reg)
|
|||
|
||||
static void omap_i2c_unidle(struct omap_i2c_dev *dev)
|
||||
{
|
||||
struct omap_i2c_bus_platform_data *pdata;
|
||||
|
||||
pdata = dev->dev->platform_data;
|
||||
|
||||
if (pdata->flags & OMAP_I2C_FLAG_RESET_REGS_POSTIDLE) {
|
||||
if (dev->flags & OMAP_I2C_FLAG_RESET_REGS_POSTIDLE) {
|
||||
omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
|
||||
omap_i2c_write_reg(dev, OMAP_I2C_PSC_REG, dev->pscstate);
|
||||
omap_i2c_write_reg(dev, OMAP_I2C_SCLL_REG, dev->scllstate);
|
||||
|
|
@ -291,13 +292,10 @@ static void omap_i2c_unidle(struct omap_i2c_dev *dev)
|
|||
|
||||
static void omap_i2c_idle(struct omap_i2c_dev *dev)
|
||||
{
|
||||
struct omap_i2c_bus_platform_data *pdata;
|
||||
u16 iv;
|
||||
|
||||
pdata = dev->dev->platform_data;
|
||||
|
||||
dev->iestate = omap_i2c_read_reg(dev, OMAP_I2C_IE_REG);
|
||||
if (pdata->rev == OMAP_I2C_IP_VERSION_2)
|
||||
if (dev->dtrev == OMAP_I2C_IP_VERSION_2)
|
||||
omap_i2c_write_reg(dev, OMAP_I2C_IP_V2_IRQENABLE_CLR, 1);
|
||||
else
|
||||
omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, 0);
|
||||
|
|
@ -320,9 +318,6 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
|
|||
unsigned long timeout;
|
||||
unsigned long internal_clk = 0;
|
||||
struct clk *fclk;
|
||||
struct omap_i2c_bus_platform_data *pdata;
|
||||
|
||||
pdata = dev->dev->platform_data;
|
||||
|
||||
if (dev->rev >= OMAP_I2C_OMAP1_REV_2) {
|
||||
/* Disable I2C controller before soft reset */
|
||||
|
|
@ -373,7 +368,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
|
|||
}
|
||||
omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
|
||||
|
||||
if (pdata->flags & OMAP_I2C_FLAG_ALWAYS_ARMXOR_CLK) {
|
||||
if (dev->flags & OMAP_I2C_FLAG_ALWAYS_ARMXOR_CLK) {
|
||||
/*
|
||||
* The I2C functional clock is the armxor_ck, so there's
|
||||
* no need to get "armxor_ck" separately. Now, if OMAP2420
|
||||
|
|
@ -397,7 +392,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
|
|||
psc = fclk_rate / 12000000;
|
||||
}
|
||||
|
||||
if (!(pdata->flags & OMAP_I2C_FLAG_SIMPLE_CLOCK)) {
|
||||
if (!(dev->flags & OMAP_I2C_FLAG_SIMPLE_CLOCK)) {
|
||||
|
||||
/*
|
||||
* HSI2C controller internal clk rate should be 19.2 Mhz for
|
||||
|
|
@ -406,7 +401,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
|
|||
* The filter is iclk (fclk for HS) period.
|
||||
*/
|
||||
if (dev->speed > 400 ||
|
||||
pdata->flags & OMAP_I2C_FLAG_FORCE_19200_INT_CLK)
|
||||
dev->flags & OMAP_I2C_FLAG_FORCE_19200_INT_CLK)
|
||||
internal_clk = 19200;
|
||||
else if (dev->speed > 100)
|
||||
internal_clk = 9600;
|
||||
|
|
@ -475,7 +470,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
|
|||
|
||||
dev->errata = 0;
|
||||
|
||||
if (pdata->flags & OMAP_I2C_FLAG_APPLY_ERRATA_I207)
|
||||
if (dev->flags & OMAP_I2C_FLAG_APPLY_ERRATA_I207)
|
||||
dev->errata |= I2C_OMAP_ERRATA_I207;
|
||||
|
||||
/* Enable interrupts */
|
||||
|
|
@ -484,7 +479,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
|
|||
OMAP_I2C_IE_AL) | ((dev->fifo_size) ?
|
||||
(OMAP_I2C_IE_RDR | OMAP_I2C_IE_XDR) : 0);
|
||||
omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, dev->iestate);
|
||||
if (pdata->flags & OMAP_I2C_FLAG_RESET_REGS_POSTIDLE) {
|
||||
if (dev->flags & OMAP_I2C_FLAG_RESET_REGS_POSTIDLE) {
|
||||
dev->pscstate = psc;
|
||||
dev->scllstate = scll;
|
||||
dev->sclhstate = sclh;
|
||||
|
|
@ -804,9 +799,6 @@ omap_i2c_isr(int this_irq, void *dev_id)
|
|||
u16 bits;
|
||||
u16 stat, w;
|
||||
int err, count = 0;
|
||||
struct omap_i2c_bus_platform_data *pdata;
|
||||
|
||||
pdata = dev->dev->platform_data;
|
||||
|
||||
if (pm_runtime_suspended(dev->dev))
|
||||
return IRQ_NONE;
|
||||
|
|
@ -830,11 +822,9 @@ complete:
|
|||
~(OMAP_I2C_STAT_RRDY | OMAP_I2C_STAT_RDR |
|
||||
OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR));
|
||||
|
||||
if (stat & OMAP_I2C_STAT_NACK) {
|
||||
if (stat & OMAP_I2C_STAT_NACK)
|
||||
err |= OMAP_I2C_STAT_NACK;
|
||||
omap_i2c_write_reg(dev, OMAP_I2C_CON_REG,
|
||||
OMAP_I2C_CON_STP);
|
||||
}
|
||||
|
||||
if (stat & OMAP_I2C_STAT_AL) {
|
||||
dev_err(dev->dev, "Arbitration lost\n");
|
||||
err |= OMAP_I2C_STAT_AL;
|
||||
|
|
@ -875,7 +865,7 @@ complete:
|
|||
* Data reg in 2430, omap3 and
|
||||
* omap4 is 8 bit wide
|
||||
*/
|
||||
if (pdata->flags &
|
||||
if (dev->flags &
|
||||
OMAP_I2C_FLAG_16BIT_DATA_REG) {
|
||||
if (dev->buf_len) {
|
||||
*dev->buf++ = w >> 8;
|
||||
|
|
@ -918,7 +908,7 @@ complete:
|
|||
* Data reg in 2430, omap3 and
|
||||
* omap4 is 8 bit wide
|
||||
*/
|
||||
if (pdata->flags &
|
||||
if (dev->flags &
|
||||
OMAP_I2C_FLAG_16BIT_DATA_REG) {
|
||||
if (dev->buf_len) {
|
||||
w |= *dev->buf++ << 8;
|
||||
|
|
@ -965,6 +955,32 @@ static const struct i2c_algorithm omap_i2c_algo = {
|
|||
.functionality = omap_i2c_func,
|
||||
};
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
static struct omap_i2c_bus_platform_data omap3_pdata = {
|
||||
.rev = OMAP_I2C_IP_VERSION_1,
|
||||
.flags = OMAP_I2C_FLAG_APPLY_ERRATA_I207 |
|
||||
OMAP_I2C_FLAG_RESET_REGS_POSTIDLE |
|
||||
OMAP_I2C_FLAG_BUS_SHIFT_2,
|
||||
};
|
||||
|
||||
static struct omap_i2c_bus_platform_data omap4_pdata = {
|
||||
.rev = OMAP_I2C_IP_VERSION_2,
|
||||
};
|
||||
|
||||
static const struct of_device_id omap_i2c_of_match[] = {
|
||||
{
|
||||
.compatible = "ti,omap4-i2c",
|
||||
.data = &omap4_pdata,
|
||||
},
|
||||
{
|
||||
.compatible = "ti,omap3-i2c",
|
||||
.data = &omap3_pdata,
|
||||
},
|
||||
{ },
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, omap_i2c_of_match);
|
||||
#endif
|
||||
|
||||
static int __devinit
|
||||
omap_i2c_probe(struct platform_device *pdev)
|
||||
{
|
||||
|
|
@ -972,9 +988,10 @@ omap_i2c_probe(struct platform_device *pdev)
|
|||
struct i2c_adapter *adap;
|
||||
struct resource *mem, *irq, *ioarea;
|
||||
struct omap_i2c_bus_platform_data *pdata = pdev->dev.platform_data;
|
||||
struct device_node *node = pdev->dev.of_node;
|
||||
const struct of_device_id *match;
|
||||
irq_handler_t isr;
|
||||
int r;
|
||||
u32 speed = 0;
|
||||
|
||||
/* NOTE: driver uses the static register mapping */
|
||||
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
|
|
@ -1001,15 +1018,24 @@ omap_i2c_probe(struct platform_device *pdev)
|
|||
goto err_release_region;
|
||||
}
|
||||
|
||||
if (pdata != NULL) {
|
||||
speed = pdata->clkrate;
|
||||
match = of_match_device(omap_i2c_of_match, &pdev->dev);
|
||||
if (match) {
|
||||
u32 freq = 100000; /* default to 100000 Hz */
|
||||
|
||||
pdata = match->data;
|
||||
dev->dtrev = pdata->rev;
|
||||
dev->flags = pdata->flags;
|
||||
|
||||
of_property_read_u32(node, "clock-frequency", &freq);
|
||||
/* convert DT freq value in Hz into kHz for speed */
|
||||
dev->speed = freq / 1000;
|
||||
} else if (pdata != NULL) {
|
||||
dev->speed = pdata->clkrate;
|
||||
dev->flags = pdata->flags;
|
||||
dev->set_mpu_wkup_lat = pdata->set_mpu_wkup_lat;
|
||||
} else {
|
||||
speed = 100; /* Default speed */
|
||||
dev->set_mpu_wkup_lat = NULL;
|
||||
dev->dtrev = pdata->rev;
|
||||
}
|
||||
|
||||
dev->speed = speed;
|
||||
dev->dev = &pdev->dev;
|
||||
dev->irq = irq->start;
|
||||
dev->base = ioremap(mem->start, resource_size(mem));
|
||||
|
|
@ -1020,9 +1046,9 @@ omap_i2c_probe(struct platform_device *pdev)
|
|||
|
||||
platform_set_drvdata(pdev, dev);
|
||||
|
||||
dev->reg_shift = (pdata->flags >> OMAP_I2C_FLAG_BUS_SHIFT__SHIFT) & 3;
|
||||
dev->reg_shift = (dev->flags >> OMAP_I2C_FLAG_BUS_SHIFT__SHIFT) & 3;
|
||||
|
||||
if (pdata->rev == OMAP_I2C_IP_VERSION_2)
|
||||
if (dev->dtrev == OMAP_I2C_IP_VERSION_2)
|
||||
dev->regs = (u8 *)reg_map_ip_v2;
|
||||
else
|
||||
dev->regs = (u8 *)reg_map_ip_v1;
|
||||
|
|
@ -1035,7 +1061,7 @@ omap_i2c_probe(struct platform_device *pdev)
|
|||
if (dev->rev <= OMAP_I2C_REV_ON_3430)
|
||||
dev->errata |= I2C_OMAP3_1P153;
|
||||
|
||||
if (!(pdata->flags & OMAP_I2C_FLAG_NO_FIFO)) {
|
||||
if (!(dev->flags & OMAP_I2C_FLAG_NO_FIFO)) {
|
||||
u16 s;
|
||||
|
||||
/* Set up the fifo size - Get total size */
|
||||
|
|
@ -1058,7 +1084,7 @@ omap_i2c_probe(struct platform_device *pdev)
|
|||
/* calculate wakeup latency constraint for MPU */
|
||||
if (dev->set_mpu_wkup_lat != NULL)
|
||||
dev->latency = (1000000 * dev->fifo_size) /
|
||||
(1000 * speed / 8);
|
||||
(1000 * dev->speed / 8);
|
||||
}
|
||||
|
||||
/* reset ASAP, clearing any IRQs */
|
||||
|
|
@ -1074,7 +1100,7 @@ omap_i2c_probe(struct platform_device *pdev)
|
|||
}
|
||||
|
||||
dev_info(dev->dev, "bus %d rev%d.%d.%d at %d kHz\n", pdev->id,
|
||||
pdata->rev, dev->rev >> 4, dev->rev & 0xf, dev->speed);
|
||||
dev->dtrev, dev->rev >> 4, dev->rev & 0xf, dev->speed);
|
||||
|
||||
pm_runtime_put(dev->dev);
|
||||
|
||||
|
|
@ -1085,6 +1111,7 @@ omap_i2c_probe(struct platform_device *pdev)
|
|||
strlcpy(adap->name, "OMAP I2C adapter", sizeof(adap->name));
|
||||
adap->algo = &omap_i2c_algo;
|
||||
adap->dev.parent = &pdev->dev;
|
||||
adap->dev.of_node = pdev->dev.of_node;
|
||||
|
||||
/* i2c device drivers may be active on return from add_adapter() */
|
||||
adap->nr = pdev->id;
|
||||
|
|
@ -1094,6 +1121,8 @@ omap_i2c_probe(struct platform_device *pdev)
|
|||
goto err_free_irq;
|
||||
}
|
||||
|
||||
of_i2c_register_devices(adap);
|
||||
|
||||
return 0;
|
||||
|
||||
err_free_irq:
|
||||
|
|
@ -1166,6 +1195,7 @@ static struct platform_driver omap_i2c_driver = {
|
|||
.name = "omap_i2c",
|
||||
.owner = THIS_MODULE,
|
||||
.pm = OMAP_I2C_PM_OPS,
|
||||
.of_match_table = of_match_ptr(omap_i2c_of_match),
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue