From patchwork Wed Dec 11 15:06:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 181231 Delivered-To: patch@linaro.org Received: by 2002:ac9:44c4:0:0:0:0:0 with SMTP id t4csp905879och; Wed, 11 Dec 2019 07:14:21 -0800 (PST) X-Google-Smtp-Source: APXvYqz8JMuKMLU3pFmG682bTpXHSm5M3yOx2FhnUKI3J3FCJf0K7OhchN9CfI34s+IOM3ULNuK2 X-Received: by 2002:aca:dc04:: with SMTP id t4mr3011455oig.51.1576077261178; Wed, 11 Dec 2019 07:14:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576077261; cv=none; d=google.com; s=arc-20160816; b=cxUYj4B5/B6CDK+A+1pPZVzaN4AE35foCwB7IAJE/bhztkiFQ0Za3YWNjsY3TIJDxX 7gNR0GlzJwrduaxVZBCVS1MvXqzejgCztnXtcEiy8m4iF0UJt46XDDE7HJjNseUMGvpC 2ESe/+1RB/p7ycDDNKF1+C2As3bgWlwR0dReJoqae7ZPE2kQuyYQhm02f7PcNG4GHUhk JJCa9Q4CbfwLzLfYA+8yCpKBi1DpgeiU6Gb6X42XQf/LdVFPIKWkwHr5WnAb6DI7s9m7 MDVpnfxd3K2/tBQNk2EzWKtjS/lIerWZJ1RB6CbNeB5eICchhGgfEtv7wYAg0ckmJBka GqoA== 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=G249adbqBI/lJgxXm3T8JvFAkHHfCS4qT7dtGqxUiTMwOyqa65+rpUlSv9yTOsoQ0q P1uxJ46PRePrP2Dh+pO3y+krzXrWyTpgsRCz7A36OYOorVZh6K7YyC6Jqdezx8F8DGW4 GSQgfT1yOCvpOxHJyvmrebvAjcUTjH6MYacuZvRF/bKAxEzDc+cgKUAVvbo+I8z0P3pU d7kY/FxYmnx+skgpluKFQ96C5tCejQ+zMNzQcf1dET5kufUpxb6cem9C75eHvlN6tpHs v7TJekYXBbiFRbtd9mVfsIWWVa//dJELlbLFxxDnaLZhtzPivjAbsNNGCbDOAF/TUltL R+OA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=LDB38Z+H; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 17si1268768oix.71.2019.12.11.07.14.20; Wed, 11 Dec 2019 07:14:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=LDB38Z+H; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731610AbfLKPOT (ORCPT + 14 others); Wed, 11 Dec 2019 10:14:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:39502 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730534AbfLKPOS (ORCPT ); Wed, 11 Dec 2019 10:14:18 -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 835942465B; Wed, 11 Dec 2019 15:14:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077258; bh=ATBWun4wWF0hfWPoCuDAJUpd6PpKWorGF7fWEHv5zi8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LDB38Z+H8y9cFq6GBgIjtkvw0ekc8yXfBr/5Oqopq36CGvP9Aj3QrOoyHP/hyGaRI fli3aoSz4Y1cECluJSffgNvlW8P1nd/Ha4N10UkU+Y1Bzfov6hN44rYBiSZuslv1MY gmZtIByaYyYJXNg8LPC3ArqS5Vq0A5JDng/mPxdA= 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.3 075/105] arm64: dts: exynos: Revert "Remove unneeded address space mapping for soc node" Date: Wed, 11 Dec 2019 16:06:04 +0100 Message-Id: <20191211150253.971364995@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150221.153659747@linuxfoundation.org> References: <20191211150221.153659747@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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";