aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-at91/at91sam9260.c6
-rw-r--r--arch/arm/mach-at91/at91sam9263.c6
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 = {
127 .pmc_mask = 1 << AT91SAM9260_ID_UHP, 127 .pmc_mask = 1 << AT91SAM9260_ID_UHP,
128 .type = CLK_TYPE_PERIPHERAL, 128 .type = CLK_TYPE_PERIPHERAL,
129}; 129};
130static struct clk ether_clk = { 130static struct clk macb_clk = {
131 .name = "ether_clk", 131 .name = "macb_clk",
132 .pmc_mask = 1 << AT91SAM9260_ID_EMAC, 132 .pmc_mask = 1 << AT91SAM9260_ID_EMAC,
133 .type = CLK_TYPE_PERIPHERAL, 133 .type = CLK_TYPE_PERIPHERAL,
134}; 134};
@@ -186,7 +186,7 @@ static struct clk *periph_clocks[] __initdata = {
186 &tc1_clk, 186 &tc1_clk,
187 &tc2_clk, 187 &tc2_clk,
188 &ohci_clk, 188 &ohci_clk,
189 &ether_clk, 189 &macb_clk,
190 &isi_clk, 190 &isi_clk,
191 &usart3_clk, 191 &usart3_clk,
192 &usart4_clk, 192 &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 = {
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,