summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator/core.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-07-15 12:01:17 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-07-22 10:55:38 +0200
commit3126c7bc4106c572ef47e2c220df5a00e7973379 (patch)
tree7ef39fa9e53521889a2dd3c5aed5221379a47bec /arch/arm/mach-integrator/core.c
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
downloadlinux-3126c7bc4106c572ef47e2c220df5a00e7973379.tar.xz
linux-3126c7bc4106c572ef47e2c220df5a00e7973379.zip
ARM: AMBA: Add pclk definition for platforms using primecells
Add a dummy clk definition for the APB pclk signal on all platforms using the AMBA bus infrastructure. This ensures that these platforms continue to work when the core amba bus code controls the APB pclk. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-integrator/core.c')
-rw-r--r--arch/arm/mach-integrator/core.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index b02cfc06e0ae..a04d38609839 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -119,8 +119,13 @@ static struct clk uartclk = {
.rate = 14745600,
};
+static struct clk dummy_apb_pclk;
+
static struct clk_lookup lookups[] = {
- { /* UART0 */
+ { /* Bus clock */
+ .con_id = "apb_pclk",
+ .clk = &dummy_apb_pclk,
+ }, { /* UART0 */
.dev_id = "mb:16",
.clk = &uartclk,
}, { /* UART1 */