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

Commit ae19161e authored by Jeff Garzik's avatar Jeff Garzik Committed by Jeff Garzik
Browse files

Merge branch 'for-2.6.28' of git://git.marvell.com/mv643xx_eth into upstream-next

parents 152cbcf9 042af53c

arch/arm/mach-kirkwood/db88f6281-bp-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include "common.h"



static struct mv643xx_eth_platform_data db88f6281_ge00_data = {

	.phy_addr	= 8,

	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),

};



static struct mv_sata_platform_data db88f6281_sata_data = {

arch/arm/mach-kirkwood/rd88f6192-nas-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#define RD88F6192_GPIO_USB_VBUS		10



static struct mv643xx_eth_platform_data rd88f6192_ge00_data = {

	.phy_addr	= 8,

	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),

};



static struct mv_sata_platform_data rd88f6192_sata_data = {

arch/arm/mach-kirkwood/rd88f6281-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static struct platform_device rd88f6281_nand_flash = { 
};



static struct mv643xx_eth_platform_data rd88f6281_ge00_data = {

	.phy_addr	= -1,

	.phy_addr	= MV643XX_ETH_PHY_NONE,

	.speed		= SPEED_1000,

	.duplex		= DUPLEX_FULL,

};

arch/arm/mach-loki/lb88rc8480-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static struct platform_device lb88rc8480_boot_flash = { 
};



static struct mv643xx_eth_platform_data lb88rc8480_ge0_data = {

	.phy_addr	= 1,

	.phy_addr	= MV643XX_ETH_PHY_ADDR(1),

	.mac_addr	= { 0x00, 0x50, 0x43, 0x11, 0x22, 0x33 },

};

arch/arm/mach-mv78xx0/common.c

+3 −3
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ void __init mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data) 
struct mv643xx_eth_shared_platform_data mv78xx0_ge01_shared_data = {

	.t_clk		= 0,

	.dram		= &mv78xx0_mbus_dram_info,

	.shared_smi	= &mv78xx0_ge00_shared,

};



static struct resource mv78xx0_ge01_shared_resources[] = {
@@ -370,7 +371,6 @@ static struct platform_device mv78xx0_ge01 = { 
void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data)

{

	eth_data->shared = &mv78xx0_ge01_shared;

	eth_data->shared_smi = &mv78xx0_ge00_shared;

	mv78xx0_ge01.dev.platform_data = eth_data;



	platform_device_register(&mv78xx0_ge01_shared);
@@ -384,6 +384,7 @@ void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data) 
struct mv643xx_eth_shared_platform_data mv78xx0_ge10_shared_data = {

	.t_clk		= 0,

	.dram		= &mv78xx0_mbus_dram_info,

	.shared_smi	= &mv78xx0_ge00_shared,

};



static struct resource mv78xx0_ge10_shared_resources[] = {
@@ -424,7 +425,6 @@ static struct platform_device mv78xx0_ge10 = { 
void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data)

{

	eth_data->shared = &mv78xx0_ge10_shared;

	eth_data->shared_smi = &mv78xx0_ge00_shared;

	mv78xx0_ge10.dev.platform_data = eth_data;



	platform_device_register(&mv78xx0_ge10_shared);
@@ -438,6 +438,7 @@ void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data) 
struct mv643xx_eth_shared_platform_data mv78xx0_ge11_shared_data = {

	.t_clk		= 0,

	.dram		= &mv78xx0_mbus_dram_info,

	.shared_smi	= &mv78xx0_ge00_shared,

};



static struct resource mv78xx0_ge11_shared_resources[] = {
@@ -478,7 +479,6 @@ static struct platform_device mv78xx0_ge11 = { 
void __init mv78xx0_ge11_init(struct mv643xx_eth_platform_data *eth_data)

{

	eth_data->shared = &mv78xx0_ge11_shared;

	eth_data->shared_smi = &mv78xx0_ge00_shared;

	mv78xx0_ge11.dev.platform_data = eth_data;



	platform_device_register(&mv78xx0_ge11_shared);