aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/at91sam9263.c
diff options
context:
space:
mode:
authorAndrew Victor <andrew@sanpeople.com>2007-02-14 02:44:43 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-02-14 10:22:09 -0500
commit69b2e99cf57ab8121d575a04a050314ac9c8f7e1 (patch)
treed299e3152524de4d4f7658f933919df3055e5ace /arch/arm/mach-at91/at91sam9263.c
parentc9b75d132261096ac1170354b9e27837af76a512 (diff)
[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.c6
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 = {
107 .pmc_mask = 1 << AT91SAM9263_ID_TCB, 107 .pmc_mask = 1 << AT91SAM9263_ID_TCB,
108 .type = CLK_TYPE_PERIPHERAL, 108 .type = CLK_TYPE_PERIPHERAL,
109}; 109};
110static struct clk ether_clk = { 110static struct clk macb_clk = {
111 .name = "ether_clk", 111 .name = "macb_clk",
112 .pmc_mask = 1 << AT91SAM9263_ID_EMAC, 112 .pmc_mask = 1 << AT91SAM9263_ID_EMAC,
113 .type = CLK_TYPE_PERIPHERAL, 113 .type = CLK_TYPE_PERIPHERAL,
114}; 114};
@@ -150,7 +150,7 @@ static struct clk *periph_clocks[] __initdata = {
150 // ac97 150 // ac97
151 &tcb_clk, 151 &tcb_clk,
152 // pwmc 152 // pwmc
153 &ether_clk, 153 &macb_clk,
154 // 2dge 154 // 2dge
155 &udc_clk, 155 &udc_clk,
156 &isi_clk, 156 &isi_clk,