From patchwork Fri Oct 18 11:54:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 3066011 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D2B62BF924 for ; Fri, 18 Oct 2013 11:54:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A97CA20425 for ; Fri, 18 Oct 2013 11:54:58 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6B55F20421 for ; Fri, 18 Oct 2013 11:54:57 +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 1VX8dm-0000oB-UV; Fri, 18 Oct 2013 11:54:51 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VX8dk-0000YY-Hm; Fri, 18 Oct 2013 11:54:48 +0000 Received: from mail-ee0-x232.google.com ([2a00:1450:4013:c00::232]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VX8dg-0000VS-Rg for linux-arm-kernel@lists.infradead.org; Fri, 18 Oct 2013 11:54:45 +0000 Received: by mail-ee0-f50.google.com with SMTP id l10so305834eei.37 for ; Fri, 18 Oct 2013 04:54:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=GIEyVIpwu/Jo037gHueMenANFckJROy3WVsgFgzlU7g=; b=qx0QmBSni7S4Beef1d234eYI94UraEXUzCpRXSNes2m+6VL2KQSJHh24PNaSpUhe/Q mbahjkQrEwKCCZB9eUbFiTNfue0erc/EuRIK/yvYqJyLxg+4yAmZeFSKzaYYj4v9YKUM JrepnIU4kFC6JK5da/vh9F3h8ZfVryEHdHFE3nqTXf9iSrNUrZHF2mw5WNk7Zq7Gntu4 5Jd1il1GK62UySnCpfMlfUNixTDNcja6o4F1CsOyQUI8S6kjZ06M32Kd8WUrqeXokkIX jKgtLLy5q1W5VAQBS3nHygvRGtVyOpHUtfjUtTB/eYmjB9GpwY3nCjAGJoHyAegXBwGc J0VA== X-Received: by 10.14.241.141 with SMTP id g13mr2293041eer.75.1382097263019; Fri, 18 Oct 2013 04:54:23 -0700 (PDT) Received: from topkick.lan (dslc-082-083-247-252.pools.arcor-ip.net. [82.83.247.252]) by mx.google.com with ESMTPSA id s3sm3584319eeo.3.2013.10.18.04.54.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Oct 2013 04:54:22 -0700 (PDT) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Subject: [PATCH] ARM: kirkwood: remove lagacy clk workarounds Date: Fri, 18 Oct 2013 13:54:13 +0200 Message-Id: <1382097253-15624-1-git-send-email-sebastian.hesselbarth@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131018_075445_027590_CE2E8AEF X-CRM114-Status: GOOD ( 13.67 ) X-Spam-Score: -2.0 (--) Cc: Andrew Lunn , Kevin Hilman , Russell King , Jason Cooper , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sebastian Hesselbarth 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 X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 With legacy devices converted to DT and a proper ethernet MAC workaround, we can now remove the clk workarounds for legacy devices. While at it, also cleanup the list of includes. Signed-off-by: Sebastian Hesselbarth Tested-by: Sebastian Hesselbarth Tested-by: Ezequiel Garcia --- As a follow-up patch for latest mvebu PRs, this patch is based on git://git.infradead.org/linux-mvebu.git tags/soc-3.13-2 Cc: Jason Cooper Cc: Andrew Lunn Cc: Russell King Cc: Kevin Hilman Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- arch/arm/mach-kirkwood/board-dt.c | 42 ++---------------------------------- 1 files changed, 3 insertions(+), 39 deletions(-) diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c index 27c1877..3f5984e 100644 --- a/arch/arm/mach-kirkwood/board-dt.c +++ b/arch/arm/mach-kirkwood/board-dt.c @@ -10,56 +10,22 @@ * warranty of any kind, whether express or implied. */ +#include #include #include +#include #include #include #include #include #include #include -#include -#include -#include +#include #include -#include #include -#include -#include #include #include "common.h" -/* - * There are still devices that doesn't know about DT yet. Get clock - * gates here and add a clock lookup alias, so that old platform - * devices still work. -*/ - -static void __init kirkwood_legacy_clk_init(void) -{ - - struct device_node *np = of_find_compatible_node( - NULL, NULL, "marvell,kirkwood-gating-clock"); - struct of_phandle_args clkspec; - struct clk *clk; - - clkspec.np = np; - clkspec.args_count = 1; - - /* - * The ethernet interfaces forget the MAC address assigned by - * u-boot if the clocks are turned off. Until proper DT support - * is available we always enable them for now. - */ - clkspec.args[0] = CGC_BIT_GE0; - clk = of_clk_get_from_provider(&clkspec); - clk_prepare_enable(clk); - - clkspec.args[0] = CGC_BIT_GE1; - clk = of_clk_get_from_provider(&clkspec); - clk_prepare_enable(clk); -} - #define MV643XX_ETH_MAC_ADDR_LOW 0x0414 #define MV643XX_ETH_MAC_ADDR_HIGH 0x0418 @@ -164,8 +130,6 @@ static void __init kirkwood_dt_init(void) kirkwood_cpufreq_init(); kirkwood_cpuidle_init(); - /* Setup clocks for legacy devices */ - kirkwood_legacy_clk_init(); kirkwood_pm_init(); kirkwood_dt_eth_fixup();