diff mbox

[U-Boot,v2,01/12] Revert "x86: broadwell: gpio: Remove the codes to set up pin control"

Message ID 1475721740-15124-2-git-send-email-sjg@chromium.org
State Accepted
Delegated to: Bin Meng
Headers show

Commit Message

Simon Glass Oct. 6, 2016, 2:42 a.m. UTC 
This makes the assumption that setting up pinctrl in cpu_init_r() is safe.
On samus we need GPIOs before relocation in order to support power control.
This commit fixes the following message on boot:

   initcall sequence ffe5c6f4 failed at call ffe01d3d (err=-1)
   ### ERROR ### Please RESET the board ###

In any case it seems better to leave init to driver model, so that it can
pick up the GPIO driver when it needs it. Since pinctrl is a dependency of
the GPIO driver, we may as well put the dependency there and avoid these
problems.

This reverts commit 9769e05bcf79939bad23a719982dd1f85a110f3c.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

---

Changes in v2: None

 drivers/gpio/intel_broadwell_gpio.c | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Bin Meng Oct. 8, 2016, 4:23 a.m. UTC | #1 
On Thu, Oct 6, 2016 at 10:42 AM, Simon Glass <sjg@chromium.org> wrote:
> This makes the assumption that setting up pinctrl in cpu_init_r() is safe.
> On samus we need GPIOs before relocation in order to support power control.
> This commit fixes the following message on boot:
>
>    initcall sequence ffe5c6f4 failed at call ffe01d3d (err=-1)
>    ### ERROR ### Please RESET the board ###
>
> In any case it seems better to leave init to driver model, so that it can
> pick up the GPIO driver when it needs it. Since pinctrl is a dependency of
> the GPIO driver, we may as well put the dependency there and avoid these
> problems.
>
> This reverts commit 9769e05bcf79939bad23a719982dd1f85a110f3c.
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
>
> ---
>
> Changes in v2: None
>
>  drivers/gpio/intel_broadwell_gpio.c | 7 +++++++
>  1 file changed, 7 insertions(+)
>

applied to u-boot-x86, thanks!
diff mbox

Patch

diff --git a/drivers/gpio/intel_broadwell_gpio.c b/drivers/gpio/intel_broadwell_gpio.c
index 8b50900..81ce446 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;