From patchwork Thu Oct 2 01:57:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 395731 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 730371400D6 for ; Thu, 2 Oct 2014 11:59:16 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B34A2A7422; Thu, 2 Oct 2014 03:58:19 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8cGQ7ZMizGJh; Thu, 2 Oct 2014 03:58:19 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E6A11A7423; Thu, 2 Oct 2014 03:58:02 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EE38FA73E7 for ; Thu, 2 Oct 2014 03:57:43 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9fOOxw4T8UwV for ; Thu, 2 Oct 2014 03:57:43 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-ob0-f202.google.com (mail-ob0-f202.google.com [209.85.214.202]) by theia.denx.de (Postfix) with ESMTPS id 5CAC94B5F5 for ; Thu, 2 Oct 2014 03:57:37 +0200 (CEST) Received: by mail-ob0-f202.google.com with SMTP id wp4so246188obc.1 for ; Wed, 01 Oct 2014 18:57:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=z9r3jGoP72wg0mCe+9lCv782yJzaXN6qsFTDVNbzi8c=; b=NFjSJR7CLZsCN0FCSC8cAM3PowbrAH7gBAKXA393Z5TBCHhie/eBhm7fzJMgoU/3Su V4ZerJ4FkbWgp/8EXloMWwvV3bI0bxbp7iRdupyf7mHuDEh+UH7sQcK2yGOxIZdy1bMS IAXCCpfph8m5Rus8fFGm1hdhSLclx/3fbQ/zJ120aDGIGc9uRySR0bkrmvDOhzWqvbxB QMQornB2k7rYpyC2SBD3rwJH78O0WJeV09g9qMmNatctY+obwIHA97a9m884TTJ4KZyF WQb0PrdhbocdlU/8laqm9FxJ03ztqVQJjTZ+9ylJlNrPVavuwaM66JTVlLldBQLY/9Wh J0gA== X-Gm-Message-State: ALoCoQlUnNjjjNKUkdI/znv4gGbPeDMaGRk/BcQSitefYf24TfxihtxFdkwc5D1US0LiFZK6Bnoj X-Received: by 10.182.98.225 with SMTP id el1mr5649390obb.46.1412215056218; Wed, 01 Oct 2014 18:57:36 -0700 (PDT) Received: from corpmail-nozzle1-2.hot.corp.google.com ([100.108.1.103]) by gmr-mx.google.com with ESMTPS id z1si638370qci.3.2014.10.01.18.57.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Oct 2014 18:57:36 -0700 (PDT) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by corpmail-nozzle1-2.hot.corp.google.com with ESMTP id z4sVM2oo.1; Wed, 01 Oct 2014 18:57:36 -0700 Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id C2DE8221821; Wed, 1 Oct 2014 19:57:34 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 1 Oct 2014 19:57:25 -0600 Message-Id: <1412215048-565-7-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 In-Reply-To: <1412215048-565-1-git-send-email-sjg@chromium.org> References: <1412215048-565-1-git-send-email-sjg@chromium.org> Subject: [U-Boot] [PATCH v4 6/9] dm: imx: Use gpio_request() to request GPIOs X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de GPIOs should be requested before use. Without this, driver model will not permit the GPIO to be used. Signed-off-by: Simon Glass --- Changes in v4: - Adjust error checking to permit calling gpio_request() multiple times - Avoid doing low-level SATA init multiple times - Move SATA changes into this patch 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 | 61 ++++++++++++++++++++++++++++++++---------- board/compulab/cm_fx6/common.c | 14 +++++++++- 3 files changed, 84 insertions(+), 15 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 +#include #include #include #include @@ -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 9c6e686..53681d4 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -69,24 +69,52 @@ static iomux_v3_cfg_t const sata_pads[] = { IOMUX_PADS(PAD_EIM_BCLK__GPIO6_IO31 | MUX_PAD_CTRL(NO_PAD_CTRL)), }; -static void cm_fx6_setup_issd(void) +static int cm_fx6_setup_issd(void) { - SETUP_IOMUX_PADS(sata_pads); - /* Make sure this gpio has logical 0 value */ + static bool init_done = false; + int ret; + int i; + + if (!init_done) { + 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; + init_done = true; + } + gpio_direction_output(CM_FX6_SATA_PWLOSS_INT, 0); udelay(100); cm_fx6_sata_power(0); mdelay(250); cm_fx6_sata_power(1); + + return 0; } #define CM_FX6_SATA_INIT_RETRIES 10 int sata_initialize(void) { - int err, i; + int err, i, ret; - cm_fx6_setup_issd(); + /* + * cm-fx6 may have iSSD not assembled and in this case it has + * bypasses for a (m)SATA socket on the baseboard. The socketed + * device is not controlled by those GPIOs. So just print a warning + * if the setup fails. + */ + ret = cm_fx6_setup_issd(); + if (ret) + printf("Warning: iSSD setup failed!\n"); for (i = 0; i < CM_FX6_SATA_INIT_RETRIES; i++) { err = setup_sata(); if (err) { @@ -183,9 +211,9 @@ static int cm_fx6_usb_hub_reset(void) int err; err = gpio_request(CM_FX6_USB_HUB_RST, "usb hub rst"); - if (err) { + if (err && err != -EBUSY) { printf("USB hub rst gpio request failed: %d\n", err); - return -1; + return err; } SETUP_IOMUX_PAD(PAD_SD3_RST__GPIO7_IO08 | MUX_PAD_CTRL(NO_PAD_CTRL)); @@ -199,13 +227,13 @@ static int cm_fx6_usb_hub_reset(void) static int cm_fx6_init_usb_otg(void) { - int ret; + int err; struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; - ret = gpio_request(SB_FX6_USB_OTG_PWR, "usb-pwr"); - if (ret) { - printf("USB OTG pwr gpio request failed: %d\n", ret); - return ret; + err = gpio_request(SB_FX6_USB_OTG_PWR, "usb-pwr"); + if (err && err != -EBUSY) { + printf("err OTG pwr gpio request failed: %d\n", err); + return err; } SETUP_IOMUX_PAD(PAD_EIM_D22__GPIO3_IO22 | MUX_PAD_CTRL(NO_PAD_CTRL)); @@ -340,12 +368,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..22ace2f 100644 --- a/board/compulab/cm_fx6/common.c +++ b/board/compulab/cm_fx6/common.c @@ -79,6 +79,18 @@ void cm_fx6_set_ecspi_iomux(void) int board_spi_cs_gpio(unsigned bus, unsigned cs) { - return (bus == 0 && cs == 0) ? (CM_FX6_ECSPI_BUS0_CS0) : -1; + if (bus != 0 || cs != 0) + return -EINVAL; + + /* 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 && ret != -EBUSY) + return ret; +#endif + + return CM_FX6_ECSPI_BUS0_CS0; } #endif