]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ARM] 4189/1: AT91: MACB Ethernet clock
authorAndrew Victor <andrew@sanpeople.com>
Wed, 14 Feb 2007 07:44:43 +0000 (08:44 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 14 Feb 2007 15:22:09 +0000 (15:22 +0000)
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>
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9263.c

index e03ee625f40c8399be7adc45e5adadacb1011884..86e3a4c4655072cf494d3f10b7f5a98480388140 100644 (file)
@@ -127,8 +127,8 @@ static struct clk ohci_clk = {
        .pmc_mask       = 1 << AT91SAM9260_ID_UHP,
        .type           = CLK_TYPE_PERIPHERAL,
 };
-static struct clk ether_clk = {
-       .name           = "ether_clk",
+static struct clk macb_clk = {
+       .name           = "macb_clk",
        .pmc_mask       = 1 << AT91SAM9260_ID_EMAC,
        .type           = CLK_TYPE_PERIPHERAL,
 };
@@ -186,7 +186,7 @@ static struct clk *periph_clocks[] __initdata = {
        &tc1_clk,
        &tc2_clk,
        &ohci_clk,
-       &ether_clk,
+       &macb_clk,
        &isi_clk,
        &usart3_clk,
        &usart4_clk,
index fae6a821a61b2874ada19a524548da40d770f1a3..6aa342e8f1b1fc6c67142aeac0c9c77774527b72 100644 (file)
@@ -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
-       &ether_clk,
+       &macb_clk,
        // 2dge
        &udc_clk,
        &isi_clk,