On 17/09/2014 17:02, Simon Glass wrote:
> GPIOs should be requested before use. Without this, driver model will not
> permit the GPIO to be used.
>
> Signed-off-by: Simon Glass <s...@chromium.org>
> ---
>
> Changes in v3:
> - Add a check for the Ethernet gpio_request() also
> - Add a comment for the CONFIG_SPL_BUILD #ifdef
> - Just warn when one of the board init stages fails
>
> Changes in v2:
> - Check return values of gpio_request()
>
> arch/arm/imx-common/i2c-mxv7.c | 24 ++++++++++++++++++++++++
> board/compulab/cm_fx6/cm_fx6.c | 22 ++++++++++++++++++++--
> board/compulab/cm_fx6/common.c | 8 ++++++++
> 3 files changed, 52 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/imx-common/i2c-mxv7.c b/arch/arm/imx-common/i2c-mxv7.c
> index 70cff5c..aaf6936 100644
> --- a/arch/arm/imx-common/i2c-mxv7.c
> +++ b/arch/arm/imx-common/i2c-mxv7.c
> @@ -4,6 +4,7 @@
> * SPDX-License-Identifier: GPL-2.0+
> */
> #include <common.h>
> +#include <malloc.h>
> #include <asm/arch/clock.h>
> #include <asm/arch/imx-regs.h>
> #include <asm/errno.h>
> @@ -72,10 +73,26 @@ static void * const i2c_bases[] = {
> int setup_i2c(unsigned i2c_index, int speed, int slave_addr,
> struct i2c_pads_info *p)
> {
> + char *name1, *name2;
> int ret;
>
> if (i2c_index >= ARRAY_SIZE(i2c_bases))
> return -EINVAL;
> +
> + name1 = malloc(9);
> + name2 = malloc(9);
> + if (!name1 || !name2)
> + return -ENOMEM;
> + sprintf(name1, "i2c_sda%d", i2c_index);
> + sprintf(name2, "i2c_scl%d", i2c_index);
> + ret = gpio_request(p->sda.gp, name1);
> + if (ret)
> + goto err_req1;
> +
> + ret = gpio_request(p->scl.gp, name2);
> + if (ret)
> + goto err_req2;
> +
> /* Enable i2c clock */
> ret = enable_i2c_clk(1, i2c_index);
> if (ret)
> @@ -93,5 +110,12 @@ int setup_i2c(unsigned i2c_index, int speed, int
> slave_addr,
>
> err_idle:
> err_clk:
> + gpio_free(p->scl.gp);
> +err_req2:
> + gpio_free(p->sda.gp);
> +err_req1:
> + free(name1);
> + free(name2);
> +
> return ret;
> }
> diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
> index 10a568f..a089e82 100644
> --- a/board/compulab/cm_fx6/cm_fx6.c
> +++ b/board/compulab/cm_fx6/cm_fx6.c
> @@ -71,8 +71,21 @@ static iomux_v3_cfg_t const sata_pads[] = {
>
> static int cm_fx6_setup_issd(void)
> {
> + int ret;
> + int i;
> +
> SETUP_IOMUX_PADS(sata_pads);
> +
> + for (i = 0; i < ARRAY_SIZE(cm_fx6_issd_gpios); i++) {
> + ret = gpio_request(cm_fx6_issd_gpios[i], "sata");
> + if (ret)
> + return ret;
> + }
> +
> /* Make sure this gpio has logical 0 value */
> + ret = gpio_request(CM_FX6_SATA_PWLOSS_INT, "sata_pwloss_int");
> + if (ret)
> + return ret;
> gpio_direction_output(CM_FX6_SATA_PWLOSS_INT, 0);
> udelay(100);
>
> @@ -350,12 +363,17 @@ static int handle_mac_address(void)
>
> int board_eth_init(bd_t *bis)
> {
> - int res = handle_mac_address();
> - if (res)
> + int err;
> +
> + err = handle_mac_address();
> + if (err)
> puts("No MAC address found\n");
>
> SETUP_IOMUX_PADS(enet_pads);
> /* phy reset */
> + err = gpio_request(CM_FX6_ENET_NRST, "enet_nrst");
> + if (err)
> + printf("Etnernet NRST gpio request failed: %d\n", err);
> gpio_direction_output(CM_FX6_ENET_NRST, 0);
> udelay(500);
> gpio_set_value(CM_FX6_ENET_NRST, 1);
> diff --git a/board/compulab/cm_fx6/common.c b/board/compulab/cm_fx6/common.c
> index 1f39679..20b758b 100644
> --- a/board/compulab/cm_fx6/common.c
> +++ b/board/compulab/cm_fx6/common.c
> @@ -79,6 +79,14 @@ void cm_fx6_set_ecspi_iomux(void)
>
> int board_spi_cs_gpio(unsigned bus, unsigned cs)
> {
> + /* DM does not support SPL yet and this function is not implemented */
> +#ifndef CONFIG_SPL_BUILD
> + int ret;
> +
> + ret = gpio_request(CM_FX6_ECSPI_BUS0_CS0, "ecspi_bus0_cs0");
> + if (ret)
> + return ret;
> +#endif
> return (bus == 0 && cs == 0) ? (CM_FX6_ECSPI_BUS0_CS0) : -1;
> }
> #endif
>
Acked-by: Stefano Babic <sba...@denx.de>
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de
=====================================================================
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
