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

Commit c18a79ab authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by David S. Miller
Browse files

sh_eth: get SH7619 support out of #ifdef 



Get  the SH7619 data in the driver out of #ifdef by adding "sh7619-ether" to the
platform driver's ID table. Change the Ether platform device's name  in  the SH
platform code accordingly.

Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7bbe150d

arch/sh/kernel/cpu/sh2/setup-sh7619.c

+2 −2
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static struct resource eth_resources[] = { 
};



static struct platform_device eth_device = {

	.name = "sh-eth",

	.name = "sh7619-ether",

	.id = -1,

	.dev = {

		.platform_data = (void *)1,

drivers/net/ethernet/renesas/sh_eth.c

+3 −3
Original line number Diff line number Diff line
@@ -680,9 +680,9 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = { 
	.tsu		= 1,

	.select_mii	= 1,

};

#endif



#elif defined(CONFIG_CPU_SUBTYPE_SH7619)

static struct sh_eth_cpu_data sh_eth_my_cpu_data = {

static struct sh_eth_cpu_data sh7619_data = {

	.eesipr_value	= DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff,



	.apr		= 1,
@@ -690,7 +690,6 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = { 
	.tpauser	= 1,

	.hw_swap	= 1,

};

#endif



static struct sh_eth_cpu_data sh771x_data = {

	.eesipr_value	= DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff,
@@ -2700,6 +2699,7 @@ static const struct dev_pm_ops sh_eth_dev_pm_ops = { 
#endif



static struct platform_device_id sh_eth_id_table[] = {

	{ "sh7619-ether", (kernel_ulong_t)&sh7619_data },

	{ "sh771x-ether", (kernel_ulong_t)&sh771x_data },

	{ CARDNAME },

	{ }