Commit d730f6af authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Ben Hutchings

gpio: intel-mid: Remove potentially harmful code

commit 3dbd3212 upstream.

The commit d56d6b3d ("gpio: langwell: add Intel Merrifield support")
doesn't look at all as a proper support for Intel Merrifield and I dare to say
that it distorts the behaviour of the hardware.

The register map is different on Intel Merrifield, i.e. only 6 out of 8
register have the same purpose but none of them has same location in the
address space. The current case potentially harmful to existing hardware since
it's poking registers on wrong offsets and may set some pin to be GPIO output
when connected hardware doesn't expect such.

Besides the above GPIO and pinctrl on Intel Merrifield have been located in
different IP blocks. The functionality has been extended as well, i.e. added
support of level interrupts, special registers for wake capable sources and
thus, in my opinion, requires a completele separate driver.

If someone wondering the existing gpio-intel-mid.c would be converted to actual
pinctrl (which by the fact it is now), though I wouldn't be a volunteer to do
that.

Fixes: d56d6b3d ("gpio: langwell: add Intel Merrifield support")
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 7405d73c
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* Moorestown platform Langwell chip. * Moorestown platform Langwell chip.
* Medfield platform Penwell chip. * Medfield platform Penwell chip.
* Clovertrail platform Cloverview chip. * Clovertrail platform Cloverview chip.
* Merrifield platform Tangier chip.
*/ */
#include <linux/module.h> #include <linux/module.h>
...@@ -66,10 +65,6 @@ enum GPIO_REG { ...@@ -66,10 +65,6 @@ enum GPIO_REG {
/* intel_mid gpio driver data */ /* intel_mid gpio driver data */
struct intel_mid_gpio_ddata { struct intel_mid_gpio_ddata {
u16 ngpio; /* number of gpio pins */ 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 */ u32 chip_irq_type; /* chip interrupt type */
}; };
...@@ -284,15 +279,6 @@ static const struct intel_mid_gpio_ddata gpio_cloverview_core = { ...@@ -284,15 +279,6 @@ static const struct intel_mid_gpio_ddata gpio_cloverview_core = {
.chip_irq_type = INTEL_MID_IRQ_TYPE_EDGE, .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[] = { static const struct pci_device_id intel_gpio_ids[] = {
{ {
/* Lincroft */ /* Lincroft */
...@@ -319,11 +305,6 @@ static const struct pci_device_id intel_gpio_ids[] = { ...@@ -319,11 +305,6 @@ static const struct pci_device_id intel_gpio_ids[] = {
PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x08f7), PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x08f7),
.driver_data = (kernel_ulong_t)&gpio_cloverview_core, .driver_data = (kernel_ulong_t)&gpio_cloverview_core,
}, },
{
/* Tangier */
PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x1199),
.driver_data = (kernel_ulong_t)&gpio_tangier,
},
{ 0 } { 0 }
}; };
MODULE_DEVICE_TABLE(pci, intel_gpio_ids); MODULE_DEVICE_TABLE(pci, intel_gpio_ids);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment