Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69b2e99c authored by Andrew Victor's avatar Andrew Victor Committed by Russell King
Browse files

[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: default avatarAndrew Victor <andrew@sanpeople.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c9b75d13

arch/arm/mach-at91/at91sam9260.c

+3 −3
Original line number Diff line number Diff line
@@ -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,

arch/arm/mach-at91/at91sam9263.c

+3 −3
Original line number Diff line number Diff line
@@ -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,