From patchwork Tue Jun 18 08:51:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 2740011 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BD8269F472 for ; Tue, 18 Jun 2013 08:55:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9693A2036E for ; Tue, 18 Jun 2013 08:55:28 +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 3DFC92036C for ; Tue, 18 Jun 2013 08:55:27 +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 1UorfV-0000Mk-3H; Tue, 18 Jun 2013 08:53:38 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uorf2-0000tf-Lh; Tue, 18 Jun 2013 08:53:08 +0000 Received: from mail-we0-x236.google.com ([2a00:1450:400c:c03::236]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UoreW-0000os-Rq for linux-arm-kernel@lists.infradead.org; Tue, 18 Jun 2013 08:52:38 +0000 Received: by mail-we0-f182.google.com with SMTP id p60so3193100wes.13 for ; Tue, 18 Jun 2013 01:52:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=+cIh0wgRTOxyibp/5CQttKQIFjM0vRr/0pcVhtFzkjg=; b=oxhUmYlG1OeTpcSh8nlResHsfowbYvn2+1y4aKphBWCha80xJREWf07crl4quK8ug3 zCBzzsDxK/o7SkvwBTvL+QWy88MZJbwg+x6RHRKqkZ+2Jxy42kCIBi6REtEXgOTGDn0s gOCBIrt84YPd6GFtq+48QhrYjUzlZT9HsBuRT/Uc2S5/qWVjiRNw7OpcrRtAooN+WNQj HYEuLgSSIe1siW42EiDdK+qOoRuxqUZEpAMmIFh39LuLgWycnKBFwg69WPt4ZewUmqq2 ncj+4ghd7FNgPD1Chepkp75jOhjm2d21Xx9ShKBfgyQHSrpsmOEgTD+joz+LX6rUNanR WM6g== X-Received: by 10.180.98.233 with SMTP id el9mr6992987wib.54.1371545535046; Tue, 18 Jun 2013 01:52:15 -0700 (PDT) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPSA id fs8sm549000wib.0.2013.06.18.01.52.13 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Jun 2013 01:52:14 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] ARM: ux500: Remove mop500_snowball_ethernet_clock_enable() Date: Tue, 18 Jun 2013 09:51:59 +0100 Message-Id: <1371545519-27119-4-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1371545519-27119-1-git-send-email-lee.jones@linaro.org> References: <1371545519-27119-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmIXYhXXl4OzglxTLMCoXNxdLMKavhSPAJ95V9CWBDWzg6fpR936+eQlWqsCOHsqPPhxNrn X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130618_045237_063446_A01907D7 X-CRM114-Status: GOOD ( 11.65 ) X-Spam-Score: -1.9 (-) Cc: Lee Jones , linus.walleij@stericsson.com, arnd@arndb.de, srinidhi.kasagar@stericsson.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 X-Spam-Status: No, score=-5.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 mop500_snowball_ethernet_clock_enable() provided a means to enable a clock which was used for the SMSC911x Ethernet device on Snowball. It was merely a stand-in until the driver was common clk compliant. Now that it is, this can be removed for both DT and ATAGs booting. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500.c | 11 ----------- arch/arm/mach-ux500/board-mop500.h | 1 - arch/arm/mach-ux500/cpu-db8500.c | 1 - 3 files changed, 13 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 238b237..f7a1feb 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -419,15 +419,6 @@ static void mop500_prox_deactivate(struct device *dev) } #endif -void mop500_snowball_ethernet_clock_enable(void) -{ - struct clk *clk; - - clk = clk_get_sys("fsmc", NULL); - if (!IS_ERR(clk)) - clk_prepare_enable(clk); -} - #ifdef CONFIG_ATAGS static struct cryp_platform_data u8500_cryp1_platform_data = { .mem_to_engine = { @@ -644,8 +635,6 @@ static void __init snowball_init_machine(void) mop500_audio_init(parent); mop500_uart_init(parent); - mop500_snowball_ethernet_clock_enable(); - u8500_cryp1_hash1_init(parent); /* This board has full regulator constraints */ diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h index 6f0bfcb..d6fab16 100644 --- a/arch/arm/mach-ux500/board-mop500.h +++ b/arch/arm/mach-ux500/board-mop500.h @@ -105,7 +105,6 @@ void __init mop500_pinmaps_init(void); void __init snowball_pinmaps_init(void); void __init hrefv60_pinmaps_init(void); void mop500_audio_init(struct device *parent); -void mop500_snowball_ethernet_clock_enable(void); int __init mop500_uib_init(void); void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info, diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 084f104..1472dde 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -300,7 +300,6 @@ static void __init u8500_init_machine(void) mop500_pinmaps_init(); else if (of_machine_is_compatible("calaosystems,snowball-a9500")) { snowball_pinmaps_init(); - mop500_snowball_ethernet_clock_enable(); } else if (of_machine_is_compatible("st-ericsson,hrefv60+")) hrefv60_pinmaps_init(); else if (of_machine_is_compatible("st-ericsson,ccu9540")) {}