From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946053AbbGQNry (ORCPT ); Fri, 17 Jul 2015 09:47:54 -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 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 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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>; -- 2.1.4