From patchwork Fri May 27 07:22:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iyappan Subramanian X-Patchwork-Id: 9137789 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 95B1460467 for ; Fri, 27 May 2016 07:25:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 877922815E for ; Fri, 27 May 2016 07:25:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B00E281AA; Fri, 27 May 2016 07:25:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EEB442815E for ; Fri, 27 May 2016 07:25:29 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b6C7t-0005yQ-2q; Fri, 27 May 2016 07:24:09 +0000 Received: from mail-pf0-x22f.google.com ([2607:f8b0:400e:c00::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b6C7I-0005gW-3g for linux-arm-kernel@lists.infradead.org; Fri, 27 May 2016 07:23:33 +0000 Received: by mail-pf0-x22f.google.com with SMTP id y69so39121007pfb.1 for ; Fri, 27 May 2016 00:23:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apm.com; s=apm; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sdXENTzYdlztgiiq75HYT/zJoIjCsK6Tgzvqn6nLI/8=; b=TauPRHl9PWfgInpEPMxHmcHiS//Xey7L35Ni13deqQYZ7C5TIDj6yuXvj4vnmeLjas JougbXrguyDwMBbDuOGjdNxhmQDYdHkVjLFpsTvs58+hVYp7qDDO1zf+lAaJt3K+cNqe N5lBytgyWlVfVRc/ZJ30gkW0g9vPE0mhEZCoE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sdXENTzYdlztgiiq75HYT/zJoIjCsK6Tgzvqn6nLI/8=; b=bmc2Ny5+y2NdXGNXP6E+/s4z9J7WW1iD6wnFzZ953mujwYnPkc6Oa2ZnDMWDxU1OaN rDPagDnw5GxBhsFsBkWKOBd1fXJukqM9EyD84/PA9eN/51reI9tS/3BbirIVJWLyEoxe 1gtjmBlTpZpYBDA5JI0rfWLRQ49Pt2bwaUChh2I9oihYKizlU6Iu7MPfRiPla6AVyiJZ JL2tBy1xOyfNOEAAwTNWawY/VqhZBg7MIOT6vQfEsFG5ovketb+mP6WV2a1YZfT7bKtx d2h774Y9Ntkl9Fgqe8J8ViB3dwd4Q28jSO6WH31YY7JYufR5U9wOfGm2XPEmfblH9CP+ zhog== X-Gm-Message-State: ALyK8tIJm1wiWfS9CAwjgo5wliros4ekJY8rWSVGD/6NxU5T+xLW5sg/wMDQsogpQM7sNYD+ X-Received: by 10.98.10.19 with SMTP id s19mr19961008pfi.71.1464333791084; Fri, 27 May 2016 00:23:11 -0700 (PDT) Received: from isubrama-dev.amcc.com ([206.80.4.98]) by smtp.gmail.com with ESMTPSA id b73sm7948695pfd.61.2016.05.27.00.23.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 May 2016 00:23:10 -0700 (PDT) From: Iyappan Subramanian To: davem@davemloft.net, netdev@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v1 5/6] dtb: xgene: Remove clock nodes Date: Fri, 27 May 2016 00:22:47 -0700 Message-Id: <1464333768-26150-6-git-send-email-isubramanian@apm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1464333768-26150-1-git-send-email-isubramanian@apm.com> References: <1464333768-26150-1-git-send-email-isubramanian@apm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160527_002332_328250_F8E633CA X-CRM114-Status: GOOD ( 10.12 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: patches@apm.com, linux-arm-kernel@lists.infradead.org, Iyappan Subramanian MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Since the MDIO will be responsible for clock reset, removing the clock nodes from shadowcat xge0 and storm sgenet1. Signed-off-by: Iyappan Subramanian Tested-by: Fushen Chen Tested-by: Toan Le --- arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 12 ------------ arch/arm64/boot/dts/apm/apm-storm.dtsi | 18 ++++-------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi index 8106957..f27563d 100644 --- a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi +++ b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi @@ -299,17 +299,6 @@ clock-output-names = "pcie1clk"; }; - xge0clk: xge0clk@1f61c000 { - compatible = "apm,xgene-device-clock"; - #clock-cells = <1>; - clocks = <&socplldiv2 0>; - reg = <0x0 0x1f61c000 0x0 0x1000>; - reg-names = "csr-reg"; - enable-mask = <0x3>; - csr-mask = <0x3>; - clock-output-names = "xge0clk"; - }; - xge1clk: xge1clk@1f62c000 { compatible = "apm,xgene-device-clock"; #clock-cells = <1>; @@ -643,7 +632,6 @@ interrupts = <0 96 4>, <0 97 4>; dma-coherent; - clocks = <&xge0clk 0>; local-mac-address = [00 01 73 00 00 01]; phy-connection-type = "sgmii"; phy-handle = <&sgenet0phy>; diff --git a/arch/arm64/boot/dts/apm/apm-storm.dtsi b/arch/arm64/boot/dts/apm/apm-storm.dtsi index 18f694ea..f631fe4 100644 --- a/arch/arm64/boot/dts/apm/apm-storm.dtsi +++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi @@ -237,20 +237,11 @@ clocks = <&socplldiv2 0>; reg = <0x0 0x1f21c000 0x0 0x1000>; reg-names = "csr-reg"; - csr-mask = <0x3>; + csr-mask = <0xa>; + enable-mask = <0xf>; clock-output-names = "sge0clk"; }; - sge1clk: sge1clk@1f21c000 { - compatible = "apm,xgene-device-clock"; - #clock-cells = <1>; - clocks = <&socplldiv2 0>; - reg = <0x0 0x1f21c000 0x0 0x1000>; - reg-names = "csr-reg"; - csr-mask = <0xc>; - clock-output-names = "sge1clk"; - }; - xge0clk: xge0clk@1f61c000 { compatible = "apm,xgene-device-clock"; #clock-cells = <1>; @@ -938,9 +929,9 @@ reg-names = "enet_csr", "ring_csr", "ring_cmd"; interrupts = <0x0 0x3c 0x4>; dma-coherent; - clocks = <&menetclk 0>; /* mac address will be overwritten by the bootloader */ local-mac-address = [00 00 00 00 00 00]; + clocks = <&menetclk 0>; phy-connection-type = "rgmii"; phy-handle = <&menetphy>; }; @@ -955,8 +946,8 @@ interrupts = <0x0 0xA0 0x4>, <0x0 0xA1 0x4>; dma-coherent; - clocks = <&sge0clk 0>; local-mac-address = [00 00 00 00 00 00]; + clocks = <&sge0clk 0>; phy-connection-type = "sgmii"; phy-handle = <&sgenet0phy>; }; @@ -972,7 +963,6 @@ <0x0 0xAD 0x4>; port-id = <1>; dma-coherent; - clocks = <&sge1clk 0>; local-mac-address = [00 00 00 00 00 00]; phy-connection-type = "sgmii"; phy-handle = <&sgenet1phy>;