Skip to contentSkip to conversation

gpio-sch: Add Intel Centerton DeviceID for GPIO

PATCH Applied Seth Heasley 3 participants 4 messages Apr 17, 2012 – May 18, 2012

Subsystems (2)
GPIO Intel GPIO drivers
lore
Share & tools
lore

Seth Heasley

author
#0 lore raw

PATCH 2/3 gpio-sch: Add Intel Centerton DeviceID for GPIO

This patch adds the Intel Centerton processor DeviceID for GPIO. The DeviceID is defined in include/linux/pci_ids.h

Signed-off-by Seth Heasley <[email protected]>
---
 drivers/gpio/Kconfig    |    9 ++++++---
 drivers/gpio/gpio-sch.c |    8 ++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)
drivers/gpio/Kconfig +6 -3
index e03653d..d84eb4d 100644
@@ -162,13 +162,13 @@ config GPIO_VR41XX
 	  Say yes here to support the NEC VR4100 series General-purpose I/O Uint
 
 config GPIO_SCH
-	tristate "Intel SCH/TunnelCreek GPIO"
+	tristate "Intel SCH/TunnelCreek/Centerton GPIO"
 	depends on PCI && X86
 	select MFD_CORE
 	select LPC_SCH
 	help
-	  Say yes here to support GPIO interface on Intel Poulsbo SCH
-	  or Intel Tunnel Creek processor.
+	  Say yes here to support GPIO interface on Intel Poulsbo SCH,
+	  Intel Tunnel Creek processor or Intel Centerton processor.
 	  The Intel SCH contains a total of 14 GPIO pins. Ten GPIOs are
 	  powered by the core power rail and are turned off during sleep
 	  modes (S3 and higher). The remaining four GPIOs are powered by

@@ -177,6 +177,9 @@ config GPIO_SCH
 	  system from the Suspend-to-RAM state.
 	  The Intel Tunnel Creek processor has 5 GPIOs powered by the
 	  core power rail and 9 from suspend power supply.
+	  The Intel Centerton processor has a total of 30 GPIO pins.
+	  Twenty-one are powered by the core power rail and 9 from the
+	  suspend power supply.
 
 config GPIO_VX855
 	tristate "VIA VX855/VX875 GPIO"
drivers/gpio/gpio-sch.c +8 -0
index 8cadf4d..424dce8 100644
@@ -232,6 +232,14 @@ static int __devinit sch_gpio_probe(struct platform_device *pdev)
 			sch_gpio_resume.ngpio = 9;
 			break;
 
+		case PCI_DEVICE_ID_INTEL_CENTERTON_ILB:
+			sch_gpio_core.base = 0;
+			sch_gpio_core.ngpio = 21;
+
+			sch_gpio_resume.base = 21;
+			sch_gpio_resume.ngpio = 9;
+			break;
+
 		default:
 			return -ENODEV;
 	}
Signature · 1 line
1.7.4.4
Applied
#2 lore raw
Quoted 9 lines · Linus Walleij
Quoted 3 lines · Seth Heasley

This patch adds the Intel Centerton processor DeviceID for GPIO. The DeviceID is defined in include/linux/pci_ids.h

Signed-off-by Seth Heasley <[email protected]>

That's straight-forward :)

Acked-by Linus Walleij <[email protected]>

Applied, thanks.

g.

Quoted 3 lines

Yours,
Linus Walleij

Signature · 2 lines
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies, Ltd.
#3 lore raw
Quoted 5 lines · Grant Likely
Quoted 4 lines · Linus Walleij
Quoted 2 lines · Seth Heasley

This patch adds the Intel Centerton processor DeviceID for GPIO. The DeviceID is defined in include/linux/pci_ids.h

Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Signed-off-by Seth Heasley <[email protected]>

That's straight-forward :)

Acked-by Linus Walleij <[email protected]>

Applied, thanks.

Oops, this depends on the pci device id change in patch 1 which Samuel is picking up. I'm dropping it from my tree since it should get merged with the other patches.

g.