iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'drivers/macb-gem-cleanup' into at91/gpio

Browse Source
This commit is contained in:
Arnd Bergmann
2011-11-29 15:44:55 +00:00
parent d28bdfc5c8 c220f8cd01
commit ed20178d62
54 changed files with 157 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-at91/at91sam9g45.c
View File

@ -149,7 +149,7 @@ static struct clk ac97_clk = {
.type = CLK_TYPE_PERIPHERAL,
};
static struct clk macb_clk = {
.name = "macb_clk",
.name = "pclk",
.pmc_mask = 1 << AT91SAM9G45_ID_EMAC,
.type = CLK_TYPE_PERIPHERAL,
};
@ -208,6 +208,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),
/* One additional fake clock for ohci */
CLKDEV_CON_ID("ohci_clk", &uhphs_clk),
CLKDEV_CON_DEV_ID("ehci_clk", "atmel-ehci", &uhphs_clk),