From patchwork Wed May 10 14:21:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 760683 X-Patchwork-Delegate: sjg@chromium.org 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 3wNKSt1K4Qz9s7f for ; Thu, 11 May 2017 01:11:26 +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="S0dMVFk+"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id B458BC21E5D; Wed, 10 May 2017 14:48:09 +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_H2, 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 4DFF8C21D02; Wed, 10 May 2017 14:33:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 16FF3C21D02; Wed, 10 May 2017 14:24:41 +0000 (UTC) Received: from mail-oi0-f44.google.com (mail-oi0-f44.google.com [209.85.218.44]) by lists.denx.de (Postfix) with ESMTPS id 6D0B2C21D75 for ; Wed, 10 May 2017 14:24:24 +0000 (UTC) Received: by mail-oi0-f44.google.com with SMTP id w10so37382958oif.0 for ; Wed, 10 May 2017 07:24:24 -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=1Be4LpDLEZxUWfRUXMWlzbAA0okvOO1vkmB5OgmOTOQ=; b=S0dMVFk+RBTmdALSeFnqoUn2/feBHWZy46CEW1nDFM9vhABPgwAgWZJzwKEpL0j/dY zSS69QDmjnw38b8hxrEESHwa1xmxLHaQUKgEGvn04in/CpQ7NW/e6NOUPSIMd7i19Be0 Uzz8NT/TDb2v6Wp6oZr6m6QOifwXCCkrxd0hifn3LOYTVOQYTwUAwsazMhoZx7OzuRJB qR3hcoCbsd5I2s7PgxjM5BMhEIx3erhBf3qtNOV11YWSGxmjlU6j6MHsXgLJjrjPg5R1 JAyEzVgi6CDHWcL8YQhJA7x+iSsvLxgl6fBancX2p2J59bjVkdJIq2DRN0ZMVHBitoTD tiqQ== 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=1Be4LpDLEZxUWfRUXMWlzbAA0okvOO1vkmB5OgmOTOQ=; b=uAmNmV/+PEXKDYO3z4g77992P1dUWboetA04aFdL9u2Bq4AbgbxJpbTucmeBylJKes +TYl/fH4zteipVBf8VUQbaUCvYWN4i1WzD64O8608aw2FnuSSEsMz/QYSmms014lpaqN JInvW34D+ypgQRg8pKBpb6gfkGBsxf3wXzYX+bFgT0W2ojh4bk77CODq0oSylwh7x7Rt l12zsXu9yTA4NGATKo7kf/iLb32B31SDXSO8blxjO3bTCReGbvzjVU/V42DzMtfdOtN0 7wdtvkBFrN8X3tjIiiNfz8stcD2/7SJdXcJ+EDmezikChdIhUfsyC2zaug8hV8aNz6sx 0N2w== X-Gm-Message-State: AODbwcAMBQ1AWYCQ6YxXyPjwjfFoJERWi/cwlHZLSEXMhkaqqZ+iLG+E 2u2Qb1VvBjhe2lrH X-Received: by 10.202.88.194 with SMTP id m185mr1804774oib.159.1494426263210; Wed, 10 May 2017 07:24:23 -0700 (PDT) Received: from kaki.bld.corp.google.com ([100.100.184.96]) by smtp.gmail.com with ESMTPSA id 5sm1556565oie.12.2017.05.10.07.24.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 May 2017 07:24:22 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 7472340550; Wed, 10 May 2017 08:24:21 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 10 May 2017 08:21:45 -0600 Message-Id: <20170510142150.30515-67-sjg@chromium.org> X-Mailer: git-send-email 2.13.0.rc2.291.g57267f2277-goog In-Reply-To: <20170510142150.30515-1-sjg@chromium.org> References: <20170510142150.30515-1-sjg@chromium.org> Cc: Tom Rini , Stephen Warren Subject: [U-Boot] [PATCH v2 66/71] dm: spi-flash: Convert uclass 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 SPI flash uclass to support a live device tree. Signed-off-by: Simon Glass --- Changes in v2: None drivers/mtd/spi/spi_flash.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index ab7910bc14..0034a28d5f 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -914,14 +914,13 @@ static int set_quad_mode(struct spi_flash *flash, } #if CONFIG_IS_ENABLED(OF_CONTROL) -int spi_flash_decode_fdt(const void *blob, struct spi_flash *flash) +int spi_flash_decode_fdt(struct spi_flash *flash) { #ifdef CONFIG_DM_SPI_FLASH fdt_addr_t addr; fdt_size_t size; - int node = dev_of_offset(flash->dev); - addr = fdtdec_get_addr_size(blob, node, "memory-map", &size); + addr = dev_read_addr_size(flash->dev, "memory-map", &size); if (addr == FDT_ADDR_T_NONE) { debug("%s: Cannot decode address\n", __func__); return 0; @@ -1081,7 +1080,7 @@ int spi_flash_scan(struct spi_flash *flash) #endif #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) - ret = spi_flash_decode_fdt(gd->fdt_blob, flash); + ret = spi_flash_decode_fdt(flash); if (ret) { debug("SF: FDT decode error\n"); return -EINVAL;