From patchwork Sat Jun 3 03:04:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 770715 X-Patchwork-Delegate: twarren@nvidia.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3wfmfB4bMhz9ryv for ; Sat, 3 Jun 2017 13:24:34 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="tHLhciEp"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id 3B969C21CDC; Sat, 3 Jun 2017 03:09:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 844F4C21C51; Sat, 3 Jun 2017 03:06:42 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 93F8DC21C62; Sat, 3 Jun 2017 03:05:30 +0000 (UTC) Received: from mail-oi0-f46.google.com (mail-oi0-f46.google.com [209.85.218.46]) by lists.denx.de (Postfix) with ESMTPS id BF01CC21C3C for ; Sat, 3 Jun 2017 03:05:26 +0000 (UTC) Received: by mail-oi0-f46.google.com with SMTP id h4so111828349oib.3 for ; Fri, 02 Jun 2017 20:05:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=qNDMHqgomt4g5KXKX6Rh1UjcF3J6QeWPna0Gq4eX4F8=; b=tHLhciEpPPdYDyRZeurPxOLDMfJsuCMS1NxWQdWq1khkjXMpxPFoF8Y5QuEF7K8IN6 e+C8vpS6yfUpQln6hbqKbWZIJzMlY9pCBIZhidkFXuO4OCIyHQOK5FYvPrMQ8wQVcqo2 ZLrxVP/byzVtpAPcwfKrX3MyHqPfbNtCM1zEhp8Uh9viYTfOWDC5Hr4VYzIX+3r0M6oE s7gRlq3QMhhvkpX2cKTsTtQyNZ4Fe23bIKPQtvSZO5HfmCmEVfmoSVMC+ufMXfM+K3NZ bUzX2xVr7FIPHTeTeiikoIW9IH32lpUFSao5Chgb4GjwURZG++GSC9hBl/qW7UWlQR3Z QWDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=qNDMHqgomt4g5KXKX6Rh1UjcF3J6QeWPna0Gq4eX4F8=; b=T1q3OFr737DfydUBzWCV8JEqPG0oo3lj6xs+DB+rSgN/S897n4TKHpty1aXZJL7BEg Qr49OssWA7va4ZQh4Rcs9iROw28XYuc2kxu7j9D1xDGD9wAwnBKgdqJSLjNmTdEp7MXn WtvxCTMDilF3amQSY+eP4k2Jr5c/vITpdpbrOGUxPmwzL1ERAwTwKjxvIlfXMeQH/RYB CXfWdeq2emdhtGuhfu8I9afURow5xUoxKGubprNZVIgCO3DEiWDsvNM3jVJLHR+kMj1z qo8CFpuLH3mz6dAnz6XbovkjyxbVQ4zHWe8PFWQxIbh5cBGtvWcX5rdYoCW2y+G6OxXU ak9g== X-Gm-Message-State: AKS2vOxNc837GjOULwU21y96eK6o52aIUn40DZ1l5LSSZT5QoTOTIdSu sAvcPiD09mJQAM6V X-Received: by 10.157.25.21 with SMTP id j21mr1756732ota.168.1496459125522; Fri, 02 Jun 2017 20:05:25 -0700 (PDT) Received: from kaki.bld.corp.google.com ([2620:0:10f2:12:35ab:5c4c:1c78:ccbc]) by smtp.gmail.com with ESMTPSA id z23sm2000738otz.11.2017.06.02.20.05.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Jun 2017 20:05:24 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 5D2B14013F; Fri, 2 Jun 2017 21:05:24 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Fri, 2 Jun 2017 21:04:16 -0600 Message-Id: <20170603030426.16107-22-sjg@chromium.org> X-Mailer: git-send-email 2.13.0.506.g27d5fe0cd-goog In-Reply-To: <20170603030426.16107-1-sjg@chromium.org> References: <20170603030426.16107-1-sjg@chromium.org> Cc: Tom Rini , Stephen Warren , Marcel Ziswiler , Tom Warren Subject: [U-Boot] [PATCH v2 21/31] dm: tegra: mmc: Convert to livetree X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Update the tegra mmc driver to support a live device tree. Signed-off-by: Simon Glass --- Changes in v2: None drivers/mmc/tegra_mmc.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c index 338e42b528..9f7e7195f1 100644 --- a/drivers/mmc/tegra_mmc.c +++ b/drivers/mmc/tegra_mmc.c @@ -11,10 +11,10 @@ #include #include #include +#include #include #include #include -#include DECLARE_GLOBAL_DATA_PTR; @@ -599,8 +599,7 @@ static int tegra_mmc_probe(struct udevice *dev) cfg->name = dev->name; - bus_width = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), - "bus-width", 1); + bus_width = dev_read_u32_default(dev, "bus-width", 1); cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195; cfg->host_caps = 0; @@ -621,7 +620,7 @@ static int tegra_mmc_probe(struct udevice *dev) cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT; - priv->reg = (void *)devfdt_get_addr(dev); + priv->reg = (void *)dev_read_addr(dev); ret = reset_get_by_name(dev, "sdhci", &priv->reset_ctl); if (ret) { @@ -648,12 +647,10 @@ static int tegra_mmc_probe(struct udevice *dev) return ret; /* These GPIOs are optional */ - gpio_request_by_name(dev, "cd-gpios", 0, &priv->cd_gpio, - GPIOD_IS_IN); - gpio_request_by_name(dev, "wp-gpios", 0, &priv->wp_gpio, - GPIOD_IS_IN); - gpio_request_by_name(dev, "power-gpios", 0, - &priv->pwr_gpio, GPIOD_IS_OUT); + gpio_request_by_name(dev, "cd-gpios", 0, &priv->cd_gpio, GPIOD_IS_IN); + gpio_request_by_name(dev, "wp-gpios", 0, &priv->wp_gpio, GPIOD_IS_IN); + gpio_request_by_name(dev, "power-gpios", 0, &priv->pwr_gpio, + GPIOD_IS_OUT); if (dm_gpio_is_valid(&priv->pwr_gpio)) dm_gpio_set_value(&priv->pwr_gpio, 1);