aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-07-15 06:01:17 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-07-22 04:55:38 -0400
commit3126c7bc4106c572ef47e2c220df5a00e7973379 (patch)
tree7ef39fa9e53521889a2dd3c5aed5221379a47bec /arch/arm/mach-integrator
parent2f7989efd4398d92b8adffce2e07dd043a0895fe (diff)
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')
-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 = {
119 .rate = 14745600, 119 .rate = 14745600,
120}; 120};
121 121
122static struct clk dummy_apb_pclk;
123
122static struct clk_lookup lookups[] = { 124static struct clk_lookup lookups[] = {
123 { /* UART0 */ 125 { /* Bus clock */
126 .con_id = "apb_pclk",
127 .clk = &dummy_apb_pclk,
128 }, { /* UART0 */
124 .dev_id = "mb:16", 129 .dev_id = "mb:16",
125 .clk = &uartclk, 130 .clk = &uartclk,
126 }, { /* UART1 */ 131 }, { /* UART1 */