From patchwork Thu May 24 06:53:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 919621 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="la6NykuO"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40s0Vj0Mbbz9s29 for ; Thu, 24 May 2018 16:54:37 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935552AbeEXGyJ (ORCPT ); Thu, 24 May 2018 02:54:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:60662 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935515AbeEXGyH (ORCPT ); Thu, 24 May 2018 02:54:07 -0400 Received: from PC-kkoz.proceq.com (unknown [213.160.61.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9934C20883; Thu, 24 May 2018 06:54:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527144846; bh=R1/4IZ3F1kpQqU9kBt4omw9bgw2rDp34bJQ4yhMvPzk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=la6NykuOtkd6Aie3SFoTAxRNEftMp2xe7lPhKi1UGkUDI93C7whsM864DIkLlx24F zI59ph3waKKZ6JFLCBDQ1fhgr56Qr3uEQdRQvtx7wlbUgNWSaYjAzcGR6OCrL+wLGx rFhLqqHd52K8v+S8l6AQLJf3qB1/d1yPSmIDhY/U= From: Krzysztof Kozlowski To: Rob Herring , Mark Rutland , Thierry Reding , Jonathan Hunter , devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Marcel Ziswiler , Stefan Agner , Lucas Stach , Krzysztof Kozlowski Subject: [PATCH v7 4/4] ARM: dts: tegra: Work safely with 256 MB Colibri-T20 modules Date: Thu, 24 May 2018 08:53:53 +0200 Message-Id: <1527144833-24285-4-git-send-email-krzk@kernel.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1527144833-24285-1-git-send-email-krzk@kernel.org> References: <1527144833-24285-1-git-send-email-krzk@kernel.org> Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Colibri-T20 can come in 256 MB RAM (with 512 MB NAND) or 512 MB RAM (with 1024 MB NAND) flavors. Both of them will use the same DTSI expecting the bootloader to do the fixup of /memory node. However in case it does not happen, let's stay on safe side by limiting the memory to 256 MB for both versions of Colibri-T20. Rename to remove the unnecessary memory size from the device tree file name. While at it, also follow the typical Toradex SoC, module, carrier board hierarchy. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Stefan Agner Tested-by: Stefan Agner --- RFT: Not tested on 512 MB module as I have only the 256 MB one. Changes since v6: 1. Only adjust commit msg. Changes since v5: 1. Add "colibri" suffix to iris DTS (suggested by Stefan). Changes since v4: 1. Drop the 512 suffix from file names (suggested by Stefan). Changes since v3: 1. Reduce the memory in existing DTSI instead of creating a new one (suggested by Marcel). Changes since v2: 1. Do not add new compatible but use everywhere existing "toradex,colibri_t20-512" (suggested by Rob). Changes since v1: 1. Fix memory size in tegra20-colibri-256.dtsi (was working fine because my bootloader uses mem= argument). --- arch/arm/boot/dts/Makefile | 2 +- .../boot/dts/{tegra20-iris-512.dts => tegra20-colibri-iris.dts} | 4 ++-- .../boot/dts/{tegra20-colibri-512.dtsi => tegra20-colibri.dtsi} | 9 +++++++-- 3 files changed, 10 insertions(+), 5 deletions(-) rename arch/arm/boot/dts/{tegra20-iris-512.dts => tegra20-colibri-iris.dts} (95%) rename arch/arm/boot/dts/{tegra20-colibri-512.dtsi => tegra20-colibri.dtsi} (98%) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index ec2024ea8b1e..1c8bb55c0948 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1030,7 +1030,7 @@ dtb-$(CONFIG_ARCH_TANGO) += \ tango4-vantage-1172.dtb dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \ tegra20-harmony.dtb \ - tegra20-iris-512.dtb \ + tegra20-colibri-iris.dtb \ tegra20-medcom-wide.dtb \ tegra20-paz00.dtb \ tegra20-plutux.dtb \ diff --git a/arch/arm/boot/dts/tegra20-iris-512.dts b/arch/arm/boot/dts/tegra20-colibri-iris.dts similarity index 95% rename from arch/arm/boot/dts/tegra20-iris-512.dts rename to arch/arm/boot/dts/tegra20-colibri-iris.dts index 40126388946d..57f16c0e9917 100644 --- a/arch/arm/boot/dts/tegra20-iris-512.dts +++ b/arch/arm/boot/dts/tegra20-colibri-iris.dts @@ -1,10 +1,10 @@ // SPDX-License-Identifier: GPL-2.0 /dts-v1/; -#include "tegra20-colibri-512.dtsi" +#include "tegra20-colibri.dtsi" / { - model = "Toradex Colibri T20 512MB on Iris"; + model = "Toradex Colibri T20 256/512 MB on Iris"; compatible = "toradex,iris", "toradex,colibri_t20-512", "nvidia,tegra20"; aliases { diff --git a/arch/arm/boot/dts/tegra20-colibri-512.dtsi b/arch/arm/boot/dts/tegra20-colibri.dtsi similarity index 98% rename from arch/arm/boot/dts/tegra20-colibri-512.dtsi rename to arch/arm/boot/dts/tegra20-colibri.dtsi index 5623ff8d128c..dc06b23183e1 100644 --- a/arch/arm/boot/dts/tegra20-colibri-512.dtsi +++ b/arch/arm/boot/dts/tegra20-colibri.dtsi @@ -2,7 +2,7 @@ #include "tegra20.dtsi" / { - model = "Toradex Colibri T20 512MB"; + model = "Toradex Colibri T20 256/512 MB"; compatible = "toradex,colibri_t20-512", "nvidia,tegra20"; aliases { @@ -11,7 +11,12 @@ }; memory@0 { - reg = <0x00000000 0x20000000>; + /* + * Set memory to 256 MB to be safe as this could be used on + * 256 or 512 MB module. It is expected from bootloader + * to fix this up for 512 MB version. + */ + reg = <0x00000000 0x10000000>; }; host1x@50000000 {