aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-06-18 04:51:59 -0400
committerArnd Bergmann <arnd@arndb.de>2013-06-21 08:48:39 -0400
commitb6f5f4a5930855175dff7f783c0595bcdfb08280 (patch)
tree7d38dda1eb900742fe7afea0c6d77dd0e3c93553 /arch
parentb099576de9d7352a1f4b7650eef562f3d4d29198 (diff)
ARM: ux500: Remove mop500_snowball_ethernet_clock_enable()
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> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-ux500/board-mop500.c11
-rw-r--r--arch/arm/mach-ux500/board-mop500.h1
-rw-r--r--arch/arm/mach-ux500/cpu-db8500.c1
3 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 78389de94dde..70a8057f3acf 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -413,15 +413,6 @@ static void mop500_prox_deactivate(struct device *dev)
413 regulator_put(prox_regulator); 413 regulator_put(prox_regulator);
414} 414}
415 415
416void mop500_snowball_ethernet_clock_enable(void)
417{
418 struct clk *clk;
419
420 clk = clk_get_sys("fsmc", NULL);
421 if (!IS_ERR(clk))
422 clk_prepare_enable(clk);
423}
424
425static struct cryp_platform_data u8500_cryp1_platform_data = { 416static struct cryp_platform_data u8500_cryp1_platform_data = {
426 .mem_to_engine = { 417 .mem_to_engine = {
427 .dir = STEDMA40_MEM_TO_PERIPH, 418 .dir = STEDMA40_MEM_TO_PERIPH,
@@ -674,8 +665,6 @@ static void __init snowball_init_machine(void)
674 mop500_audio_init(parent); 665 mop500_audio_init(parent);
675 mop500_uart_init(parent); 666 mop500_uart_init(parent);
676 667
677 mop500_snowball_ethernet_clock_enable();
678
679 /* This board has full regulator constraints */ 668 /* This board has full regulator constraints */
680 regulator_has_full_constraints(); 669 regulator_has_full_constraints();
681} 670}
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
index 49514b825034..16bf1ac020a8 100644
--- a/arch/arm/mach-ux500/board-mop500.h
+++ b/arch/arm/mach-ux500/board-mop500.h
@@ -104,7 +104,6 @@ void __init mop500_pinmaps_init(void);
104void __init snowball_pinmaps_init(void); 104void __init snowball_pinmaps_init(void);
105void __init hrefv60_pinmaps_init(void); 105void __init hrefv60_pinmaps_init(void);
106void mop500_audio_init(struct device *parent); 106void mop500_audio_init(struct device *parent);
107void mop500_snowball_ethernet_clock_enable(void);
108 107
109int __init mop500_uib_init(void); 108int __init mop500_uib_init(void);
110void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info, 109void 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 46cca52890bc..17a487177dab 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -309,7 +309,6 @@ static void __init u8500_init_machine(void)
309 mop500_pinmaps_init(); 309 mop500_pinmaps_init();
310 else if (of_machine_is_compatible("calaosystems,snowball-a9500")) { 310 else if (of_machine_is_compatible("calaosystems,snowball-a9500")) {
311 snowball_pinmaps_init(); 311 snowball_pinmaps_init();
312 mop500_snowball_ethernet_clock_enable();
313 } else if (of_machine_is_compatible("st-ericsson,hrefv60+")) 312 } else if (of_machine_is_compatible("st-ericsson,hrefv60+"))
314 hrefv60_pinmaps_init(); 313 hrefv60_pinmaps_init();
315 else if (of_machine_is_compatible("st-ericsson,ccu9540")) {} 314 else if (of_machine_is_compatible("st-ericsson,ccu9540")) {}