pb42: fix ethernet, remove USB registration, add default network configuration

SVN-Revision: 14876

3 files changed, 29 insertions, 5 deletions

diff --git a/target/linux/ar71xx/base-files/etc/defconfig/pb42/network b/target/linux/ar71xx/base-files/etc/defconfig/pb42/network
new file mode 100644
index 0000000..ff7b42d
--- /dev/null
+++ b/target/linux/ar71xx/base-files/etc/defconfig/pb42/network
@@ -0,0 +1,16 @@
+config interface loopback
+	option ifname	lo
+	option proto	static
+	option ipaddr	127.0.0.1
+	option netmask	255.0.0.0
+
+config interface lan
+	option ifname	eth1
+	option type	bridge
+	option proto	static
+	option ipaddr	192.168.1.1
+	option netmask	255.255.255.0
+
+config interface wan
+	option ifname	eth0
+	option proto	dhcp
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index ae593b3..a41d6b5 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -19,6 +19,9 @@ ar71xx_board_name() {
 	*MZK-W04NU)
 		name="mzk-w04nu"
 		;;
+	*PB42)
+		name="pb42"
+		;;
 	*RB-411)
 		name="rb-411"
 		;;
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 a9543fe..67efe8f 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb42.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb42.c
@@ -10,6 +10,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/bitops.h>
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
@@ -45,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));
 
-	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_mask = 0x000f0000;
+	ar71xx_eth0_data.phy_mask = PB42_WAN_PHYMASK;
 
 	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_usb();
-
 	ar71xx_pci_init(ARRAY_SIZE(pb42_pci_irqs), pb42_pci_irqs);
 }