From patchwork Wed Dec 11 15:06:26 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: 181246 Delivered-To: patch@linaro.org Received: by 2002:ac9:44c4:0:0:0:0:0 with SMTP id t4csp920222och; Wed, 11 Dec 2019 07:25:41 -0800 (PST) X-Google-Smtp-Source: APXvYqw3f7ZVU4hH+y8RHZY/DUedwegmQGIsajjZWYM3p3zkwUqicIGa5x0o4+kYTuoQe7IcJlo/ X-Received: by 2002:a05:6808:1c5:: with SMTP id x5mr3331252oic.57.1576077941283; Wed, 11 Dec 2019 07:25:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576077941; cv=none; d=google.com; s=arc-20160816; b=AA5DYfZur73jdAw8u9IDT+VB13P0A9B6f07qrpRFogpIosPNzm9JyPrUR0MvPN75zC PFTgDhFSrKIjl5dXDL1/MAOAlgz8wwFWlnBLVhmnFDAnNBn4VYkEYVWWuzoD2CBRIxE0 Zaxfi3HmXDrGWjKPh6yQn+EMg5P6A5Q65VeCTQV7CICqJrP51dmtlRqGoD1+xh+WQ56Z e+4tZVeudiJBo/H5Z7cZv1L9WYAKbaxMryGby1BAMSEqdXo81moAul4tmBrvhumXtEQA vdghaBBjTQk9PHhhTl5YIypfmhR4jl1XaJeW46KRgjARIFgdD6Fqbu8Xr9lGZ6H02I3u OtJg== 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=FnzVuPcFjcaT21nHV+YQx20QJGV/0sQU658DpMH14/0=; b=OjSGs+qqSrryXj24aRD+tk/eoMrLW3RMyEVXTDe4WU3EpmPsCtmO9ZJy3cc1IuP6TD I1Bu2PD9Cp8BGD4rWhKgEktDoHp70Pwa2b5nJR30nld4jvpls2M8sHOydDcJQzDsMSnQ i20kpBINYb1jDEnPSnbFwLUdTDx8zqisxY8pU9QOfCO9runxpLOTFv5KslzmDfoFLyPp jyZ2ZdUoQsfqtny9ScW3uV9lmdSdQzY0h01qTa/78Lp2lliDe1qX8Xvy1Ac52Z0p2k3y bfNwAJgwurWM8ZVAGMJeMJaGdUiXQcn/A906dmeBgPRUqu7eyLgUB+30llnXDZEupY9P M8EA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RFb2k0vm; 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 z25si1303201oto.211.2019.12.11.07.25.38; Wed, 11 Dec 2019 07:25:41 -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=RFb2k0vm; 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 S1733018AbfLKPZe (ORCPT + 27 others); Wed, 11 Dec 2019 10:25:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:57694 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732782AbfLKPZb (ORCPT ); Wed, 11 Dec 2019 10:25:31 -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 78D26208C3; Wed, 11 Dec 2019 15:25:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077930; bh=8E4J7fMbM6LkudO+9F/RC+PJKcsy8gwUCsIbxesTyQ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RFb2k0vmyz09vCqUo4gd/tD+9uRb7n5sBuUm66mP6Kdsx/kItO2o41CYMNF/spmln UzpE0jk1U654vvXaYMuWyJTcp4kDmOup9n/PN33cM7iZO1yKP9pTjgiJeZLiD0nfwm 0iZc7xrssxMGGtB2FWvMLSQS7nRdf6/9VU7cOUn8= 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 4.19 224/243] arm64: dts: exynos: Revert "Remove unneeded address space mapping for soc node" Date: Wed, 11 Dec 2019 16:06:26 +0100 Message-Id: <20191211150354.452202223@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150339.185439726@linuxfoundation.org> References: <20191211150339.185439726@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>; @@ -235,7 +235,7 @@ compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; - ranges; + ranges = <0x0 0x0 0x0 0x18000000>; arm_a53_pmu { compatible = "arm,cortex-a53-pmu", "arm,armv8-pmuv3"; --- 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; @@ -70,7 +70,7 @@ compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; - ranges; + ranges = <0 0 0 0x18000000>; chipid@10000000 { compatible = "samsung,exynos4210-chipid";