summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/at91sam9260.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-11-29 15:44:55 +0000
committerArnd Bergmann <arnd@arndb.de>2011-11-29 15:44:55 +0000
commited20178d6266e0b9c9370e6862ac1eadadb8b321 (patch)
tree91cd87e854b53e43c6ec288d1e4dfc261fbbb677 /arch/arm/mach-at91/at91sam9260.c
parentd28bdfc5c80fb64bf50824920bf9b554732dec74 (diff)
parentc220f8cd01198552a616c4216f2a8e719fdb5fd9 (diff)
downloadlinux-ed20178d6266e0b9c9370e6862ac1eadadb8b321.tar.gz
linux-ed20178d6266e0b9c9370e6862ac1eadadb8b321.tar.bz2
linux-ed20178d6266e0b9c9370e6862ac1eadadb8b321.zip
Merge branch 'drivers/macb-gem-cleanup' into at91/gpio
Diffstat (limited to 'arch/arm/mach-at91/at91sam9260.c')
-rw-r--r--arch/arm/mach-at91/at91sam9260.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index 5a17a23724c2..e94cc2268461 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -119,7 +119,7 @@ static struct clk ohci_clk = {
.type = CLK_TYPE_PERIPHERAL,
};
static struct clk macb_clk = {
- .name = "macb_clk",
+ .name = "pclk",
.pmc_mask = 1 << AT91SAM9260_ID_EMAC,
.type = CLK_TYPE_PERIPHERAL,
};
@@ -189,6 +189,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("spi_clk", "atmel_spi.0", &spi0_clk),
CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),
CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk),