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

Commit 84dd619e authored by Dale Farnsworth's avatar Dale Farnsworth Committed by Jeff Garzik
Browse files

mv643xx_eth: Place explicit port number in mv643xx_eth_platform_data 



We were using the platform_device.id field to identify which ethernet
port is used for mv643xx_eth device.  This is not generally correct.
It will be incorrect, for example, if a hardware platform uses a single
port but not the first port.  Here, we add an explicit port_number field
to struct mv643xx_eth_platform_data.

This makes the mv643xx_eth_platform_data structure required, but that
isn't an issue since all users currently provide it already.

Signed-off-by: default avatarDale Farnsworth <dale@farnsworth.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent b2cbbd8e

arch/mips/momentum/jaguar_atx/platform.c

+7 −1
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ static struct resource mv64x60_eth0_resources[] = { 
};



static struct mv643xx_eth_platform_data eth0_pd = {

	.port_number	= 0,



	.tx_sram_addr	= MV_SRAM_BASE_ETH0,

	.tx_sram_size	= MV_SRAM_TXRING_SIZE,

	.tx_queue_size	= MV_SRAM_TXRING_SIZE / 16,
@@ -77,6 +79,8 @@ static struct resource mv64x60_eth1_resources[] = { 
};



static struct mv643xx_eth_platform_data eth1_pd = {

	.port_number	= 1,



	.tx_sram_addr	= MV_SRAM_BASE_ETH1,

	.tx_sram_size	= MV_SRAM_TXRING_SIZE,

	.tx_queue_size	= MV_SRAM_TXRING_SIZE / 16,
@@ -105,7 +109,9 @@ static struct resource mv64x60_eth2_resources[] = { 
	},

};



static struct mv643xx_eth_platform_data eth2_pd;

static struct mv643xx_eth_platform_data eth2_pd = {

	.port_number	= 2,

};



static struct platform_device eth2_device = {

	.name		= MV643XX_ETH_NAME,

arch/mips/momentum/ocelot_3/platform.c

+7 −1
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ static struct resource mv64x60_eth0_resources[] = { 
};



static struct mv643xx_eth_platform_data eth0_pd = {

	.port_number	= 0,



	.tx_sram_addr	= MV_SRAM_BASE_ETH0,

	.tx_sram_size	= MV_SRAM_TXRING_SIZE,

	.tx_queue_size	= MV_SRAM_TXRING_SIZE / 16,
@@ -77,6 +79,8 @@ static struct resource mv64x60_eth1_resources[] = { 
};



static struct mv643xx_eth_platform_data eth1_pd = {

	.port_number	= 1,



	.tx_sram_addr	= MV_SRAM_BASE_ETH1,

	.tx_sram_size	= MV_SRAM_TXRING_SIZE,

	.tx_queue_size	= MV_SRAM_TXRING_SIZE / 16,
@@ -105,7 +109,9 @@ static struct resource mv64x60_eth2_resources[] = { 
	},

};



static struct mv643xx_eth_platform_data eth2_pd;

static struct mv643xx_eth_platform_data eth2_pd = {

	.port_number	= 2,

};



static struct platform_device eth2_device = {

	.name		= MV643XX_ETH_NAME,

arch/mips/momentum/ocelot_c/platform.c

+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ static struct resource mv64x60_eth0_resources[] = { 
};



static struct mv643xx_eth_platform_data eth0_pd = {

	.port_number	= 0,



	.tx_sram_addr	= MV_SRAM_BASE_ETH0,

	.tx_sram_size	= MV_SRAM_TXRING_SIZE,

	.tx_queue_size	= MV_SRAM_TXRING_SIZE / 16,
@@ -76,6 +78,8 @@ static struct resource mv64x60_eth1_resources[] = { 
};



static struct mv643xx_eth_platform_data eth1_pd = {

	.port_number	= 1,



	.tx_sram_addr	= MV_SRAM_BASE_ETH1,

	.tx_sram_size	= MV_SRAM_TXRING_SIZE,

	.tx_queue_size	= MV_SRAM_TXRING_SIZE / 16,

arch/powerpc/platforms/chrp/pegasos_eth.c

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ static struct resource mv643xx_eth0_resources[] = { 




static struct mv643xx_eth_platform_data eth0_pd = {

	.port_number	= 0,

	.tx_sram_addr = PEGASOS2_SRAM_BASE_ETH0,

	.tx_sram_size = PEGASOS2_SRAM_TXRING_SIZE,

	.tx_queue_size = PEGASOS2_SRAM_TXRING_SIZE/16,
@@ -87,6 +88,7 @@ static struct resource mv643xx_eth1_resources[] = { 
};



static struct mv643xx_eth_platform_data eth1_pd = {

	.port_number	= 1,

	.tx_sram_addr = PEGASOS2_SRAM_BASE_ETH1,

	.tx_sram_size = PEGASOS2_SRAM_TXRING_SIZE,

	.tx_queue_size = PEGASOS2_SRAM_TXRING_SIZE/16,

arch/ppc/syslib/mv64x60.c

+9 −3
Original line number Diff line number Diff line
@@ -339,7 +339,9 @@ static struct resource mv64x60_eth0_resources[] = { 
	},

};



static struct mv643xx_eth_platform_data eth0_pd;

static struct mv643xx_eth_platform_data eth0_pd = {

	.port_number	= 0,

};



static struct platform_device eth0_device = {

	.name		= MV643XX_ETH_NAME,
@@ -362,7 +364,9 @@ static struct resource mv64x60_eth1_resources[] = { 
	},

};



static struct mv643xx_eth_platform_data eth1_pd;

static struct mv643xx_eth_platform_data eth1_pd = {

	.port_number	= 1,

};



static struct platform_device eth1_device = {

	.name		= MV643XX_ETH_NAME,
@@ -385,7 +389,9 @@ static struct resource mv64x60_eth2_resources[] = { 
	},

};



static struct mv643xx_eth_platform_data eth2_pd;

static struct mv643xx_eth_platform_data eth2_pd = {

	.port_number	= 2,

};



static struct platform_device eth2_device = {

	.name		= MV643XX_ETH_NAME,