projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ar71xx] pb42: fix ethernet, remove USB registration, add default network configuration
[openwrt/svn-archive/archive.git]
/
target
/
linux
/
ar71xx
/
files
/
arch
/
mips
/
ar71xx
/
mach-pb42.c
diff --git
a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb42.c
b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb42.c
index 0379692d7add30067c263694348ba689c0435e60..67efe8fd5c96de1c322d8b4a9dba4ffa62e82c5c 100644
(file)
--- a/
target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb42.c
+++ b/
target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb42.c
@@
-1,7
+1,7
@@
/*
* Atheros PB42 board support
*
/*
* Atheros PB42 board support
*
- * Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
+ * 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
* Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
*
* This program is free software; you can redistribute it and/or modify it
@@
-10,6
+10,7
@@
*/
#include <linux/init.h>
*/
#include <linux/init.h>
+#include <linux/bitops.h>
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <linux/spi/flash.h>
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <linux/spi/flash.h>
@@
-17,7
+18,8
@@
#include <asm/mips_machine.h>
#include <asm/mach-ar71xx/ar71xx.h>
#include <asm/mach-ar71xx/pci.h>
#include <asm/mips_machine.h>
#include <asm/mach-ar71xx/ar71xx.h>
#include <asm/mach-ar71xx/pci.h>
-#include <asm/mach-ar71xx/platform.h>
+
+#include "devices.h"
static struct spi_board_info pb42_spi_info[] = {
{
static struct spi_board_info pb42_spi_info[] = {
{
@@
-44,24
+46,28
@@
static struct ar71xx_pci_irq pb42_pci_irqs[] __initdata = {
}
};
}
};
+#define PB42_WAN_PHYMASK BIT(20)
+#define PB42_LAN_PHYMASK (BIT(16) | BIT(17) | BIT(18) | BIT(19))
+#define PB42_MDIO_PHYMASK (PB42_LAN_PHYMASK | PB42_WAN_PHYMASK)
+
static void __init pb42_init(void)
{
ar71xx_add_device_spi(NULL, pb42_spi_info,
ARRAY_SIZE(pb42_spi_info));
static void __init pb42_init(void)
{
ar71xx_add_device_spi(NULL, pb42_spi_info,
ARRAY_SIZE(pb42_spi_info));
- ar71xx_add_device_mdio(
0xffe0ffff
);
+ ar71xx_add_device_mdio(
~PB42_MDIO_PHYMASK
);
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
- ar71xx_eth0_data.phy_mask =
0x000f0000
;
+ ar71xx_eth0_data.phy_mask =
PB42_WAN_PHYMASK
;
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
- ar71xx_eth1_data.phy_mask = 0x00100000;
+ ar71xx_eth1_data.phy_mask = PB42_LAN_PHYMASK;
+ ar71xx_eth1_data.speed = SPEED_100;
+ ar71xx_eth1_data.duplex = DUPLEX_FULL;
ar71xx_add_device_eth(0);
ar71xx_add_device_eth(1);
ar71xx_add_device_eth(0);
ar71xx_add_device_eth(1);
- ar71xx_add_device_usb();
-
ar71xx_pci_init(ARRAY_SIZE(pb42_pci_irqs), pb42_pci_irqs);
}
ar71xx_pci_init(ARRAY_SIZE(pb42_pci_irqs), pb42_pci_irqs);
}