From patchwork Fri Jul 17 13:47:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 6815851 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 27E07C05AC for ; Fri, 17 Jul 2015 13:48:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 535512057F for ; Fri, 17 Jul 2015 13:48:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 40BFD205B3 for ; Fri, 17 Jul 2015 13:48:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946011AbbGQNrx (ORCPT ); Fri, 17 Jul 2015 09:47:53 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:37759 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1945932AbbGQNrj (ORCPT ); Fri, 17 Jul 2015 09:47:39 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id t6HDlbKd010908; Fri, 17 Jul 2015 08:47:37 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id t6HDlbEV023963; Fri, 17 Jul 2015 08:47:37 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.224.2; Fri, 17 Jul 2015 08:47:10 -0500 Received: from rockdesk.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id t6HDlQhd008989; Fri, 17 Jul 2015 08:47:35 -0500 From: Roger Quadros To: , CC: , , , , , , , Roger Quadros Subject: [PATCH v3 3/3] ARM: dts: dra7: Add scm_conf1 node and remove redundant nodes Date: Fri, 17 Jul 2015 16:47:24 +0300 Message-ID: <1437140844-6032-4-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1437140844-6032-1-git-send-email-rogerq@ti.com> References: <1437140844-6032-1-git-send-email-rogerq@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP scm_conf1 maps the control register address space after the padconf till the end. Fix the scm_conf and pmx_core resource lengths. We need to add 4 bytes to include the last 32-bit register space. Remove the redundant dra7_ctrl_core and dra7_ctrl_general nodes. They are not used by anyone and no longer needed as they are covered by scm_conf and scm_conf1. Signed-off-by: Roger Quadros --- arch/arm/boot/dts/dra7.dtsi | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi index 4a0718c..d07c34c 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi @@ -141,7 +141,7 @@ dra7_pmx_core: pinmux@1400 { compatible = "ti,dra7-padconf", "pinctrl-single"; - reg = <0x1400 0x0464>; + reg = <0x1400 0x0468>; #address-cells = <1>; #size-cells = <0>; #interrupt-cells = <1>; @@ -149,6 +149,13 @@ pinctrl-single,register-width = <32>; pinctrl-single,function-mask = <0x3fffffff>; }; + + scm_conf1: scm_conf@1 { + compatible = "syscon"; + reg = <0x1868 0x03e0>; + #address-cells = <1>; + #size-cells = <1>; + }; }; cm_core_aon: cm_core_aon@5000 { @@ -286,16 +293,6 @@ #thermal-sensor-cells = <1>; }; - dra7_ctrl_core: ctrl_core@4a002000 { - compatible = "syscon"; - reg = <0x4a002000 0x6d0>; - }; - - dra7_ctrl_general: tisyscon@4a002e00 { - compatible = "syscon"; - reg = <0x4a002e00 0x7c>; - }; - sdma: dma-controller@4a056000 { compatible = "ti,omap4430-sdma"; reg = <0x4a056000 0x1000>;