Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp9082258pxu; Mon, 28 Dec 2020 06:12:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJxd89s9h5Vo+IxuZcA5Njtv9DhR7lfZUnUBZ870O6CQXkW1wKpb7yr0MpqWkk4zD7Eo4lOM X-Received: by 2002:aa7:c652:: with SMTP id z18mr40839958edr.60.1609164754300; Mon, 28 Dec 2020 06:12:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609164754; cv=none; d=google.com; s=arc-20160816; b=M8Norljq5IntlREQydGn9aOqDZ7/XIkIqvCvRiAB+2TpO8PSMsFHm0e5L7XM2HRdt0 c/7AKgaR2tBNIjkqkT6bsFaBMY1EFNT/15Vs3bvGel4lRg1FNP40Qa80DTN8np4G6s9L ngweT5fqVP+XTRGq1CAtmC9ckgqkf9/WBhuq7HrOL1LDdZCp99GypX0Q4YoG/0cG3/AM bXiJlZkiHU8n5mmp6VRZHGiiT3n+Dch/kDFuH1tSRqi4GPiVeK7IgkIpPe+iyPmvqQ6b 3TBVLaZrRQJ6xpRdSdGeI8brIqJoX24i7n6sqxUOWyNHOiFa2N+QLkdr35N9XSE+dY6x IWkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JtfvpZBTKyR1IPOlov9B4ZagCsXbzqEn5WcRkZexakA=; b=x1XUNkcQGe2UXraOWicxPwkW8SCF+AnDzuB51ulIPPErPCzbE8KFgEA/dXY7Noli51 OGc3hGWWGD277Zu5c1+H/obTchnQGRnKLAYj39z8MAgRShmBIKrtxxDLL6u6W5BRi2zh rdfaALmcsAmzyoWlD5Wja+TqUSogjj6gW0mRLiTPvNBSE65A0xMQTYlamaeq8i/WcAN0 Yx4CcXSDXA8xLzVY/gDPw/en8j3VonRcH/bDNk65c3lsMT9ZuZKNDP4FK2yqE0rkig5T 9zoZDNhTnQ0qMrzKgbgWxiAaeFgO+3s4eaIOeNzloifDXSdqiBjiQ0fyfqZcyeXY1PFB dMRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iYmRoqlc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r16si18071406ejz.602.2020.12.28.06.12.10; Mon, 28 Dec 2020 06:12:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iYmRoqlc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2438280AbgL1OHA (ORCPT + 99 others); Mon, 28 Dec 2020 09:07:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:40644 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2438029AbgL1OGY (ORCPT ); Mon, 28 Dec 2020 09:06:24 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id EFB9A207A9; Mon, 28 Dec 2020 14:06:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609164369; bh=7B47ai8sYwauPVyYhXwlNmoEeyJWD5rh9gC77CHmxmE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iYmRoqlcCHDCOZAe7hRwLX3S5U49CfvAZBzh1mQiI2tWggYgRG4NKzpz9Xug/t8E6 SAH9cZeIz3l6wPctQqJBZqxfeg+1WiazZHk0ekD2OCbNQWJwXDJFNmbJ8KeBGSoUan SgsamiW/sy2T035L6RlgqmLez7N6cfX/hM1j+JGw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andrew Jeffery , Joel Stanley , Sasha Levin Subject: [PATCH 5.10 157/717] ARM: dts: tacoma: Fix node vs reg mismatch for flash memory Date: Mon, 28 Dec 2020 13:42:35 +0100 Message-Id: <20201228125028.478760586@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228125020.963311703@linuxfoundation.org> References: <20201228125020.963311703@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrew Jeffery [ Upstream commit cbee028da69d31cb927142e2828710de55a49f2a ] The mismatch lead to a miscalculation of regions in another patch, and shouldn't be mismatched anyway, so make them consistent. Fixes: 575640201e66 ("ARM: dts: aspeed: tacoma: Use 64MB for firmware memory") Signed-off-by: Andrew Jeffery Reviewed-by: Joel Stanley Link: https://lore.kernel.org/r/20201022014731.2035438-2-andrew@aj.id.au Signed-off-by: Joel Stanley Signed-off-by: Sasha Levin --- arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts index 4d070d6ba09f9..e86c22ce6d123 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts @@ -26,7 +26,7 @@ #size-cells = <1>; ranges; - flash_memory: region@ba000000 { + flash_memory: region@b8000000 { no-map; reg = <0xb8000000 0x4000000>; /* 64M */ }; -- 2.27.0