From patchwork Thu Aug 3 13:16:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 797213 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xNVsq5kxyz9s7v for ; Thu, 3 Aug 2017 23:15:26 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 8085EC21D57; Thu, 3 Aug 2017 13:15:16 +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 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 BDD22C21C51; Thu, 3 Aug 2017 13:15:13 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 801E7C21C51; Thu, 3 Aug 2017 13:15:12 +0000 (UTC) Received: from mail-yw0-f195.google.com (mail-yw0-f195.google.com [209.85.161.195]) by lists.denx.de (Postfix) with ESMTPS id 6A582C21C2F for ; Thu, 3 Aug 2017 13:15:10 +0000 (UTC) Received: by mail-yw0-f195.google.com with SMTP id n83so782870ywn.3 for ; Thu, 03 Aug 2017 06:15:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=qbNXSnZQwal0OHjozkFBV6p+IBrqsT5okCH/EqwnI+U=; b=uELb2U+P1xOZGJu1wyBiZ1mr4zAxkMIhZxnCYHrsYaiR4ytHZVjBXSG47fKbZk4vUR PulXQ6aX6sZD/wlY0SkwZtvGAW56AXSA3QXskoOGpfKB0R/9PKtX+wdRWh2t9BWmj/kv HL8yGVbkWC4e+WMYmmKq5kuQtn3hE+XFGTNT/Pb8j4P0AcPkISuH+obF8k1+tBMSy/zK TyNyyLhfw9SvnNQ6h73uBU7+mwJNZy75O3kqhhbnjzLydOMF+82DKVhdAvD0JQe5nRo/ LX5Pou02fzpATXuAI1MiyIfDPL7HCIe6wP8+zW5/psIXVcAqTP9UcsGg9OstLS9K9IOa eIdQ== X-Gm-Message-State: AIVw112gTev/YNfefyW0MwfVsu7c9VqAESKjyrRq1ZemYP3Y9HFsKFdF dGkpxRTtI/H4J39M X-Received: by 10.129.108.84 with SMTP id h81mr1146320ywc.474.1501766108940; Thu, 03 Aug 2017 06:15:08 -0700 (PDT) Received: from localhost.localdomain (cpe-174-106-0-58.ec.res.rr.com. [174.106.0.58]) by smtp.gmail.com with ESMTPSA id l190sm4635884ywf.91.2017.08.03.06.15.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 Aug 2017 06:15:08 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Thu, 3 Aug 2017 09:16:36 -0400 Message-Id: <1501766196-5568-1-git-send-email-trini@konsulko.com> X-Mailer: git-send-email 1.9.1 Subject: [U-Boot] [PATCH] qemu-ppce500: Update get_phys_ccsrbar_addr_early() 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" The logic of what fdt_get_base_address() will search for and return has changed. Rework get_phys_ccsrbar_addr_early() to perform the logic that fdt_get_base_address used to perform. Fixes: 336a44877af8 ("fdt: Correct fdt_get_base_address()") Cc: Simon Glass Cc: Alexander Graf Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- board/freescale/qemu-ppce500/qemu-ppce500.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c index 6cb5692eda6e..0c65ec72d209 100644 --- a/board/freescale/qemu-ppce500/qemu-ppce500.c +++ b/board/freescale/qemu-ppce500/qemu-ppce500.c @@ -50,13 +50,19 @@ uint64_t get_phys_ccsrbar_addr_early(void) { void *fdt = get_fdt_virt(); uint64_t r; + int size, node; + u32 naddr; + const fdt32_t *prop; /* * To be able to read the FDT we need to create a temporary TLB * map for it. */ map_fdt_as(10); - r = fdt_get_base_address(fdt, fdt_path_offset(fdt, "/soc")); + node = fdt_path_offset(fdt, "/soc"); + naddr = fdt_address_cells(fdt, node); + prop = fdt_getprop(fdt, node, "ranges", &size); + r = fdt_translate_address(fdt, node, prop + naddr); disable_tlb(10); return r;