[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>

2 files changed, 6 insertions, 6 deletions

diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index e03ee625f40c..86e3a4c46550 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -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,
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
-        &ether_clk,
+        &macb_clk,
         // 2dge
         &udc_clk,
         &isi_clk,