diff options
| author | Russell King | 2010-07-15 12:01:17 +0200 |
|---|---|---|
| committer | Russell King | 2010-07-22 10:55:38 +0200 |
| commit | 3126c7bc4106c572ef47e2c220df5a00e7973379 (patch) | |
| tree | 7ef39fa9e53521889a2dd3c5aed5221379a47bec /arch/arm/mach-vexpress/v2m.c | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| download | kernel-qcow2-linux-3126c7bc4106c572ef47e2c220df5a00e7973379.tar.gz kernel-qcow2-linux-3126c7bc4106c572ef47e2c220df5a00e7973379.tar.xz kernel-qcow2-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-vexpress/v2m.c')
| -rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index d250711b8c7a..d6db3453908b 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c @@ -298,8 +298,13 @@ static struct clk osc2_clk = { .rate = 24000000, }; +static struct clk dummy_apb_pclk; + static struct clk_lookup v2m_lookups[] = { - { /* UART0 */ + { /* AMBA bus clock */ + .con_id = "apb_pclk", + .clk = &dummy_apb_pclk, + }, { /* UART0 */ .dev_id = "mb:uart0", .clk = &osc2_clk, }, { /* UART1 */ |