From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/3] ARM: ux500: Remove mop500_snowball_ethernet_clock_enable()
Date: Tue, 18 Jun 2013 09:51:59 +0100 [thread overview]
Message-ID: <1371545519-27119-4-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1371545519-27119-1-git-send-email-lee.jones@linaro.org>
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 <lee.jones@linaro.org>
---
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")) {}
--
1.8.1.2
next prev parent reply other threads:[~2013-06-18 8:51 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-18 8:51 [PATCH 0/3] ARM: ux500: mop500_snowball_ethernet_clock_enable() removal Lee Jones
2013-06-18 8:51 ` [PATCH 1/3] ARM: ux500: Provide a AB8500 GPIO Device Tree node Lee Jones
2013-06-18 8:51 ` [PATCH 2/3] ARM: ux500: Correct the EN_3v3 regulator's on/off GPIO Lee Jones
2013-06-18 13:12 ` Arnd Bergmann
2013-06-18 13:22 ` Lee Jones
2013-06-18 8:51 ` Lee Jones [this message]
2013-06-18 9:14 ` [PATCH 0/3] ARM: ux500: mop500_snowball_ethernet_clock_enable() removal Linus Walleij
2013-06-21 12:48 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1371545519-27119-4-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).