diff options
| author | Tom Rini <trini@konsulko.com> | 2016-06-12 09:55:16 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-06-12 09:55:16 -0400 |
| commit | b57129dbdade13ee152daf15a4221d8582f48387 (patch) | |
| tree | 6f3930a8a77cb163233e0cd6b1dcbe9784e776ec /drivers | |
| parent | a646f6698173ef4ff34c414f91541b4b8f014de1 (diff) | |
| parent | 9769e05bcf79939bad23a719982dd1f85a110f3c (diff) | |
| download | u-boot-imx-b57129dbdade13ee152daf15a4221d8582f48387.zip u-boot-imx-b57129dbdade13ee152daf15a4221d8582f48387.tar.gz u-boot-imx-b57129dbdade13ee152daf15a4221d8582f48387.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/intel_broadwell_gpio.c | 7 | ||||
| -rw-r--r-- | drivers/gpio/intel_ich6_gpio.c | 5 |
2 files changed, 0 insertions, 12 deletions
diff --git a/drivers/gpio/intel_broadwell_gpio.c b/drivers/gpio/intel_broadwell_gpio.c index 81ce446..8b50900 100644 --- a/drivers/gpio/intel_broadwell_gpio.c +++ b/drivers/gpio/intel_broadwell_gpio.c @@ -9,7 +9,6 @@ #include <fdtdec.h> #include <pch.h> #include <pci.h> -#include <syscon.h> #include <asm/cpu.h> #include <asm/gpio.h> #include <asm/io.h> @@ -119,12 +118,6 @@ 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; diff --git a/drivers/gpio/intel_ich6_gpio.c b/drivers/gpio/intel_ich6_gpio.c index b7e379a..fd6181f 100644 --- a/drivers/gpio/intel_ich6_gpio.c +++ b/drivers/gpio/intel_ich6_gpio.c @@ -32,7 +32,6 @@ #include <fdtdec.h> #include <pch.h> #include <pci.h> -#include <syscon.h> #include <asm/cpu.h> #include <asm/gpio.h> #include <asm/io.h> @@ -113,10 +112,6 @@ static int ich6_gpio_probe(struct udevice *dev) struct ich6_bank_platdata *plat = dev_get_platdata(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct ich6_bank_priv *bank = dev_get_priv(dev); - struct udevice *pinctrl; - - /* Set up pin control if available */ - syscon_get_by_driver_data(X86_SYSCON_PINCONF, &pinctrl); uc_priv->gpio_count = GPIO_PER_BANK; uc_priv->bank_name = plat->bank_name; |