From patchwork Wed Dec 11 15:05:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 181287 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp737580ile; Wed, 11 Dec 2019 08:12:33 -0800 (PST) X-Google-Smtp-Source: APXvYqyH+yk0fe1P2aQ+144cEHzMJVo9hYAGMJORkJ08oisOAVNn49nXj55mdhEfc3SeUKdcbXA4 X-Received: by 2002:a05:6830:22e2:: with SMTP id t2mr2906277otc.129.1576080752934; Wed, 11 Dec 2019 08:12:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576080752; cv=none; d=google.com; s=arc-20160816; b=uwL7nKVJAkwmz7OZrd5M84Uqatmvs7nraTkRAlT/wgx+wXzieqXcRoMpJdVWL+k7zX zUPU/EIYB/YQuGCNxirgKKTYx3M4zal5hpKYrBDfNaqvJVaOisdrkhnKY8v/jw7omy/6 3P+l6pIyg8HyW2zsI+gr7khaqcLPSCAXm3xc57NgPPD1qW/pMRFhlPGvylLoYWXIibdB 16kbiBGzB34forBCaKqDZ/HH56XskQa0XymxPICbYdKUY+bsQo1j3a6Fu+DEHxjNyo3j 71AafrOotMEpjpVt5e8fVOUDQ1oeMynLSV2EvzM5KkKGtCCjBu7Vw40ae/zNpZPu3k7h TPzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6P8OpsLBXVHpLA4zdv2eSAP8aKy4Kgl3aINFEeAC4L4=; b=CpUcQbvuod+BSwiOTMxxx/aoZR8Phq2owztMgpA3AdymGDtJ1oKT4Vi30+QSA2E7aR XWZp8w5jpIcM/YYnUETXffxqEM+TrfYlQz6FChHiXh3KXzejasmWcvLmsUsIFntvnoih SRB0z5g8M0U3JPJiDBkLfPeabCCOtREU+R+gAjm0PTa3LI3jQVRpQFoLGCE12GtQW0E6 uKvEhvHBIoHub1GVFXm0SRP8GKNe/xySgOMrc2loUT1CHCbodykF/Y0KH26F4Zeyyzy7 lsYHhMjhg0hV72BQAZHpOWT/g7j8mU3/coB6q1MaKs6bM/QcrlxhIucXGxQq1JYojH0S +3rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yYGsdJg4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p71si1420158oic.138.2019.12.11.08.12.32; Wed, 11 Dec 2019 08:12:32 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yYGsdJg4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730601AbfLKPJa (ORCPT + 27 others); Wed, 11 Dec 2019 10:09:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:57408 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729994AbfLKPJZ (ORCPT ); Wed, 11 Dec 2019 10:09:25 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BFAAE24658; Wed, 11 Dec 2019 15:09:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576076964; bh=ATBWun4wWF0hfWPoCuDAJUpd6PpKWorGF7fWEHv5zi8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yYGsdJg4JM0LQeLp595HCLSVUt7oZzX/AfTJERpfshakCAFRk306v9Wh7dAc43bTe +S1VQ7NCFQvN7wGes7L291WitMmDuqlGZJ1Qkvf+b/WPjk1TpJjxuddwFxgX7Gt7If zM7Lb7IStYFsnEJDKa9h4ariRYvwRx7xnv6aV538= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alim Akhtar , Marek Szyprowski , Krzysztof Kozlowski Subject: [PATCH 5.4 58/92] arm64: dts: exynos: Revert "Remove unneeded address space mapping for soc node" Date: Wed, 11 Dec 2019 16:05:49 +0100 Message-Id: <20191211150247.546562289@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150221.977775294@linuxfoundation.org> References: <20191211150221.977775294@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marek Szyprowski commit bed903167ae5b5532eda5d7db26de451bd232da5 upstream. Commit ef72171b3621 ("arm64: dts: exynos: Remove unneeded address space mapping for soc node") changed the address and size cells in root node from 2 to 1, but /memory nodes for the affected boards were not updated. This went unnoticed on Exynos5433-based TM2(e) boards, because they use u-boot, which updates /memory node to the correct values. On the other hand, the mentioned commit broke boot on Exynos7-based Espresso board, which bootloader doesn't touch /memory node at all. This patch reverts commit ef72171b3621 ("arm64: dts: exynos: Remove unneeded address space mapping for soc node"), so Exynos5433 and Exynos7 SoCs again matches other ARM64 platforms with 64bit mappings in root node. Reported-by: Alim Akhtar Fixes: ef72171b3621 ("arm64: dts: exynos: Remove unneeded address space mapping for soc node") Signed-off-by: Marek Szyprowski Cc: # 5.3.x: 72ddcf6aa224 arm64: dts: exynos: Move GPU under /soc node for Exynos5433 Cc: # 5.3.x: ede87c3a2bdb arm64: dts: exynos: Move GPU under /soc node for Exynos7 Cc: # 4.18.x Tested-by: Alim Akhtar Signed-off-by: Krzysztof Kozlowski Signed-off-by: Greg Kroah-Hartman --- arch/arm64/boot/dts/exynos/exynos5433.dtsi | 6 +++--- arch/arm64/boot/dts/exynos/exynos7.dtsi | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) --- a/arch/arm64/boot/dts/exynos/exynos5433.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433.dtsi @@ -18,8 +18,8 @@ / { compatible = "samsung,exynos5433"; - #address-cells = <1>; - #size-cells = <1>; + #address-cells = <2>; + #size-cells = <2>; interrupt-parent = <&gic>; @@ -311,7 +311,7 @@ compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; - ranges; + ranges = <0x0 0x0 0x0 0x18000000>; chipid@10000000 { compatible = "samsung,exynos4210-chipid"; --- a/arch/arm64/boot/dts/exynos/exynos7.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos7.dtsi @@ -12,8 +12,8 @@ / { compatible = "samsung,exynos7"; interrupt-parent = <&gic>; - #address-cells = <1>; - #size-cells = <1>; + #address-cells = <2>; + #size-cells = <2>; aliases { pinctrl0 = &pinctrl_alive; @@ -98,7 +98,7 @@ compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; - ranges; + ranges = <0 0 0 0x18000000>; chipid@10000000 { compatible = "samsung,exynos4210-chipid";