Commit f0776b8c authored Mar 10, 2014 by Peter Tyser Committed by Lee Jones Mar 19, 2014

mfd: lpc_ich: Only configure watchdog or GPIO when present



Some chipsets don't currently have GPIO support enabled.  For these
chipsets don't go through the process of initializing the GPIO region.

Make the same change for the watchdog initialization for chipsets which
may not enable the WDT in the future.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Tested-by: Rajat Jain <rajatjain@juniper.net>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

parent f5dccb15

drivers/mfd/lpc_ich.c

+10 −6

Original line number	Diff line number	Diff line
		@@ -967,13 +967,17 @@ static int lpc_ich_probe(struct pci_dev *dev,

		pci_set_drvdata(dev, priv);

		if (lpc_chipset_info[priv->chipset].iTCO_version) {
		ret = lpc_ich_init_wdt(dev);
		if (!ret)
		cell_added = true;
		}

		if (lpc_chipset_info[priv->chipset].gpio_version) {
		ret = lpc_ich_init_gpio(dev);
		if (!ret)
		cell_added = true;
		}

		/*
		* We only care if at least one or none of the cells registered

Admin message