diff options
| author |   Andrew Victor <andrew@sanpeople.com> | 2007-02-14 08:44:43 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-14 15:22:09 +0000 |
| commit | 69b2e99cf57ab8121d575a04a050314ac9c8f7e1 (patch) | |
| tree | d299e3152524de4d4f7658f933919df3055e5ace /arch/arm/mach-at91/at91sam9263.c | |
| parent | [ARM] 4154/1: AT91: Clock update (diff) | |
| download | linux-dev-69b2e99cf57ab8121d575a04a050314ac9c8f7e1.tar.xz linux-dev-69b2e99cf57ab8121d575a04a050314ac9c8f7e1.zip | |
[ARM] 4189/1: AT91: MACB Ethernet clock
The MACB Ethernet driver searches for a "macb_clk" clock, so rename the
"ether_clk" on the SAM9260 and SAM9263 to "macb_clk".
Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-at91/at91sam9263.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9263.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c index fae6a821a61b..6aa342e8f1b1 100644 --- a/arch/arm/mach-at91/at91sam9263.c +++ b/arch/arm/mach-at91/at91sam9263.c @@ -107,8 +107,8 @@ static struct clk tcb_clk = { .pmc_mask = 1 << AT91SAM9263_ID_TCB, .type = CLK_TYPE_PERIPHERAL, }; -static struct clk ether_clk = { - .name = "ether_clk", +static struct clk macb_clk = { + .name = "macb_clk", .pmc_mask = 1 << AT91SAM9263_ID_EMAC, .type = CLK_TYPE_PERIPHERAL, }; @@ -150,7 +150,7 @@ static struct clk *periph_clocks[] __initdata = { // ac97 &tcb_clk, // pwmc - ðer_clk, + &macb_clk, // 2dge &udc_clk, &isi_clk, |