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

Commit dcf1cece authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Nicolas Pitre
Browse files

[ARM] Orion: instantiate the dsa switch driver 



This adds DSA switch instantiation hooks to the orion5x and the
kirkwood ARM SoC platform code, and instantiates the DSA switch
driver on the 88F5181L FXO RD, the 88F5181L GE RD, the 6183 AP GE
RD, the Linksys WRT350n v2, and the 88F6281 RD boards.

Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
Tested-by: default avatarNicolas Pitre <nico@marvell.com>
Tested-by: default avatarPeter van Valderen <linux@ddcrew.com>
Tested-by: default avatarDirk Teurlings <dirk@upexia.nl>
Signed-off-by: default avatarNicolas Pitre <nico@marvell.com>
parent 04185fc6

arch/arm/mach-kirkwood/common.c

+35 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/mv643xx_eth.h>

#include <linux/ata_platform.h>

#include <linux/spi/orion_spi.h>

#include <net/dsa.h>

#include <asm/page.h>

#include <asm/timex.h>

#include <asm/mach/map.h>
@@ -151,6 +152,40 @@ void __init kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data) 
}





/*****************************************************************************

 * Ethernet switch

 ****************************************************************************/

static struct resource kirkwood_switch_resources[] = {

	{

		.start	= 0,

		.end	= 0,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device kirkwood_switch_device = {

	.name		= "dsa",

	.id		= 0,

	.num_resources	= 0,

	.resource	= kirkwood_switch_resources,

};



void __init kirkwood_ge00_switch_init(struct dsa_platform_data *d, int irq)

{

	if (irq != NO_IRQ) {

		kirkwood_switch_resources[0].start = irq;

		kirkwood_switch_resources[0].end = irq;

		kirkwood_switch_device.num_resources = 1;

	}



	d->mii_bus = &kirkwood_ge00_shared.dev;

	d->netdev = &kirkwood_ge00.dev;

	kirkwood_switch_device.dev.platform_data = d;



	platform_device_register(&kirkwood_switch_device);

}





/*****************************************************************************

 * SoC RTC

 ****************************************************************************/

arch/arm/mach-kirkwood/common.h

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#ifndef __ARCH_KIRKWOOD_COMMON_H

#define __ARCH_KIRKWOOD_COMMON_H



struct dsa_platform_data;

struct mv643xx_eth_platform_data;

struct mv_sata_platform_data;
@@ -29,6 +30,7 @@ void kirkwood_pcie_id(u32 *dev, u32 *rev); 


void kirkwood_ehci_init(void);

void kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data);

void kirkwood_ge00_switch_init(struct dsa_platform_data *d, int irq);

void kirkwood_pcie_init(void);

void kirkwood_rtc_init(void);

void kirkwood_sata_init(struct mv_sata_platform_data *sata_data);

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

+11 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/ata_platform.h>

#include <linux/mv643xx_eth.h>

#include <linux/ethtool.h>

#include <net/dsa.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/pci.h>
@@ -74,6 +75,15 @@ static struct mv643xx_eth_platform_data rd88f6281_ge00_data = { 
	.duplex		= DUPLEX_FULL,

};



static struct dsa_platform_data rd88f6281_switch_data = {

	.port_names[0]	= "lan1",

	.port_names[1]	= "lan2",

	.port_names[2]	= "lan3",

	.port_names[3]	= "lan4",

	.port_names[4]	= "wan",

	.port_names[5]	= "cpu",

};



static struct mv_sata_platform_data rd88f6281_sata_data = {

	.n_ports	= 2,

};
@@ -87,6 +97,7 @@ static void __init rd88f6281_init(void) 


	kirkwood_ehci_init();

	kirkwood_ge00_init(&rd88f6281_ge00_data);

	kirkwood_ge00_switch_init(&rd88f6281_switch_data, NO_IRQ);

	kirkwood_rtc_init();

	kirkwood_sata_init(&rd88f6281_sata_data);

	kirkwood_uart0_init();

arch/arm/mach-orion5x/common.c

+35 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/mv643xx_i2c.h>

#include <linux/ata_platform.h>

#include <linux/spi/orion_spi.h>

#include <net/dsa.h>

#include <asm/page.h>

#include <asm/setup.h>

#include <asm/timex.h>
@@ -197,6 +198,40 @@ void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data) 
}





/*****************************************************************************

 * Ethernet switch

 ****************************************************************************/

static struct resource orion5x_switch_resources[] = {

	{

		.start	= 0,

		.end	= 0,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device orion5x_switch_device = {

	.name		= "dsa",

	.id		= 0,

	.num_resources	= 0,

	.resource	= orion5x_switch_resources,

};



void __init orion5x_eth_switch_init(struct dsa_platform_data *d, int irq)

{

	if (irq != NO_IRQ) {

		orion5x_switch_resources[0].start = irq;

		orion5x_switch_resources[0].end = irq;

		orion5x_switch_device.num_resources = 1;

	}



	d->mii_bus = &orion5x_eth_shared.dev;

	d->netdev = &orion5x_eth.dev;

	orion5x_switch_device.dev.platform_data = d;



	platform_device_register(&orion5x_switch_device);

}





/*****************************************************************************

 * I2C

 ****************************************************************************/

arch/arm/mach-orion5x/common.h

+2 −0
Original line number Diff line number Diff line 
#ifndef __ARCH_ORION5X_COMMON_H

#define __ARCH_ORION5X_COMMON_H



struct dsa_platform_data;

struct mv643xx_eth_platform_data;

struct mv_sata_platform_data;
@@ -29,6 +30,7 @@ void orion5x_setup_pcie_wa_win(u32 base, u32 size); 
void orion5x_ehci0_init(void);

void orion5x_ehci1_init(void);

void orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data);

void orion5x_eth_switch_init(struct dsa_platform_data *d, int irq);

void orion5x_i2c_init(void);

void orion5x_sata_init(struct mv_sata_platform_data *sata_data);

void orion5x_spi_init(void);