ar71xx: DIR-825 support cleanup

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18622 3c298f89-4303-0410-b956-a3cf2f4a3e73

13 files changed, 37 insertions, 53 deletions

diff --git a/target/linux/ar71xx/base-files/etc/defconfig/dir825b1/network b/target/linux/ar71xx/base-files/etc/defconfig/dir-825-b1/network
index 2d4d8e0121..2d4d8e0121 100644
--- a/target/linux/ar71xx/base-files/etc/defconfig/dir825b1/network
+++ b/target/linux/ar71xx/base-files/etc/defconfig/dir-825-b1/network
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
index c350f2cbc3..9178b0a9e6 100755
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -42,7 +42,7 @@ get_status_led() {
 	bullet-m | rocket-m | nano-m)
 		status_led="ubnt:green:link4"
 		;;
-	dir825b1)
+	dir-825-b1)
 		status_led="dir825b1:orange:power"
 		;;
 	ls-sr71)
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index ba4b0a2923..1c2e060067 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -19,8 +19,8 @@ ar71xx_board_name() {
 	*AW-NR580)
 		name="aw-nr580"
 		;;
-	*DIR825B1)
-		name="dir825b1"
+	*"DIR-825 rev. B1")
+		name="dir-825-b1"
 		;;
 	*"Bullet M")
 		name="bullet-m"
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 90fa008487..b7e003a81d 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -68,7 +68,7 @@ platform_check_image() {
 	[ "$ARGC" -gt 1 ] && return 1
 
 	case "$board" in
-	ap83 | dir825b1 | mzk-w04nu | mzk-w300nh | tew-632brp | wrt-400n | bullet-m | nano-m | rocket-m)
+	ap83 | dir-825-b1 | mzk-w04nu | mzk-w300nh | tew-632brp | wrt-400n | bullet-m | nano-m | rocket-m)
 		[ "$magic" != "2705" ] && {
 			echo "Invalid image type."
 			return 1
diff --git a/target/linux/ar71xx/config-2.6.28 b/target/linux/ar71xx/config-2.6.28
index 340379068d..b155259153 100644
--- a/target/linux/ar71xx/config-2.6.28
+++ b/target/linux/ar71xx/config-2.6.28
@@ -7,6 +7,7 @@ CONFIG_AG71XX=y
 CONFIG_AR71XX_MACH_AP81=y
 CONFIG_AR71XX_MACH_AP83=y
 CONFIG_AR71XX_MACH_AW_NR580=y
+CONFIG_AR71XX_MACH_DIR_825_B1=y
 CONFIG_AR71XX_MACH_GENERIC=y
 CONFIG_AR71XX_MACH_MZK_W04NU=y
 CONFIG_AR71XX_MACH_MZK_W300NH=y
diff --git a/target/linux/ar71xx/config-2.6.30 b/target/linux/ar71xx/config-2.6.30
index 07e249202d..0db13af3c7 100644
--- a/target/linux/ar71xx/config-2.6.30
+++ b/target/linux/ar71xx/config-2.6.30
@@ -6,7 +6,7 @@ CONFIG_AG71XX=y
 CONFIG_AR71XX_MACH_AP81=y
 CONFIG_AR71XX_MACH_AP83=y
 CONFIG_AR71XX_MACH_AW_NR580=y
-CONFIG_AR71XX_MACH_DIR825B1=y
+CONFIG_AR71XX_MACH_DIR_825_B1=y
 CONFIG_AR71XX_MACH_GENERIC=y
 CONFIG_AR71XX_MACH_MZK_W04NU=y
 CONFIG_AR71XX_MACH_MZK_W300NH=y
diff --git a/target/linux/ar71xx/config-2.6.31 b/target/linux/ar71xx/config-2.6.31
index 554b002278..2e4a56be48 100644
--- a/target/linux/ar71xx/config-2.6.31
+++ b/target/linux/ar71xx/config-2.6.31
@@ -7,7 +7,7 @@ CONFIG_AG71XX=y
 CONFIG_AR71XX_MACH_AP81=y
 CONFIG_AR71XX_MACH_AP83=y
 CONFIG_AR71XX_MACH_AW_NR580=y
-CONFIG_AR71XX_MACH_DIR825B1=y
+CONFIG_AR71XX_MACH_DIR_825_B1=y
 CONFIG_AR71XX_MACH_GENERIC=y
 CONFIG_AR71XX_MACH_MZK_W04NU=y
 CONFIG_AR71XX_MACH_MZK_W300NH=y
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig b/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig
index 37a0e014a2..c68115bf5f 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig
@@ -10,7 +10,7 @@ config AR71XX_MACH_AP83
 	bool "Atheros AP83 board support"
 	default y
 
-config AR71XX_MACH_DIR825B1
+config AR71XX_MACH_DIR_825_B1
 	bool "D-Link DIR-825 rev. B1 board support"
 	default y
 
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/Makefile b/target/linux/ar71xx/files/arch/mips/ar71xx/Makefile
index d77438fbe6..8e37c05906 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/Makefile
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/Makefile
@@ -16,7 +16,7 @@ obj-$(CONFIG_PCI)			+= pci.o
 obj-$(CONFIG_AR71XX_MACH_AP81)		+= mach-ap81.o
 obj-$(CONFIG_AR71XX_MACH_AP83)		+= mach-ap83.o
 obj-$(CONFIG_AR71XX_MACH_AW_NR580)	+= mach-aw-nr580.o
-obj-$(CONFIG_AR71XX_MACH_DIR825B1)	+= mach-dir825b1.o
+obj-$(CONFIG_AR71XX_MACH_DIR_825_B1)	+= mach-dir-825-b1.o
 obj-$(CONFIG_AR71XX_MACH_GENERIC)	+= mach-generic.o
 obj-$(CONFIG_AR71XX_MACH_MZK_W04NU)	+= mach-mzk-w04nu.o
 obj-$(CONFIG_AR71XX_MACH_MZK_W300NH)	+= mach-mzk-w300nh.o
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir825b1.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c
index dbf244c25a..ae95febd36 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir825b1.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c
@@ -16,18 +16,16 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/input.h>
+#include <linux/pci.h>
+#include <linux/ath9k_platform.h>
+#include <linux/delay.h>
 
 #include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
 #include <asm/mach-ar71xx/pci.h>
 
-#include <linux/pci.h>
-#include <linux/ath9k_platform.h>
-#include <linux/delay.h>
-
 #include "devices.h"
 
-
 #define DIR825B1_GPIO_LED_BLUE_USB		0
 #define DIR825B1_GPIO_LED_ORANGE_POWER		1
 #define DIR825B1_GPIO_LED_BLUE_POWER		2
@@ -40,20 +38,17 @@
 
 #define DIR825B1_BUTTONS_POLL_INTERVAL		20
 
-
-#define DIR825B1_CAL_LOCATION_0			0xbf661000
-#define DIR825B1_CAL_LOCATION_1			0xbf665000
+#define DIR825B1_CAL_LOCATION_0			0x1f661000
+#define DIR825B1_CAL_LOCATION_1			0x1f665000
 
 #define DIR825B1_MAC_LOCATION_0			0x2ffa81b8
 #define DIR825B1_MAC_LOCATION_1			0x2ffa8370
 
-
 static struct ath9k_platform_data dir825b1_wmac0_data;
 static struct ath9k_platform_data dir825b1_wmac1_data;
 static char dir825b1_wmac0_mac[6];
 static char dir825b1_wmac1_mac[6];
 
-
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition dir825b1_partitions[] = {
 	{
@@ -79,7 +74,6 @@ static struct mtd_partition dir825b1_partitions[] = {
 };
 #endif /* CONFIG_MTD_PARTITIONS */
 
-
 static struct flash_platform_data dir825b1_flash_data = {
 #ifdef CONFIG_MTD_PARTITIONS
         .parts          = dir825b1_partitions,
@@ -87,7 +81,6 @@ static struct flash_platform_data dir825b1_flash_data = {
 #endif
 };
 
-
 static struct spi_board_info dir825b1_spi_info[] = {
 	{
 		.bus_num	= 0,
@@ -98,7 +91,6 @@ static struct spi_board_info dir825b1_spi_info[] = {
 	}
 };
 
-
 static struct gpio_led dir825b1_leds_gpio[] __initdata = {
 	{
 		.name		= "dir825b1:blue:usb",
@@ -127,7 +119,6 @@ static struct gpio_led dir825b1_leds_gpio[] __initdata = {
 	}
 };
 
-
 static struct gpio_button dir825b1_gpio_buttons[] __initdata = {
 	{
 		.desc		= "reset",
@@ -146,7 +137,6 @@ static struct gpio_button dir825b1_gpio_buttons[] __initdata = {
 	}
 };
 
-
 #ifdef CONFIG_PCI
 static struct ar71xx_pci_irq dir825b1_pci_irqs[] __initdata = {
         {
@@ -160,24 +150,21 @@ static struct ar71xx_pci_irq dir825b1_pci_irqs[] __initdata = {
         }
 };
 
-
 static int dir825b1_pci_plat_dev_init(struct pci_dev *dev)
 {
-	switch(PCI_SLOT(dev->devfn))
-	{
-		case 17:
-			dev->dev.platform_data = &dir825b1_wmac0_data;
-			break;
-
-		case 18:
-			dev->dev.platform_data = &dir825b1_wmac1_data;
-			break;
+	switch(PCI_SLOT(dev->devfn)) {
+	case 17:
+		dev->dev.platform_data = &dir825b1_wmac0_data;
+		break;
+
+	case 18:
+		dev->dev.platform_data = &dir825b1_wmac1_data;
+		break;
 	}
 
-	return(0);
+	return 0;
 }
 
-
 static void dir825b1_pci_fixup(struct pci_dev *dev)
 {
 	void __iomem *mem;
@@ -186,21 +173,20 @@ static void dir825b1_pci_fixup(struct pci_dev *dev)
 	u32 bar0;
 	u32 val;
 
-	if (ar71xx_mach != AR71XX_MACH_DIR825B1) return;
+	if (ar71xx_mach != AR71XX_MACH_DIR_825_B1)
+		return;
 
 	dir825b1_pci_plat_dev_init(dev);
 	cal_data = dev->dev.platform_data;
 
-	if (*cal_data != 0xa55a)
-	{
+	if (*cal_data != 0xa55a) {
 		printk(KERN_ERR "PCI: no calibration data found for %s\n",
 		       pci_name(dev));
 		return;
 	}
 
 	mem = ioremap(AR71XX_PCI_MEM_BASE, 0x10000);
-	if (!mem)
-	{
+	if (!mem) {
 		printk(KERN_ERR "PCI: ioremap error for device %s\n",
 		       pci_name(dev));
 		return;
@@ -218,12 +204,11 @@ static void dir825b1_pci_fixup(struct pci_dev *dev)
 
 	/* set pointer to first reg address */
 	cal_data += 3;
-	while (*cal_data != 0xffff)
-	{
+	while (*cal_data != 0xffff) {
 		u32 reg;
 		reg = *cal_data++;
 		val = *cal_data++;
-		val |= (*cal_data++) << 16; 
+		val |= (*cal_data++) << 16;
 
 		__raw_writel(val, mem + reg);
 		udelay(100);
@@ -248,8 +233,7 @@ static void dir825b1_pci_fixup(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_ATHEROS, PCI_ANY_ID,
 			dir825b1_pci_fixup);
 
-
-static void __init dir825b1_pci_init(void) 
+static void __init dir825b1_pci_init(void)
 {
 	memcpy(dir825b1_wmac0_data.eeprom_data,
 	       (u8 *) KSEG1ADDR(DIR825B1_CAL_LOCATION_0),
@@ -271,7 +255,6 @@ static void __init dir825b1_pci_init(void)
 static void __init dir825b1_pci_init(void) { }
 #endif /* CONFIG_PCI */
 
-
 static void __init dir825b1_setup(void)
 {
         u8 mac[6], i;
@@ -285,13 +268,13 @@ static void __init dir825b1_setup(void)
 	ar71xx_add_device_mdio(0x0);
 
 	ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
-	ar71xx_eth0_data.phy_mask = 0x1E;
+	ar71xx_eth0_data.phy_mask = 0x1e;
 	ar71xx_eth0_data.speed = SPEED_1000;
 	ar71xx_eth0_data.duplex = DUPLEX_FULL;
 	ar71xx_eth0_pll_data.pll_1000 = 0x11110000;
 
 	ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
-	ar71xx_eth1_data.phy_mask = 0xC0;
+	ar71xx_eth1_data.phy_mask = 0xc0;
 	ar71xx_eth1_data.speed = SPEED_1000;
 	ar71xx_eth1_data.duplex = DUPLEX_FULL;
 	ar71xx_eth1_pll_data.pll_1000 = 0x11110000;
@@ -314,4 +297,4 @@ static void __init dir825b1_setup(void)
 	dir825b1_pci_init();
 }
 
-MIPS_MACHINE(AR71XX_MACH_DIR825B1, "D-Link DIR825B1", dir825b1_setup);
+MIPS_MACHINE(AR71XX_MACH_DIR_825_B1, "D-Link DIR-825 rev. B1", dir825b1_setup);
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
index ec7eed8e64..cc0d5aeb00 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
@@ -59,8 +59,8 @@ static struct board_rec boards[] __initdata = {
 		.name		= "AW-NR580",
 		.mach_type	= AR71XX_MACH_AW_NR580,
 	}, {
-		.name		= "DIR825B1",
-		.mach_type	= AR71XX_MACH_DIR825B1,
+		.name		= "DIR-825-B1",
+		.mach_type	= AR71XX_MACH_DIR_825_B1,
 	}, {
 		.name		= "TEW-632BRP",
 		.mach_type	= AR71XX_MACH_TEW_632BRP,
diff --git a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
index f26fc85ee7..7f61c14403 100644
--- a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
+++ b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
@@ -124,7 +124,7 @@ enum ar71xx_mach_type {
 	AR71XX_MACH_AP81,	/* Atheros AP81 */
 	AR71XX_MACH_AP83,	/* Atheros AP83 */
 	AR71XX_MACH_AW_NR580,	/* AzureWave AW-NR580 */
-	AR71XX_MACH_DIR825B1,	/* D-Link DIR-825 rev. B1 */
+	AR71XX_MACH_DIR_825_B1,	/* D-Link DIR-825 rev. B1 */
 	AR71XX_MACH_RB_411,	/* MikroTik RouterBOARD 411/411A/411AH */
 	AR71XX_MACH_RB_411U,	/* MikroTik RouterBOARD 411U */
 	AR71XX_MACH_RB_433,	/* MikroTik RouterBOARD 433/433AH */
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 8a5dbe6ead..da2f8fd506 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -483,7 +483,7 @@ define Image/Build/Profile/WRT400N
 endef
 
 define Image/Build/Profile/DIR825B1
-	$(call Image/Build/Template/DIR825B1/$(1),dir825b1,board=DIR825B1)
+	$(call Image/Build/Template/DIR825B1/$(1),dir-825-b1,board=DIR-825-B1)
 endef
 
 define Image/Build/Profile/WRT160NL