aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpio
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-10-12 08:32:09 -0400
committerTom Rini <trini@konsulko.com>2016-10-12 13:59:26 -0400
commit5ebd27d860ec0c6e36f1b0f973653fe66a7360be (patch)
tree71ba0f39cc03c131889ce51803d85cf4c49b2941 /drivers/gpio
parentf812574e61e9bfe37e76e620606fd1a65cc9cdc2 (diff)
parent00bcaedd5c4063c677d16af264bbcb991fb9675c (diff)
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/intel_broadwell_gpio.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpio/intel_broadwell_gpio.c b/drivers/gpio/intel_broadwell_gpio.c
index 8b50900f9f..81ce446e1a 100644
--- a/drivers/gpio/intel_broadwell_gpio.c
+++ b/drivers/gpio/intel_broadwell_gpio.c
@@ -9,6 +9,7 @@
#include <fdtdec.h>
#include <pch.h>
#include <pci.h>
+#include <syscon.h>
#include <asm/cpu.h>
#include <asm/gpio.h>
#include <asm/io.h>
@@ -118,6 +119,12 @@ static int broadwell_gpio_probe(struct udevice *dev)
struct broadwell_bank_platdata *plat = dev_get_platdata(dev);
struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
struct broadwell_bank_priv *priv = dev_get_priv(dev);
+ struct udevice *pinctrl;
+ int ret;
+
+ /* Set up pin control if available */
+ ret = syscon_get_by_driver_data(X86_SYSCON_PINCONF, &pinctrl);
+ debug("%s, pinctrl=%p, ret=%d\n", __func__, pinctrl, ret);
uc_priv->gpio_count = GPIO_PER_BANK;
uc_priv->bank_name = plat->bank_name;