summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/at91cap9.c
diff options
context:
space:
mode:
authorJamie Iles <jamie@jamieiles.com>2011-08-09 16:51:11 +0200
committerJamie Iles <jamie@jamieiles.com>2011-11-22 16:21:13 +0100
commit865d605ee81813dc73d5422fd2f9bd132d10d194 (patch)
tree0107d957ce7e3fbbabf596073410aff4f3f81e89 /arch/arm/mach-at91/at91cap9.c
parentLinux 3.2-rc2 (diff)
downloadlinux-865d605ee81813dc73d5422fd2f9bd132d10d194.tar.xz
linux-865d605ee81813dc73d5422fd2f9bd132d10d194.zip
at91: provide macb clks with "pclk" and "hclk" name
The macb driver expects clocks with the names "pclk" and "hclk". We currently provide "macb_clk" but to fit in line with other architectures (namely AVR32), provide "pclk" and a fake "hclk". Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Jamie Iles <jamie@jamieiles.com> Acked-by: David S. Miller <davem@davemloft.net> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'arch/arm/mach-at91/at91cap9.c')
-rw-r--r--arch/arm/mach-at91/at91cap9.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c
index ecdd54dd68c6..17632b82dd76 100644
--- a/arch/arm/mach-at91/at91cap9.c
+++ b/arch/arm/mach-at91/at91cap9.c
@@ -137,7 +137,7 @@ static struct clk pwm_clk = {
.type = CLK_TYPE_PERIPHERAL,
};
static struct clk macb_clk = {
- .name = "macb_clk",
+ .name = "pclk",
.pmc_mask = 1 << AT91CAP9_ID_EMAC,
.type = CLK_TYPE_PERIPHERAL,
};
@@ -210,6 +210,8 @@ static struct clk *periph_clocks[] __initdata = {
};
static struct clk_lookup periph_clocks_lookups[] = {
+ /* One additional fake clock for macb_hclk */
+ CLKDEV_CON_ID("hclk", &macb_clk),
CLKDEV_CON_DEV_ID("hclk", "atmel_usba_udc", &utmi_clk),
CLKDEV_CON_DEV_ID("pclk", "atmel_usba_udc", &udphs_clk),
CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.0", &mmc0_clk),