qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-25 15:06:47 +02:00
Code

ar71xx: move dsa switch device support into a separate file

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18943 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2009-12-26 14:19:26 +00:00
parent e2b1c817e6
commit 55ece30c25
11 changed files with 88 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/linux/ar71xx/config-2.6.30
View File

@ -6,6 +6,7 @@ CONFIG_AG71XX_AR8216_SUPPORT=y
CONFIG_AR71XX_DEV_AP91_PCI=y
CONFIG_AR71XX_DEV_AP94_PCI=y
CONFIG_AR71XX_DEV_AR913X_WMAC=y
CONFIG_AR71XX_DEV_DSA=y
CONFIG_AR71XX_DEV_GPIO_BUTTONS=y
CONFIG_AR71XX_DEV_LEDS_GPIO=y
CONFIG_AR71XX_DEV_M25P80=y

1
target/linux/ar71xx/config-2.6.31
View File

@ -8,6 +8,7 @@ CONFIG_AG71XX_AR8216_SUPPORT=y
CONFIG_AR71XX_DEV_AP91_PCI=y
CONFIG_AR71XX_DEV_AP94_PCI=y
CONFIG_AR71XX_DEV_AR913X_WMAC=y
CONFIG_AR71XX_DEV_DSA=y
CONFIG_AR71XX_DEV_GPIO_BUTTONS=y
CONFIG_AR71XX_DEV_LEDS_GPIO=y
CONFIG_AR71XX_DEV_M25P80=y

1
target/linux/ar71xx/config-2.6.32
View File

@ -8,6 +8,7 @@ CONFIG_AG71XX_AR8216_SUPPORT=y
CONFIG_AR71XX_DEV_AP91_PCI=y
CONFIG_AR71XX_DEV_AP94_PCI=y
CONFIG_AR71XX_DEV_AR913X_WMAC=y
CONFIG_AR71XX_DEV_DSA=y
CONFIG_AR71XX_DEV_GPIO_BUTTONS=y
CONFIG_AR71XX_DEV_LEDS_GPIO=y
CONFIG_AR71XX_DEV_M25P80=y

5
target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig
View File

@ -142,6 +142,7 @@ config AR71XX_MACH_TL_WR841N_V1
bool "TP-LINK TL-WR841N v1 support"
select AR71XX_DEV_M25P80
select AR71XX_DEV_PB42_PCI if PCI
select AR71XX_DEV_DSA
select AR71XX_DEV_GPIO_BUTTONS
select AR71XX_DEV_LEDS_GPIO
default n
@ -150,6 +151,7 @@ config AR71XX_MACH_TL_WR941ND
bool "TP-LINK TL-WR941ND support"
select AR71XX_DEV_M25P80
select AR71XX_DEV_AR913X_WMAC
select AR71XX_DEV_DSA
select AR71XX_DEV_GPIO_BUTTONS
select AR71XX_DEV_LEDS_GPIO
default n
@ -195,6 +197,9 @@ config AR71XX_DEV_AP94_PCI
config AR71XX_DEV_AR913X_WMAC
def_bool n
config AR71XX_DEV_DSA
def_bool n
config AR71XX_DEV_GPIO_BUTTONS
def_bool n

1
target/linux/ar71xx/files/arch/mips/ar71xx/Makefile
View File

@ -16,6 +16,7 @@ obj-$(CONFIG_PCI) += pci.o
obj-$(CONFIG_AR71XX_DEV_AP91_PCI) += dev-ap91-pci.o
obj-$(CONFIG_AR71XX_DEV_AP94_PCI) += dev-ap94-pci.o
obj-$(CONFIG_AR71XX_DEV_AR913X_WMAC) += dev-ar913x-wmac.o
obj-$(CONFIG_AR71XX_DEV_DSA) += dev-dsa.o
obj-$(CONFIG_AR71XX_DEV_GPIO_BUTTONS) += dev-gpio-buttons.o
obj-$(CONFIG_AR71XX_DEV_LEDS_GPIO) += dev-leds-gpio.o
obj-$(CONFIG_AR71XX_DEV_M25P80) += dev-m25p80.o

50
target/linux/ar71xx/files/arch/mips/ar71xx/dev-dsa.c Normal file
View File

@ -0,0 +1,50 @@
/*
* Atheros AR71xx DSA switch device support
*
* Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
* Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published
* by the Free Software Foundation.
*/
#include <linux/init.h>
#include <linux/platform_device.h>
#include <asm/mach-ar71xx/ar71xx.h>
#include "devices.h"
#include "dev-dsa.h"
static struct platform_device ar71xx_dsa_switch_device = {
.name = "dsa",
.id = 0,
};
void __init ar71xx_add_device_dsa(unsigned int id,
struct dsa_platform_data *d)
{
int i;
switch (id) {
case 0:
d->netdev = &ar71xx_eth0_device.dev;
break;
case 1:
d->netdev = &ar71xx_eth1_device.dev;
break;
default:
printk(KERN_ERR
"ar71xx: invalid ethernet id %d for DSA switch\n",
id);
return;
}
for (i = 0; i < d->nr_chips; i++)
d->chip[i].mii_bus = &ar71xx_mdio_device.dev;
ar71xx_dsa_switch_device.dev.platform_data = d;
platform_device_register(&ar71xx_dsa_switch_device);
}

20
target/linux/ar71xx/files/arch/mips/ar71xx/dev-dsa.h Normal file
View File

@ -0,0 +1,20 @@
/*
* Atheros AR71xx DSA switch device support
*
* Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
* Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published
* by the Free Software Foundation.
*/
#ifndef _AR71XX_DEV_DSA_H
#define _AR71XX_DEV_DSA_H
#include <net/dsa.h>
void ar71xx_add_device_dsa(unsigned int id,
struct dsa_platform_data *d) __init;
#endif /* _AR71XX_DEV_DSA_H */

38
target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
View File

@ -72,7 +72,7 @@ static struct resource ar71xx_mdio_resources[] = {
static struct ag71xx_mdio_platform_data ar71xx_mdio_data;
static struct platform_device ar71xx_mdio_device = {
struct platform_device ar71xx_mdio_device = {
.name = "ag71xx-mdio",
.id = -1,
.resource = ar71xx_mdio_resources,
@ -252,7 +252,7 @@ struct ag71xx_platform_data ar71xx_eth0_data = {
.reset_bit = RESET_MODULE_GE0_MAC,
};
static struct platform_device ar71xx_eth0_device = {
struct platform_device ar71xx_eth0_device = {
.name = "ag71xx",
.id = 0,
.resource = ar71xx_eth0_resources,
@ -285,7 +285,7 @@ struct ag71xx_platform_data ar71xx_eth1_data = {
.reset_bit = RESET_MODULE_GE1_MAC,
};
static struct platform_device ar71xx_eth1_device = {
struct platform_device ar71xx_eth1_device = {
.name = "ag71xx",
.id = 1,
.resource = ar71xx_eth1_resources,
@ -545,35 +545,3 @@ void __init ar71xx_parse_mac_addr(char *mac_str)
printk(KERN_DEBUG "ar71xx: failed to parse mac address "
"\"%s\"\n", mac_str);
}
static struct platform_device ar71xx_dsa_switch_device = {
.name = "dsa",
.id = 0,
};
void __init ar71xx_add_device_dsa(unsigned int id,
struct dsa_platform_data *d)
{
int i;
switch (id) {
case 0:
d->netdev = &ar71xx_eth0_device.dev;
break;
case 1:
d->netdev = &ar71xx_eth1_device.dev;
break;
default:
printk(KERN_ERR
"ar71xx: invalid ethernet id %d for DSA switch\n",
id);
return;
}
for (i = 0; i < d->nr_chips; i++)
d->chip[i].mii_bus = &ar71xx_mdio_device.dev;
ar71xx_dsa_switch_device.dev.platform_data = d;
platform_device_register(&ar71xx_dsa_switch_device);
}

8
target/linux/ar71xx/files/arch/mips/ar71xx/devices.h
View File

@ -14,7 +14,7 @@
#include <asm/mach-ar71xx/platform.h>
#include <net/dsa.h>
struct platform_device;
void ar71xx_add_device_spi(struct ar71xx_spi_platform_data *pdata,
struct spi_board_info const *info,
@ -34,15 +34,15 @@ extern struct ar71xx_eth_pll_data ar71xx_eth1_pll_data;
extern struct ag71xx_platform_data ar71xx_eth0_data;
extern struct ag71xx_platform_data ar71xx_eth1_data;
extern struct platform_device ar71xx_eth0_device;
extern struct platform_device ar71xx_eth1_device;
void ar71xx_add_device_eth(unsigned int id) __init;
extern struct platform_device ar71xx_mdio_device;
void ar71xx_add_device_mdio(u32 phy_mask) __init;
void ar71xx_add_device_uart(void) __init;
void ar71xx_add_device_wdt(void) __init;
void ar71xx_add_device_dsa(unsigned int id,
struct dsa_platform_data *d) __init;
#endif /* __AR71XX_DEVICES_H */

1
target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c
View File

@ -15,6 +15,7 @@
#include "machtype.h"
#include "devices.h"
#include "dev-dsa.h"
#include "dev-m25p80.h"
#include "dev-gpio-buttons.h"
#include "dev-pb42-pci.h"

1
target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
View File

@ -15,6 +15,7 @@
#include "machtype.h"
#include "devices.h"
#include "dev-dsa.h"
#include "dev-m25p80.h"
#include "dev-ar913x-wmac.h"
#include "dev-gpio-buttons.h"