From patchwork Thu May 24 06:53:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 919622 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="NtSDrF6a"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40s0Vn4jPBz9s29 for ; Thu, 24 May 2018 16:54:41 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935604AbeEXGyE (ORCPT ); Thu, 24 May 2018 02:54:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:60498 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935582AbeEXGyA (ORCPT ); Thu, 24 May 2018 02:54:00 -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 9BDA220882; Thu, 24 May 2018 06:53:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527144839; bh=qYla/ucLX5/aF1Tepiz5WOeq31FAxvzbk4YogWy79NU=; h=From:To:Cc:Subject:Date:From; b=NtSDrF6auvP4Iz/0nycAdmdAZLQFPXPMIVX3rKQVJiqrqKGLGs5OPx0S63Fcjk8jm 3KR9IC5MTHD3vyXcghyGR7WSKGP/fWKeeYVFm/u4rP66a0+uiZTTjJhkUkCXQ8lWZz NiStbMhheIrl/MRJe9mWlWXfCZBv8HgdOa8IjVME= 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 1/4] ARM: dts: tegra: Remove usage of deprecated skeleton.dtsi Date: Thu, 24 May 2018 08:53:50 +0200 Message-Id: <1527144833-24285-1-git-send-email-krzk@kernel.org> X-Mailer: git-send-email 2.7.4 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Remove the usage of skeleton.dtsi because it was deprecated since commit 9c0da3cc61f1 ("ARM: dts: explicitly mark skeleton.dtsi as deprecated"). It also allows later to fix DTC warnings for missing unit name in /memory nodes. The /chosen and /aliases nodes are added only when dependent DTSes do not define them. Compiled DTB is the same as before this commit. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Stefan Agner --- Changes since v6: 1. Add Stefan's reviewed-by tag. Changes since v5: 1. New patch, split with skeleton.dtsi removal (suggested by Stefan). --- arch/arm/boot/dts/tegra114.dtsi | 8 ++++++-- arch/arm/boot/dts/tegra124.dtsi | 6 ++++-- arch/arm/boot/dts/tegra20.dtsi | 11 +++++++++-- arch/arm/boot/dts/tegra30-apalis.dtsi | 4 ++++ arch/arm/boot/dts/tegra30.dtsi | 11 +++++++++-- 5 files changed, 32 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi index 0e4a13295d8a..27ef515e5640 100644 --- a/arch/arm/boot/dts/tegra114.dtsi +++ b/arch/arm/boot/dts/tegra114.dtsi @@ -5,11 +5,15 @@ #include #include -#include "skeleton.dtsi" - / { compatible = "nvidia,tegra114"; interrupt-parent = <&lic>; + #address-cells = <1>; + #size-cells = <1>; + + memory { + device_type = "memory"; + }; host1x@50000000 { compatible = "nvidia,tegra114-host1x", "simple-bus"; diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi index 174092bfac90..951feea784af 100644 --- a/arch/arm/boot/dts/tegra124.dtsi +++ b/arch/arm/boot/dts/tegra124.dtsi @@ -7,14 +7,16 @@ #include #include -#include "skeleton.dtsi" - / { compatible = "nvidia,tegra124"; interrupt-parent = <&lic>; #address-cells = <2>; #size-cells = <2>; + memory { + device_type = "memory"; + }; + pcie@1003000 { compatible = "nvidia,tegra124-pcie"; device_type = "pci"; diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi index 0a7136462a1a..88dd1afb5877 100644 --- a/arch/arm/boot/dts/tegra20.dtsi +++ b/arch/arm/boot/dts/tegra20.dtsi @@ -4,11 +4,18 @@ #include #include -#include "skeleton.dtsi" - / { compatible = "nvidia,tegra20"; interrupt-parent = <&lic>; + #address-cells = <1>; + #size-cells = <1>; + + chosen { }; + aliases { }; + + memory { + device_type = "memory"; + }; iram@40000000 { compatible = "mmio-sram"; diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi index d1d21ec2a844..6f29cbad6e8a 100644 --- a/arch/arm/boot/dts/tegra30-apalis.dtsi +++ b/arch/arm/boot/dts/tegra30-apalis.dtsi @@ -10,6 +10,10 @@ model = "Toradex Apalis T30"; compatible = "toradex,apalis_t30", "nvidia,tegra30"; + memory { + reg = <0 0>; + }; + pcie@3000 { avdd-pexa-supply = <&vdd2_reg>; vdd-pexa-supply = <&vdd2_reg>; diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi index a110cf84d85f..19237c08c166 100644 --- a/arch/arm/boot/dts/tegra30.dtsi +++ b/arch/arm/boot/dts/tegra30.dtsi @@ -5,11 +5,18 @@ #include #include -#include "skeleton.dtsi" - / { compatible = "nvidia,tegra30"; interrupt-parent = <&lic>; + #address-cells = <1>; + #size-cells = <1>; + + chosen { }; + aliases { }; + + memory { + device_type = "memory"; + }; pcie@3000 { compatible = "nvidia,tegra30-pcie";