From patchwork Sat Dec 16 20:40:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 122166 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp1062455qgn; Sat, 16 Dec 2017 12:41:54 -0800 (PST) X-Google-Smtp-Source: ACJfBotB+1G3TdBJ6QAPJlVhaqLybu8TJDZ//3fj2XmIfMyIlCJgSg0hK+1PTt7nw2JAYgQ6oN3p X-Received: by 10.124.25.23 with SMTP id c23mr9786683plz.250.1513456914319; Sat, 16 Dec 2017 12:41:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513456914; cv=none; d=google.com; s=arc-20160816; b=ms9cOSFreSMVplJCyLggXROHDSJpazNifAs7eHw9sr+GtFw1MDA7+gSF1P66nLI3uT ph31KWecperTWkXWMht5SnoVPDgKHAjmsOcy3VZxeMmICXK1rP32sieh3+51W8NY4kc0 gnR5uUb6sPDWxWCuRKuwpR0hi2D8bRrthjJImog/OnUB44Ctdcvxz6uNe8Pt2XLVYCrs gxY2HVLGxtA6ajnurtGMNpYCiVOFLUNch8UvwFDXzzFqmRwP1B0MNeL2OA5I0FC7nRod l8P2cWdNSM3+1UdHO+lBAYWY6jYGSCo4hdyaqeLOBHC2iY4Mwyd8NHfsBVI/b4Iyx4ad 6q7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=3sMM1A49Qn8cviNxF6bPYBdYYBdVoopJcxyxT52hR7k=; b=0jn3Uty1GCGaX4o9s60+DzMjxPeO0V8ntpjVC7RCved9M/OgVLdXN/xTKrWhtwxXgh /8Yj3FfAbC4cnf3hq5UXm2rPMdRmSruSMS1Wt+Bhtplmchuxb6jS/ZnEuPrzfA/AtDyY 9LFDAzjL29Y8Ft2tWwQO7Ap6l0G8f8JJNOd9sVaSLxVTUUJmJZ1z8WRZCxq36CQO030i TuUeyIb1zgQmC7iUqa8xHqRePhcpk3RrhD5hlOuBWo8jT+eiMdFF+4ipR4MvUwtIQDH4 cCyqZ/zv9AeDaP6Zq/QxoUtwEdsGSCHdvL7AUFOLIeBqsdXydMUWIxhYrGiNV1S46Beq Az8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=h+T+RGi2; 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; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g6si7266408plk.472.2017.12.16.12.41.54; Sat, 16 Dec 2017 12:41:54 -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=@ti.com header.s=ti-com-17Q1 header.b=h+T+RGi2; 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; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757231AbdLPUlu (ORCPT + 23 others); Sat, 16 Dec 2017 15:41:50 -0500 Received: from lelnx194.ext.ti.com ([198.47.27.80]:44006 "EHLO lelnx194.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756882AbdLPUln (ORCPT ); Sat, 16 Dec 2017 15:41:43 -0500 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by lelnx194.ext.ti.com (8.15.1/8.15.1) with ESMTP id vBGKegRB024190; Sat, 16 Dec 2017 14:40:42 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1513456842; bh=lez5usI1YCuKPoF7BIPYXnevrT7ywvrPQx4EFZCY78s=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=h+T+RGi2X1Kyi1DyKHkvekJyLSNpte9r4W9PU7chNBjf2Gyz24mBp1OCMUv6igW+0 KIdSFS60eG91ElAzHi7nus4OM7FidQcAlYvVmI+fQuLUDmjYsHCvf6cWDvojCphZ/m 28z8GaO6QHZ9rey6pAXTRPSvGxsez2mOd7b8c2lE= Received: from DLEE112.ent.ti.com (dlee112.ent.ti.com [157.170.170.23]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id vBGKegMr016190; Sat, 16 Dec 2017 14:40:42 -0600 Received: from DLEE100.ent.ti.com (157.170.170.30) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1261.35; Sat, 16 Dec 2017 14:40:42 -0600 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1261.35 via Frontend Transport; Sat, 16 Dec 2017 14:40:42 -0600 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id vBGKegSW023358; Sat, 16 Dec 2017 14:40:42 -0600 From: Nishanth Menon To: Russell King , Mark Rutland , Rob Herring , Santosh Shilimkar CC: , , , , Nishanth Menon Subject: [PATCH V2 2/8] ARM: dts: keystone*: Use a single soc0 instance Date: Sat, 16 Dec 2017 14:40:34 -0600 Message-ID: <20171216204040.18017-3-nm@ti.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171216204040.18017-1-nm@ti.com> References: <20171215132102.435-1-nm@ti.com> <20171216204040.18017-1-nm@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Provide a soc0 node and reference the same to simplify dts. This also resolves the following warnings when built with W=1: arch/arm/boot/dts/keystone-k2hk-evm.dtb: Warning (unit_address_vs_reg): Node /soc has a reg or ranges property, but no unit name arch/arm/boot/dts/keystone-k2l-evm.dtb: Warning (unit_address_vs_reg): Node /soc has a reg or ranges property, but no unit name arch/arm/boot/dts/keystone-k2e-evm.dtb: Warning (unit_address_vs_reg): Node /soc has a reg or ranges property, but no unit name arch/arm/boot/dts/keystone-k2g-evm.dtb: Warning (unit_address_vs_reg): Node /soc has a reg or ranges property, but no unit name arch/arm/boot/dts/keystone-k2g-ice.dtb: Warning (unit_address_vs_reg): Node /soc has a reg or ranges property, but no unit name NOTE: Though we can reformat files by reducing 1 level of indent due to the use of soc0 phandle, we omit that change to prevent un-necessary churn in code base. Reported-by: Rob Herring Signed-off-by: Nishanth Menon --- Changes since V1: typo fixes in commit message. v1: https://patchwork.kernel.org/patch/10115101/ arch/arm/boot/dts/keystone-k2e-evm.dts | 4 +-- arch/arm/boot/dts/keystone-k2e.dtsi | 4 +-- arch/arm/boot/dts/keystone-k2g.dtsi | 2 +- arch/arm/boot/dts/keystone-k2hk-evm.dts | 50 ++++++++++++++++----------------- arch/arm/boot/dts/keystone-k2hk.dtsi | 4 +-- arch/arm/boot/dts/keystone-k2l-evm.dts | 4 +-- arch/arm/boot/dts/keystone-k2l.dtsi | 4 +-- arch/arm/boot/dts/keystone.dtsi | 2 +- 8 files changed, 37 insertions(+), 37 deletions(-) -- 2.14.1 diff --git a/arch/arm/boot/dts/keystone-k2e-evm.dts b/arch/arm/boot/dts/keystone-k2e-evm.dts index 5378b858fb6f..66fec5f5d081 100644 --- a/arch/arm/boot/dts/keystone-k2e-evm.dts +++ b/arch/arm/boot/dts/keystone-k2e-evm.dts @@ -25,8 +25,9 @@ status = "okay"; }; }; +}; - soc { +&soc0 { clocks { refclksys: refclksys { @@ -50,7 +51,6 @@ clock-output-names = "refclk-ddr3a"; }; }; - }; }; &usb_phy { diff --git a/arch/arm/boot/dts/keystone-k2e.dtsi b/arch/arm/boot/dts/keystone-k2e.dtsi index db4560b929f1..0bcd3f8a9c45 100644 --- a/arch/arm/boot/dts/keystone-k2e.dtsi +++ b/arch/arm/boot/dts/keystone-k2e.dtsi @@ -45,8 +45,9 @@ aliases { rproc0 = &dsp0; }; +}; - soc { +&soc0 { /include/ "keystone-k2e-clocks.dtsi" usb: usb@2680000 { @@ -191,5 +192,4 @@ bus_freq = <2500000>; }; /include/ "keystone-k2e-netcp.dtsi" - }; }; diff --git a/arch/arm/boot/dts/keystone-k2g.dtsi b/arch/arm/boot/dts/keystone-k2g.dtsi index 8b04652b703f..fd061718dc0a 100644 --- a/arch/arm/boot/dts/keystone-k2g.dtsi +++ b/arch/arm/boot/dts/keystone-k2g.dtsi @@ -69,7 +69,7 @@ interrupts = ; }; - soc { + soc0: soc@0 { #address-cells = <1>; #size-cells = <1>; #pinctrl-cells = <1>; diff --git a/arch/arm/boot/dts/keystone-k2hk-evm.dts b/arch/arm/boot/dts/keystone-k2hk-evm.dts index 8ea5a584e828..ad4e22afe133 100644 --- a/arch/arm/boot/dts/keystone-k2hk-evm.dts +++ b/arch/arm/boot/dts/keystone-k2hk-evm.dts @@ -26,7 +26,31 @@ }; }; - soc { + leds { + compatible = "gpio-leds"; + debug1_1 { + label = "keystone:green:debug1"; + gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; /* 12 */ + }; + + debug1_2 { + label = "keystone:red:debug1"; + gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; /* 13 */ + }; + + debug2 { + label = "keystone:blue:debug2"; + gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; /* 14 */ + }; + + debug3 { + label = "keystone:blue:debug3"; + gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; /* 15 */ + }; + }; +}; + +&soc0 { clocks { refclksys: refclksys { #clock-cells = <0>; @@ -63,30 +87,6 @@ clock-output-names = "refclk-ddr3b"; }; }; - }; - - leds { - compatible = "gpio-leds"; - debug1_1 { - label = "keystone:green:debug1"; - gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; /* 12 */ - }; - - debug1_2 { - label = "keystone:red:debug1"; - gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; /* 13 */ - }; - - debug2 { - label = "keystone:blue:debug2"; - gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; /* 14 */ - }; - - debug3 { - label = "keystone:blue:debug3"; - gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; /* 15 */ - }; - }; }; &usb_phy { diff --git a/arch/arm/boot/dts/keystone-k2hk.dtsi b/arch/arm/boot/dts/keystone-k2hk.dtsi index 71c1dcf4159f..ed59474522cb 100644 --- a/arch/arm/boot/dts/keystone-k2hk.dtsi +++ b/arch/arm/boot/dts/keystone-k2hk.dtsi @@ -52,8 +52,9 @@ rproc6 = &dsp6; rproc7 = &dsp7; }; +}; - soc { +&soc0 { /include/ "keystone-k2hk-clocks.dtsi" msm_ram: msmram@c000000 { @@ -281,5 +282,4 @@ bus_freq = <2500000>; }; /include/ "keystone-k2hk-netcp.dtsi" - }; }; diff --git a/arch/arm/boot/dts/keystone-k2l-evm.dts b/arch/arm/boot/dts/keystone-k2l-evm.dts index 61f63437b886..e200533d26a4 100644 --- a/arch/arm/boot/dts/keystone-k2l-evm.dts +++ b/arch/arm/boot/dts/keystone-k2l-evm.dts @@ -25,8 +25,9 @@ status = "okay"; }; }; +}; - soc { +&soc0 { clocks { refclksys: refclksys { #clock-cells = <0>; @@ -35,7 +36,6 @@ clock-output-names = "refclk-sys"; }; }; - }; }; &usb_phy { diff --git a/arch/arm/boot/dts/keystone-k2l.dtsi b/arch/arm/boot/dts/keystone-k2l.dtsi index 85b5481213d0..b61a830f4a4d 100644 --- a/arch/arm/boot/dts/keystone-k2l.dtsi +++ b/arch/arm/boot/dts/keystone-k2l.dtsi @@ -36,8 +36,9 @@ rproc2 = &dsp2; rproc3 = &dsp3; }; +}; - soc { +&soc0 { /include/ "keystone-k2l-clocks.dtsi" uart2: serial@2348400 { @@ -391,7 +392,6 @@ bus_freq = <2500000>; }; /include/ "keystone-k2l-netcp.dtsi" - }; }; &spi0 { diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi index ca2cc5d8e3b5..0e8d094515cc 100644 --- a/arch/arm/boot/dts/keystone.dtsi +++ b/arch/arm/boot/dts/keystone.dtsi @@ -67,7 +67,7 @@ cpu_on = <0x84000003>; }; - soc { + soc0: soc@0 { #address-cells = <1>; #size-cells = <1>; compatible = "ti,keystone","simple-bus";