projects / cascardo / linux.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
i2c: designware-pci: clarify a comment for Merrifield
[cascardo/linux.git] / drivers / i2c / busses / i2c-designware-pcidrv.c
diff --git a/drivers/i2c/busses/i2c-designware-pcidrv.c b/drivers/i2c/busses/i2c-designware-pcidrv.c
index 7368be0..96f8230 100644 (file)
--- a/drivers/i2c/busses/i2c-designware-pcidrv.c
+++ b/drivers/i2c/busses/i2c-designware-pcidrv.c
@@ -6,7 +6,7 @@
  * Copyright (C) 2006 Texas Instruments.
  * Copyright (C) 2007 MontaVista Software Inc.
  * Copyright (C) 2009 Provigent Ltd.
- * Copyright (C) 2011, 2015 Intel Corporation.
+ * Copyright (C) 2011, 2015, 2016 Intel Corporation.
  *
  * ----------------------------------------------------------------------------
  *
@@ -23,31 +23,27 @@
  *
  */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/acpi.h>
 #include <linux/delay.h>
-#include <linux/i2c.h>
-#include <linux/errno.h>
-#include <linux/sched.h>
 #include <linux/err.h>
+#include <linux/errno.h>
+#include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
-#include <linux/slab.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/pm_runtime.h>
-#include <linux/acpi.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+
 #include "i2c-designware-core.h"
 
 #define DRIVER_NAME "i2c-designware-pci"
 
 enum dw_pci_ctl_id_t {
-       medfield_0,
-       medfield_1,
-       medfield_2,
-       medfield_3,
-       medfield_4,
-       medfield_5,
-
+       medfield,
+       merrifield,
        baytrail,
        haswell,
 };
@@ -68,6 +64,7 @@ struct dw_pci_controller {
        u32 clk_khz;
        u32 functionality;
        struct dw_scl_sda_cfg *scl_sda_cfg;
+       int (*setup)(struct pci_dev *pdev, struct dw_pci_controller *c);
 };
 
 #define INTEL_MID_STD_CFG  (DW_IC_CON_MASTER |                 \
@@ -80,6 +77,14 @@ struct dw_pci_controller {
                                        I2C_FUNC_SMBUS_WORD_DATA |      \
                                        I2C_FUNC_SMBUS_I2C_BLOCK)
 
+/* Merrifield HCNT/LCNT/SDA hold time */
+static struct dw_scl_sda_cfg mrfld_config = {
+       .ss_hcnt = 0x2f8,
+       .fs_hcnt = 0x87,
+       .ss_lcnt = 0x37b,
+       .fs_lcnt = 0x10a,
+};
+
 /* BayTrail HCNT/LCNT/SDA hold time */
 static struct dw_scl_sda_cfg byt_config = {
        .ss_hcnt = 0x200,
@@ -98,48 +103,60 @@ static struct dw_scl_sda_cfg hsw_config = {
        .sda_hold = 0x9,
 };
 
+static int mfld_setup(struct pci_dev *pdev, struct dw_pci_controller *c)
+{
+       switch (pdev->device) {
+       case 0x0817:
+               c->bus_cfg &= ~DW_IC_CON_SPEED_MASK;
+               c->bus_cfg |= DW_IC_CON_SPEED_STD;
+       case 0x0818:
+       case 0x0819:
+               c->bus_num = pdev->device - 0x817 + 3;
+               return 0;
+       case 0x082C:
+       case 0x082D:
+       case 0x082E:
+               c->bus_num = pdev->device - 0x82C + 0;
+               return 0;
+       }
+       return -ENODEV;
+}
+
+static int mrfld_setup(struct pci_dev *pdev, struct dw_pci_controller *c)
+{
+       /*
+        * On Intel Merrifield the user visible i2c busses are enumerated
+        * [1..7]. So, we add 1 to shift the default range. Besides that the
+        * first PCI slot provides 4 functions, that's why we have to add 0 to
+        * the first slot and 4 to the next one.
+        */
+       switch (PCI_SLOT(pdev->devfn)) {
+       case 8:
+               c->bus_num = PCI_FUNC(pdev->devfn) + 0 + 1;
+               return 0;
+       case 9:
+               c->bus_num = PCI_FUNC(pdev->devfn) + 4 + 1;
+               return 0;
+       }
+       return -ENODEV;
+}
+
 static struct dw_pci_controller dw_pci_controllers[] = {
-       [medfield_0] = {
-               .bus_num     = 0,
-               .bus_cfg   = INTEL_MID_STD_CFG | DW_IC_CON_SPEED_FAST,
-               .tx_fifo_depth = 32,
-               .rx_fifo_depth = 32,
-               .clk_khz      = 25000,
-       },
-       [medfield_1] = {
-               .bus_num     = 1,
-               .bus_cfg   = INTEL_MID_STD_CFG | DW_IC_CON_SPEED_FAST,
-               .tx_fifo_depth = 32,
-               .rx_fifo_depth = 32,
-               .clk_khz      = 25000,
-       },
-       [medfield_2] = {
-               .bus_num     = 2,
-               .bus_cfg   = INTEL_MID_STD_CFG | DW_IC_CON_SPEED_FAST,
-               .tx_fifo_depth = 32,
-               .rx_fifo_depth = 32,
-               .clk_khz      = 25000,
-       },
-       [medfield_3] = {
-               .bus_num     = 3,
-               .bus_cfg   = INTEL_MID_STD_CFG | DW_IC_CON_SPEED_STD,
-               .tx_fifo_depth = 32,
-               .rx_fifo_depth = 32,
-               .clk_khz      = 25000,
-       },
-       [medfield_4] = {
-               .bus_num     = 4,
+       [medfield] = {
+               .bus_num = -1,
                .bus_cfg   = INTEL_MID_STD_CFG | DW_IC_CON_SPEED_FAST,
                .tx_fifo_depth = 32,
                .rx_fifo_depth = 32,
                .clk_khz      = 25000,
+               .setup = mfld_setup,
        },
-       [medfield_5] = {
-               .bus_num     = 5,
-               .bus_cfg   = INTEL_MID_STD_CFG | DW_IC_CON_SPEED_FAST,
-               .tx_fifo_depth = 32,
-               .rx_fifo_depth = 32,
-               .clk_khz      = 25000,
+       [merrifield] = {
+               .bus_num = -1,
+               .bus_cfg = INTEL_MID_STD_CFG | DW_IC_CON_SPEED_FAST,
+               .tx_fifo_depth = 64,
+               .rx_fifo_depth = 64,
+               .scl_sda_cfg = &mrfld_config,
+               .setup = mrfld_setup,
        },
        [baytrail] = {
                .bus_num = -1,
@@ -190,7 +207,7 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
        struct dw_i2c_dev *dev;
        struct i2c_adapter *adap;
        int r;
-       struct  dw_pci_controller *controller;
+       struct dw_pci_controller *controller;
        struct dw_scl_sda_cfg *cfg;
 
        if (id->driver_data >= ARRAY_SIZE(dw_pci_controllers)) {
@@ -224,6 +241,13 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
        dev->base = pcim_iomap_table(pdev)[0];
        dev->dev = &pdev->dev;
        dev->irq = pdev->irq;
+
+       if (controller->setup) {
+               r = controller->setup(pdev, controller);
+               if (r)
+                       return r;
+       }
+
        dev->functionality = controller->functionality |
                                DW_DEFAULT_FUNCTIONALITY;
 
@@ -276,12 +300,15 @@ MODULE_ALIAS("i2c_designware-pci");
 
 static const struct pci_device_id i2_designware_pci_ids[] = {
        /* Medfield */
-       { PCI_VDEVICE(INTEL, 0x0817), medfield_3 },
-       { PCI_VDEVICE(INTEL, 0x0818), medfield_4 },
-       { PCI_VDEVICE(INTEL, 0x0819), medfield_5 },
-       { PCI_VDEVICE(INTEL, 0x082C), medfield_0 },
-       { PCI_VDEVICE(INTEL, 0x082D), medfield_1 },
-       { PCI_VDEVICE(INTEL, 0x082E), medfield_2 },
+       { PCI_VDEVICE(INTEL, 0x0817), medfield },
+       { PCI_VDEVICE(INTEL, 0x0818), medfield },
+       { PCI_VDEVICE(INTEL, 0x0819), medfield },
+       { PCI_VDEVICE(INTEL, 0x082C), medfield },
+       { PCI_VDEVICE(INTEL, 0x082D), medfield },
+       { PCI_VDEVICE(INTEL, 0x082E), medfield },
+       /* Merrifield */
+       { PCI_VDEVICE(INTEL, 0x1195), merrifield },
+       { PCI_VDEVICE(INTEL, 0x1196), merrifield },
        /* Baytrail */
        { PCI_VDEVICE(INTEL, 0x0F41), baytrail },
        { PCI_VDEVICE(INTEL, 0x0F42), baytrail },
Unnamed repository; edit this file 'description' to name the repository.