From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E4B11C678D4 for ; Fri, 3 Mar 2023 00:15:36 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 97F2D85D0E; Fri, 3 Mar 2023 01:15:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="D12194GP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 45BE085CD7; Fri, 3 Mar 2023 01:15:31 +0100 (CET) Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 96C0A85CCE for ; Fri, 3 Mar 2023 01:15:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jbx6244@gmail.com Received: by mail-ed1-x535.google.com with SMTP id o15so3747687edr.13 for ; Thu, 02 Mar 2023 16:15:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677802527; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=Hp9aDPYZ+kbKRrJGuBBvrps7sSzkULrBTixYlLomVOQ=; b=D12194GPaecf9xtq0kHsIdQG370HXZ+0Wtxhrpxyz1E943X98GQxnrkkvv6BFk1zEr gLpYkCDBGI2EpNZaZbnnSE224D2LMlok1PPYOutjL+npynneWhv45eumGMh3NoRmqf6q 4IWJDl1AdYzZNJD3ChNd9qxofW3+w7e+eMQS5Y1jnxX8AMe5l64QG4SZSKbfd+LgnMlK dtpL05gfHUuXVZHdqbkIShmB7qOKVaYoZ1DoGI4GBXNpENt8MOrdTr+i63S+7O7igkPk hk9FuDq2qstFDh1BEq9yICXiglW4pmFBdHOkervpLXWw1csxGNat2ryPhuJtW3B3Um0D sVXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677802527; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Hp9aDPYZ+kbKRrJGuBBvrps7sSzkULrBTixYlLomVOQ=; b=L8MgUb4I/FSmCRUfOVSwt7jB2DBJZes73gZjkg3t+YKQlsj4CzbhGz+Ci+r0ChVBvG 0yPJkeHmV+7GNf4NyaIUN+dPLsG7X/O5YBgWaOrkHY5tdZzaJo/a8v/IHk6KOIDOuGAi jZ/C3d3j5ZPhllhJB3mDG3K4UIEY2bFQJvO8ItWem0elURuJ/ka85qmhS9iS5CvJCFkh g4xORv7zcYTHbFmLTxm8YJFQUR//QulOvCkrWfHHHJCQWcx4hw57FQvmp1K1vbbvlab+ Bvjz7r/IpTrS16NIbNAY0XNrDs1YJ50lewWvNmrhKfY1n6yCKCW7ddoEZbbJFsA5T/SK rZWg== X-Gm-Message-State: AO0yUKVe9aGQ7gObGfsGWsSuSCpxb6A6nCMhkM2PlqEdjlEHAauNcQ3J F9tXkwnz78NkuvbQOoJtqFDvgBHYKAI= X-Google-Smtp-Source: AK7set8i451obi32ZD23WRTCBfYXg6Nin+5qkFiaMGDMoyDnnyfthw3jyGEPCOxBg50CtXvv4ryjXQ== X-Received: by 2002:a05:6402:690:b0:4ad:7301:fe77 with SMTP id f16-20020a056402069000b004ad7301fe77mr138134edy.9.1677802527256; Thu, 02 Mar 2023 16:15:27 -0800 (PST) Received: from [192.168.2.1] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id z19-20020a50cd13000000b004bd1fe2cc02sm479872edi.16.2023.03.02.16.15.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 02 Mar 2023 16:15:26 -0800 (PST) Message-ID: <126b092f-1739-6cea-97ef-abbdaa28a628@gmail.com> Date: Fri, 3 Mar 2023 01:15:26 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 From: Johan Jonker Subject: [PATCH v6 14/22] spi: spi-aspeed-smc: use devfdt_get_addr_index_ptr To: dario.binacchi@amarulasolutions.com, michael@amarulasolutions.com, sjg@chromium.org, philipp.tomsich@vrull.eu, kever.yang@rock-chips.com Cc: u-boot@lists.denx.de, yifeng.zhao@rock-chips.com References: <7256f237-4b7b-f7d7-834f-f7c3fb8984d7@gmail.com> Content-Language: en-US In-Reply-To: <7256f237-4b7b-f7d7-834f-f7c3fb8984d7@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean The fdt_addr_t and phys_addr_t size have been decoupled. A 32bit CPU can expect 64-bit data from the device tree parser, so use devfdt_get_addr_index_ptr and devfdt_get_addr_size_index_ptr function in the spi-aspeed-smc.c file. Also fix dev_dbg to be able to handle both sizes. Signed-off-by: Johan Jonker Reviewed-by: Michael Trimarchi --- Changed V6: use -EINVAL on return --- drivers/spi/spi-aspeed-smc.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/spi/spi-aspeed-smc.c b/drivers/spi/spi-aspeed-smc.c index 4b6ea9f8..39620310 100644 --- a/drivers/spi/spi-aspeed-smc.c +++ b/drivers/spi/spi-aspeed-smc.c @@ -1125,17 +1125,16 @@ static int apseed_spi_of_to_plat(struct udevice *bus) int ret; struct clk hclk; - priv->regs = (void __iomem *)devfdt_get_addr_index(bus, 0); - if ((u32)priv->regs == FDT_ADDR_T_NONE) { + priv->regs = devfdt_get_addr_index_ptr(bus, 0); + if (!priv->regs) { dev_err(bus, "wrong ctrl base\n"); - return -ENODEV; + return -EINVAL; } - plat->ahb_base = - (void __iomem *)devfdt_get_addr_size_index(bus, 1, &plat->ahb_sz); - if ((u32)plat->ahb_base == FDT_ADDR_T_NONE) { + plat->ahb_base = devfdt_get_addr_size_index_ptr(bus, 1, &plat->ahb_sz); + if (!plat->ahb_base) { dev_err(bus, "wrong AHB base\n"); - return -ENODEV; + return -EINVAL; } plat->max_cs = dev_read_u32_default(bus, "num-cs", ASPEED_SPI_MAX_CS); @@ -1151,8 +1150,8 @@ static int apseed_spi_of_to_plat(struct udevice *bus) plat->hclk_rate = clk_get_rate(&hclk); clk_free(&hclk); - dev_dbg(bus, "ctrl_base = 0x%x, ahb_base = 0x%p, size = 0x%lx\n", - (u32)priv->regs, plat->ahb_base, plat->ahb_sz); + dev_dbg(bus, "ctrl_base = 0x%x, ahb_base = 0x%p, size = 0x%llx\n", + (u32)priv->regs, plat->ahb_base, (fdt64_t)plat->ahb_sz); dev_dbg(bus, "hclk = %dMHz, max_cs = %d\n", plat->hclk_rate / 1000000, plat->max_cs); -- 2.20.1