aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpio/Kconfig9
-rw-r--r--drivers/gpio/gpio-sch.c8
2 files changed, 14 insertions, 3 deletions
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 09ac540daade..6da36a58332d 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -170,13 +170,13 @@ config GPIO_VR41XX
170 Say yes here to support the NEC VR4100 series General-purpose I/O Uint 170 Say yes here to support the NEC VR4100 series General-purpose I/O Uint
171 171
172config GPIO_SCH 172config GPIO_SCH
173 tristate "Intel SCH/TunnelCreek GPIO" 173 tristate "Intel SCH/TunnelCreek/Centerton GPIO"
174 depends on PCI && X86 174 depends on PCI && X86
175 select MFD_CORE 175 select MFD_CORE
176 select LPC_SCH 176 select LPC_SCH
177 help 177 help
178 Say yes here to support GPIO interface on Intel Poulsbo SCH 178 Say yes here to support GPIO interface on Intel Poulsbo SCH,
179 or Intel Tunnel Creek processor. 179 Intel Tunnel Creek processor or Intel Centerton processor.
180 The Intel SCH contains a total of 14 GPIO pins. Ten GPIOs are 180 The Intel SCH contains a total of 14 GPIO pins. Ten GPIOs are
181 powered by the core power rail and are turned off during sleep 181 powered by the core power rail and are turned off during sleep
182 modes (S3 and higher). The remaining four GPIOs are powered by 182 modes (S3 and higher). The remaining four GPIOs are powered by
@@ -185,6 +185,9 @@ config GPIO_SCH
185 system from the Suspend-to-RAM state. 185 system from the Suspend-to-RAM state.
186 The Intel Tunnel Creek processor has 5 GPIOs powered by the 186 The Intel Tunnel Creek processor has 5 GPIOs powered by the
187 core power rail and 9 from suspend power supply. 187 core power rail and 9 from suspend power supply.
188 The Intel Centerton processor has a total of 30 GPIO pins.
189 Twenty-one are powered by the core power rail and 9 from the
190 suspend power supply.
188 191
189config GPIO_ICH 192config GPIO_ICH
190 tristate "Intel ICH GPIO" 193 tristate "Intel ICH GPIO"
diff --git a/drivers/gpio/gpio-sch.c b/drivers/gpio/gpio-sch.c
index 8cadf4d683a8..424dce8e3f30 100644
--- a/drivers/gpio/gpio-sch.c
+++ b/drivers/gpio/gpio-sch.c
@@ -232,6 +232,14 @@ static int __devinit sch_gpio_probe(struct platform_device *pdev)
232 sch_gpio_resume.ngpio = 9; 232 sch_gpio_resume.ngpio = 9;
233 break; 233 break;
234 234
235 case PCI_DEVICE_ID_INTEL_CENTERTON_ILB:
236 sch_gpio_core.base = 0;
237 sch_gpio_core.ngpio = 21;
238
239 sch_gpio_resume.base = 21;
240 sch_gpio_resume.ngpio = 9;
241 break;
242
235 default: 243 default:
236 return -ENODEV; 244 return -ENODEV;
237 } 245 }