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: 17962 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f72.google.com (mail-vb0-f72.google.com [209.85.212.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 30D7525CAB for ; Tue, 18 Jun 2013 08:52:17 +0000 (UTC) Received: by mail-vb0-f72.google.com with SMTP id p12sf5066765vbe.7 for ; Tue, 18 Jun 2013 01:52:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=+cIh0wgRTOxyibp/5CQttKQIFjM0vRr/0pcVhtFzkjg=; b=bXmRv9ufepgJ0B1RiYbMPqNodyJQ6qxLqlasGRgWM6RqUOOv0iF8Dc+WXATO+iXjNU mLS3yPOgzyh/pyq5juCxS978oC0sibnMMbm8XRyN+r2t03SsobbL93H90/WaZzbevMLB 5URcsx4hc/3XenZp+67KjYyyFT0bVPnobxQPYuhX++8fnIPjewykYRkx3yHcd+Dr/9Tv 2VOMuqcUS+NKjNjyqpDDCwxiV7Pa63zAgDEprpKCO7PuMfEs8u7H+LRsuQ4TWeWocrmL DxlluTr4bX+0h2A12MI3c7iPSnM8Bnzbl9WYiXRHZzSBv8M1Mr3GVsoqUeHoi+xwXybG qZcg== X-Received: by 10.236.15.73 with SMTP id e49mr11278174yhe.15.1371545536961; Tue, 18 Jun 2013 01:52:16 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.29.3 with SMTP id f3ls1380204qeh.83.gmail; Tue, 18 Jun 2013 01:52:16 -0700 (PDT) X-Received: by 10.220.193.202 with SMTP id dv10mr5916718vcb.24.1371545536790; Tue, 18 Jun 2013 01:52:16 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id l10si3974296vet.115.2013.06.18.01.52.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Jun 2013 01:52:16 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id hr11so2671829vcb.6 for ; Tue, 18 Jun 2013 01:52:16 -0700 (PDT) X-Received: by 10.58.251.144 with SMTP id zk16mr5781890vec.37.1371545536694; Tue, 18 Jun 2013 01:52:16 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.165.8 with SMTP id yu8csp64197veb; Tue, 18 Jun 2013 01:52:16 -0700 (PDT) X-Received: by 10.194.1.226 with SMTP id 2mr10340889wjp.91.1371545535631; Tue, 18 Jun 2013 01:52:15 -0700 (PDT) Received: from mail-wi0-x22e.google.com (mail-wi0-x22e.google.com [2a00:1450:400c:c05::22e]) by mx.google.com with ESMTPS id kt2si6999391wjb.117.2013.06.18.01.52.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Jun 2013 01:52:15 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c05::22e is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c05::22e; Received: by mail-wi0-f174.google.com with SMTP id k10so3161879wiv.7 for ; Tue, 18 Jun 2013 01:52:15 -0700 (PDT) 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 Cc: arnd@arndb.de, linus.walleij@stericsson.com, srinidhi.kasagar@stericsson.com, Lee Jones 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: ALoCoQku65nEeFURA5VYczxFXuAin7kvqNkufc5VNEhtp4TGf/C4075TuVE2xXJ2b/SFVxy1vixc X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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")) {}