diff options
| author | Lucas Stach <dev@lynxeye.de> | 2014-11-02 21:13:46 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-11-04 12:16:51 +0100 |
| commit | 8b2456a4cbd9d9dfb94aa2d59e36e353a2b31fcb (patch) | |
| tree | 073aa1fc3676b571a6232add306da7a2d17af7da /drivers/pinctrl | |
| parent | aa8bd30851e9a09480afde2b98b24b8c1736292e (diff) | |
| download | barebox-8b2456a4cbd9d9dfb94aa2d59e36e353a2b31fcb.tar.gz barebox-8b2456a4cbd9d9dfb94aa2d59e36e353a2b31fcb.tar.xz | |
pinctrl: tegra: try to select "boot" state
New DTs call the initial pinctrl state "boot" in
order to avoid Linux reconfiguring the pinctrl
by default. The bootloader should explicitly set
this state.
Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/pinctrl-tegra20.c | 8 | ||||
| -rw-r--r-- | drivers/pinctrl/pinctrl-tegra30.c | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/drivers/pinctrl/pinctrl-tegra20.c b/drivers/pinctrl/pinctrl-tegra20.c index 3c11be6f55..be9d8a996d 100644 --- a/drivers/pinctrl/pinctrl-tegra20.c +++ b/drivers/pinctrl/pinctrl-tegra20.c @@ -320,10 +320,14 @@ static int pinctrl_tegra20_probe(struct device_d *dev) ctrl->pinctrl.ops = &pinctrl_tegra20_ops; ret = pinctrl_register(&ctrl->pinctrl); - if (ret) + if (ret) { free(ctrl); + return ret; + } + + of_pinctrl_select_state(dev->device_node, "boot"); - return ret; + return 0; } static __maybe_unused struct of_device_id pinctrl_tegra20_dt_ids[] = { diff --git a/drivers/pinctrl/pinctrl-tegra30.c b/drivers/pinctrl/pinctrl-tegra30.c index 82772187d5..aac67605cf 100644 --- a/drivers/pinctrl/pinctrl-tegra30.c +++ b/drivers/pinctrl/pinctrl-tegra30.c @@ -897,10 +897,14 @@ static int pinctrl_tegra30_probe(struct device_d *dev) ctrl->pinctrl.ops = &pinctrl_tegra30_ops; ret = pinctrl_register(&ctrl->pinctrl); - if (ret) + if (ret) { free(ctrl); + return ret; + } + + of_pinctrl_select_state(dev->device_node, "boot"); - return ret; + return 0; } static __maybe_unused struct of_device_id pinctrl_tegra30_dt_ids[] = { |