From patchwork Tue May 7 15:52:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentin Longchamp X-Patchwork-Id: 2536031 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id 1CB3FDF215 for ; Tue, 7 May 2013 15:54:10 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UZkCl-0006aW-AI; Tue, 07 May 2013 15:53:27 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UZkCW-0007Kl-UN; Tue, 07 May 2013 15:53:12 +0000 Received: from mail-de.keymile.com ([195.8.104.250]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UZkCD-0007HH-Iv for linux-arm-kernel@lists.infradead.org; Tue, 07 May 2013 15:52:55 +0000 Received: from frodo.de.keymile.net ([10.9.1.54]:52725 helo=mailrelay.de.keymile.net) by mail-de.keymile.com with esmtp (Exim 4.76) (envelope-from ) id 1UZkBt-0001WR-2t; Tue, 07 May 2013 17:52:33 +0200 Received: from chber1-10533x.keymile.net (chber1-10533x.keymile.net [172.31.40.3]) by mailrelay.de.keymile.net (8.12.2/8.12.2) with ESMTP id r47FoUxg016689; Tue, 7 May 2013 17:50:39 +0200 (MEST) From: Valentin Longchamp To: linux-arm-kernel@lists.infradead.org, andrew@lunn.ch, jason@lakedaemon.net Subject: [PATCH 3/3] ARM: kirkwood: remove clock gating disabling for km_kirkwood Date: Tue, 7 May 2013 17:52:21 +0200 Message-Id: <1367941941-19152-4-git-send-email-valentin.longchamp@keymile.com> X-Mailer: git-send-email 1.8.0.1 In-Reply-To: <1367941941-19152-1-git-send-email-valentin.longchamp@keymile.com> References: <1367941941-19152-1-git-send-email-valentin.longchamp@keymile.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130507_115253_821296_8BE8921C X-CRM114-Status: GOOD ( 12.03 ) X-Spam-Score: -3.2 (---) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-3.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -1.3 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: gregory.clement@free-electrons.com, Valentin Longchamp , devicetree-discuss@lists.ozlabs.org, sebastian.hesselbarth@gmail.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org A new clock gating controller is available for the prestera-kw kirkwood variant. This controller does not enable the unavailable clk gates. This patch removes the fixes from the board-km_kirkwood file and enables the correct clk gating controller for kirkwood-98dx4122.dtsi. Signed-off-by: Valentin Longchamp --- arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 7 +++++++ arch/arm/mach-kirkwood/board-km_kirkwood.c | 15 --------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi index 3271e4c..8c73673 100644 --- a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi +++ b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi @@ -27,5 +27,12 @@ marvell,function = "uart1"; }; }; + + gate_clk: clock-gating-control@2011c { + compatible = "marvell,prestera-kw-gating-clock"; + reg = <0x2011c 0x4>; + clocks = <&core_clk 0>; + #clock-cells = <1>; + }; }; }; diff --git a/arch/arm/mach-kirkwood/board-km_kirkwood.c b/arch/arm/mach-kirkwood/board-km_kirkwood.c index 44e4605..f1a6ab7 100644 --- a/arch/arm/mach-kirkwood/board-km_kirkwood.c +++ b/arch/arm/mach-kirkwood/board-km_kirkwood.c @@ -25,20 +25,5 @@ static struct mv643xx_eth_platform_data km_kirkwood_ge00_data = { void __init km_kirkwood_init(void) { - struct clk *sata_clk; - /* - * Our variant of kirkwood (integrated in the Bobcat) hangs on accessing - * SATA bits (14-15) of the Clock Gating Control Register. Since these - * devices are also not present in this variant, their clocks get - * disabled because unused when clk_disable_unused() gets called. - * That's why we change the flags to these clocks to CLK_IGNORE_UNUSED - */ - sata_clk = clk_get_sys("sata_mv.0", "0"); - if (!IS_ERR(sata_clk)) - sata_clk->flags |= CLK_IGNORE_UNUSED; - sata_clk = clk_get_sys("sata_mv.0", "1"); - if (!IS_ERR(sata_clk)) - sata_clk->flags |= CLK_IGNORE_UNUSED; - kirkwood_ge00_init(&km_kirkwood_ge00_data); }