Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / drivers / gpio / gpio-intel-mid.c

diff --git a/kernel/drivers/gpio/gpio-intel-mid.c b/kernel/drivers/gpio/gpio-intel-mid.c
index 7009747..c50e930 100644 (file)
--- a/kernel/drivers/gpio/gpio-intel-mid.c
+++ b/kernel/drivers/gpio/gpio-intel-mid.c
@@ -17,7 +17,6 @@
  * Moorestown platform Langwell chip.
  * Medfield platform Penwell chip.
  * Clovertrail platform Cloverview chip.
- * Merrifield platform Tangier chip.
  */
 
 #include <linux/module.h>
@@ -64,10 +63,6 @@ enum GPIO_REG {
 /* intel_mid gpio driver data */
 struct intel_mid_gpio_ddata {
        u16 ngpio;              /* number of gpio pins */
-       u32 gplr_offset;        /* offset of first GPLR register from base */
-       u32 flis_base;          /* base address of FLIS registers */
-       u32 flis_len;           /* length of FLIS registers */
-       u32 (*get_flis_offset)(int gpio);
        u32 chip_irq_type;      /* chip interrupt type */
 };
 
@@ -257,15 +252,6 @@ static const struct intel_mid_gpio_ddata gpio_cloverview_core = {
        .chip_irq_type = INTEL_MID_IRQ_TYPE_EDGE,
 };
 
-static const struct intel_mid_gpio_ddata gpio_tangier = {
-       .ngpio = 192,
-       .gplr_offset = 4,
-       .flis_base = 0xff0c0000,
-       .flis_len = 0x8000,
-       .get_flis_offset = NULL,
-       .chip_irq_type = INTEL_MID_IRQ_TYPE_EDGE,
-};
-
 static const struct pci_device_id intel_gpio_ids[] = {
        {
                /* Lincroft */
@@ -292,11 +278,6 @@ static const struct pci_device_id intel_gpio_ids[] = {
                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x08f7),
                .driver_data = (kernel_ulong_t)&gpio_cloverview_core,
        },
-       {
-               /* Tangier */
-               PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x1199),
-               .driver_data = (kernel_ulong_t)&gpio_tangier,
-       },
        { 0 }
 };
 MODULE_DEVICE_TABLE(pci, intel_gpio_ids);