aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-u300/clock.h
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@stericsson.com>2010-08-05 07:58:13 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-08-10 22:10:55 +0100
commit379aae5d6c3d8d9751d85a8022e68a90df13a7ae (patch)
treee4484124e084be47d26cb43287f99edbd887d615 /arch/arm/mach-u300/clock.h
parentc2fab1242a16f8e66b680d664322c3811e7b003d (diff)
ARM: 6295/1: fix U300 apb_pclk split
This fixes a regression due to the new apb_pclk stuff in the U300 platform, makes it run by splitting the apb clock off the single UART clocks. For the MMCI and PL022 clocks we don't split them: these are actually hardwired to the same clock terminal and will thus simply have a double reference count and will be referenced twice. We also move clock registration to .init_irq() so they are available early enough for probing to be successful and remove the earlier quirk to clock primecells during PrimeCell registration. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-u300/clock.h')
-rw-r--r--arch/arm/mach-u300/clock.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-u300/clock.h b/arch/arm/mach-u300/clock.h
index fc6d9ccfe7e..fc40c326566 100644
--- a/arch/arm/mach-u300/clock.h
+++ b/arch/arm/mach-u300/clock.h
@@ -45,9 +45,8 @@ struct clk {
void (*disable) (struct clk *);
};
-void u300_clock_primecells(void);
-void u300_unclock_primecells(void);
void u300_enable_intcon_clock(void);
void u300_enable_timer_clock(void);
+int u300_clock_init(void);
#endif