From patchwork Tue Sep 15 13:33:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kishon Vijay Abraham I X-Patchwork-Id: 53651 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oi0-f71.google.com (mail-oi0-f71.google.com [209.85.218.71]) by patches.linaro.org (Postfix) with ESMTPS id 8845322A22 for ; Tue, 15 Sep 2015 13:34:17 +0000 (UTC) Received: by oiev17 with SMTP id v17sf289010602oie.1 for ; Tue, 15 Sep 2015 06:34:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe; bh=yQewMWJWtLdOVg/b//L8eVaBiBaln1LVFxiLATPuL1Y=; b=cJNfieTmKk3s2z9amVVFZKdF4nCEOnFK8DblxkuhzSucTSdi7qTuAw4ynO5l08eJcs sQ1tEhQyBLwcpmuRc2XSTFYUZV7KkftsGwkLjFS3PGLqbJhHFvzlhihbvVc1TS7RRL5M 0TNPpUMy1oQXqYfM2o/LoB0uSjeRf7NCx6R5vy0FNluylOwTy7HP5F831RiQ+2vuOBzK x8rc1Hyh6/IOEPTYxiiDitXS0aGMa3hOFN2GyqwYC91/LOZblewOA18jumiG+71txK4N vpmhmiKwPIJlzZWha8Pd7NdvfYvv2qQ3zV6yevbzo1NiyDjbR6hrJqAKYUL8HAwqSHXG ehxw== X-Gm-Message-State: ALoCoQkMZYDZfn+dLjB6TOCMVPVxo5O9BK4Uh/jFN8GCTrMFcf0d6u81e2mQqfbr6k9ZumVTezCX X-Received: by 10.107.32.204 with SMTP id g195mr11373562iog.12.1442324056940; Tue, 15 Sep 2015 06:34:16 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.107.166.79 with SMTP id p76ls455285ioe.92.gmail; Tue, 15 Sep 2015 06:34:16 -0700 (PDT) X-Received: by 10.66.102.71 with SMTP id fm7mr46835006pab.5.1442324056851; Tue, 15 Sep 2015 06:34:16 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id mk1si31902877pab.241.2015.09.15.06.34.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Sep 2015 06:34:16 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by lahg1 with SMTP id g1so78145708lah.1 for ; Tue, 15 Sep 2015 06:34:12 -0700 (PDT) X-Received: by 10.112.168.66 with SMTP id zu2mr21055358lbb.29.1442324052291; Tue, 15 Sep 2015 06:34:12 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1808916lbq; Tue, 15 Sep 2015 06:34:11 -0700 (PDT) X-Received: by 10.202.51.10 with SMTP id z10mr16491846oiz.89.1442324051091; Tue, 15 Sep 2015 06:34:11 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d4si9635201oej.89.2015.09.15.06.34.06; Tue, 15 Sep 2015 06:34:11 -0700 (PDT) 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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752670AbbIONeE (ORCPT + 29 others); Tue, 15 Sep 2015 09:34:04 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:50629 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751644AbbIONd7 (ORCPT ); Tue, 15 Sep 2015 09:33:59 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id t8FDXKkj020408; Tue, 15 Sep 2015 08:33:20 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8FDXKGg028001; Tue, 15 Sep 2015 08:33:20 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.224.2; Tue, 15 Sep 2015 08:33:20 -0500 Received: from a0393678ub.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8FDX61N007211; Tue, 15 Sep 2015 08:33:16 -0500 From: Kishon Vijay Abraham I To: , , , CC: , , , , , , , , , Subject: [PATCH v2 2/4] ARM: dts: dra7: Use "syscon-phy-power" and "syscon-pcs" in PCIe PHY node Date: Tue, 15 Sep 2015 19:03:03 +0530 Message-ID: <1442323985-29939-3-git-send-email-kishon@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1442323985-29939-1-git-send-email-kishon@ti.com> References: <1442323985-29939-1-git-send-email-kishon@ti.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: kishon@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Add "syscon-phy-power" property and "syscon-pcs" property which can be used to perform the control module initializations and remove the deprecated "ctrl-module" property from PCIe PHY dt nodes. Phandle to "sysclk" clock node is also added to the PCIe PHY node since some of the syscon initializations is based on system clock frequency. Since "omap_control_pcie1phy" and "omap_control_pcie2phy" devicetree nodes are no longer used, remove it. Signed-off-by: Kishon Vijay Abraham I --- arch/arm/boot/dts/dra7.dtsi | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi index 0769b5d..fe28215 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi @@ -1158,16 +1158,18 @@ reg = <0x4a094000 0x80>, /* phy_rx */ <0x4a094400 0x64>; /* phy_tx */ reg-names = "phy_rx", "phy_tx"; - ctrl-module = <&omap_control_pcie1phy>; + syscon-phy-power = <&scm_conf_pcie 0x1c>; + syscon-pcs = <&scm_conf_pcie 0x10>; clocks = <&dpll_pcie_ref_ck>, <&dpll_pcie_ref_m2ldo_ck>, <&optfclk_pciephy1_32khz>, <&optfclk_pciephy1_clk>, <&optfclk_pciephy1_div_clk>, - <&optfclk_pciephy_div>; + <&optfclk_pciephy_div>, + <&sys_clkin1>; clock-names = "dpll_ref", "dpll_ref_m2", "wkupclk", "refclk", - "div-clk", "phy-div"; + "div-clk", "phy-div", "sysclk"; #phy-cells = <0>; }; @@ -1176,7 +1178,8 @@ reg = <0x4a095000 0x80>, /* phy_rx */ <0x4a095400 0x64>; /* phy_tx */ reg-names = "phy_rx", "phy_tx"; - ctrl-module = <&omap_control_pcie2phy>; + syscon-phy-power = <&scm_conf_pcie 0x20>; + syscon-pcs = <&scm_conf_pcie 0x10>; clocks = <&dpll_pcie_ref_ck>, <&dpll_pcie_ref_m2ldo_ck>, <&optfclk_pciephy2_32khz>, @@ -1201,23 +1204,6 @@ ti,hwmods = "sata"; }; - omap_control_pcie1phy: control-phy@0x4a003c40 { - compatible = "ti,control-phy-pcie"; - reg = <0x4a003c40 0x4>, <0x4a003c14 0x4>, <0x4a003c34 0x4>; - reg-names = "power", "control_sma", "pcie_pcs"; - clocks = <&sys_clkin1>; - clock-names = "sysclk"; - }; - - omap_control_pcie2phy: control-pcie@0x4a003c44 { - compatible = "ti,control-phy-pcie"; - reg = <0x4a003c44 0x4>, <0x4a003c14 0x4>, <0x4a003c34 0x4>; - reg-names = "power", "control_sma", "pcie_pcs"; - clocks = <&sys_clkin1>; - clock-names = "sysclk"; - status = "disabled"; - }; - rtc: rtc@48838000 { compatible = "ti,am3352-rtc"; reg = <0x48838000 0x100>;