ar71xx: move mach type definitions into a separate include file

SVN-Revision: 18942
15 years ago · bea984e187
parent b7ee264d5f
commit bea984e187
26 changed files with 80 additions and 60 deletions
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap81.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap81.c
@ -12,9 +12,9 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>

-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>

+#include "machtype.h"
 #include "devices.h"
 #include "dev-m25p80.h"
 #include "dev-ar913x-wmac.h"
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c
@ -17,10 +17,10 @@
 #include <linux/spi/spi_gpio.h>
 #include <linux/spi/vsc7385.h>

-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
 #include <asm/mach-ar71xx/ar91xx_flash.h>

+#include "machtype.h"
 #include "devices.h"
 #include "dev-ar913x-wmac.h"
 #include "dev-gpio-buttons.h"
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-aw-nr580.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-aw-nr580.c
@ -15,6 +15,7 @@
 #include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>

+#include "machtype.h"
 #include "devices.h"
 #include "dev-m25p80.h"
 #include "dev-gpio-buttons.h"
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-615-c1.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-615-c1.c
@ -12,9 +12,9 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>

-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>

+#include "machtype.h"
 #include "devices.h"
 #include "dev-m25p80.h"
 #include "dev-ar913x-wmac.h"
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c
@ -16,9 +16,9 @@
 #include <linux/delay.h>
 #include <linux/rtl8366_smi.h>

-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>

+#include "machtype.h"
 #include "devices.h"
 #include "dev-m25p80.h"
 #include "dev-ap94-pci.h"
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-generic.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-generic.c
@ -11,8 +11,8 @@

 #include <linux/init.h>

-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
+#include "machtype.h"

 static void __init ar71xx_generic_init(void)
 {
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c
@ -11,9 +11,9 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>

-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>

+#include "machtype.h"
 #include "devices.h"
 #include "dev-ar913x-wmac.h"
 #include "dev-gpio-buttons.h"
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c
@ -12,9 +12,9 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>

-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>

+#include "machtype.h"
 #include "devices.h"
 #include "dev-m25p80.h"
 #include "dev-ar913x-wmac.h"
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb42.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb42.c
@ -9,9 +9,9 @@
 *  by the Free Software Foundation.
 */

-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>

+#include "machtype.h"
 #include "devices.h"
 #include "dev-m25p80.h"
 #include "dev-gpio-buttons.h"
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb44.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb44.c
@ -19,9 +19,9 @@
 #include <linux/i2c-gpio.h>
 #include <linux/i2c/pcf857x.h>

-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>

+#include "machtype.h"
 #include "devices.h"
 #include "dev-pb42-pci.h"
 #include "dev-gpio-buttons.h"
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb-4xx.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb-4xx.c
@ -16,10 +16,10 @@
 #include <linux/spi/flash.h>
 #include <linux/spi/mmc_spi.h>

-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
 #include <asm/mach-ar71xx/pci.h>

+#include "machtype.h"
 #include "devices.h"
 #include "dev-gpio-buttons.h"
 #include "dev-leds-gpio.h"
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c
@ -12,9 +12,9 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>

-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>

+#include "machtype.h"
 #include "devices.h"
 #include "dev-m25p80.h"
 #include "dev-ar913x-wmac.h"
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c
@ -11,9 +11,9 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>

-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>

+#include "machtype.h"
 #include "devices.h"
 #include "dev-m25p80.h"
 #include "dev-ar913x-wmac.h"
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c
@ -11,9 +11,9 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>

-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>

+#include "machtype.h"
 #include "devices.h"
 #include "dev-m25p80.h"
 #include "dev-ap91-pci.h"
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c
@ -11,9 +11,9 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>

-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>

+#include "machtype.h"
 #include "devices.h"
 #include "dev-m25p80.h"
 #include "dev-gpio-buttons.h"
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
@ -11,9 +11,9 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>

-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>

+#include "machtype.h"
 #include "devices.h"
 #include "dev-m25p80.h"
 #include "dev-ar913x-wmac.h"
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
@ -10,9 +10,9 @@
 *  by the Free Software Foundation.
 */

-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>

+#include "machtype.h"
 #include "devices.h"
 #include "dev-m25p80.h"
 #include "dev-ap91-pci.h"
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c
@ -15,9 +15,9 @@
 #include <linux/delay.h>
 #include <linux/rtl8366_smi.h>

-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>

+#include "machtype.h"
 #include "devices.h"
 #include "dev-m25p80.h"
 #include "dev-ap94-pci.h"
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c
@ -13,9 +13,9 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>

-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>

+#include "machtype.h"
 #include "devices.h"
 #include "dev-m25p80.h"
 #include "dev-ar913x-wmac.h"
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c
@ -12,9 +12,9 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>

-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>

+#include "machtype.h"
 #include "devices.h"
 #include "dev-m25p80.h"
 #include "dev-pb42-pci.h"
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt160nl.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt160nl.c
@ -11,9 +11,9 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>

-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>

+#include "machtype.h"
 #include "devices.h"
 #include "dev-m25p80.h"
 #include "dev-ar913x-wmac.h"
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c
@ -12,9 +12,9 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>

-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>

+#include "machtype.h"
 #include "devices.h"
 #include "dev-m25p80.h"
 #include "dev-gpio-buttons.h"
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h
@ -0,0 +1,56 @@
+/*
+ *  Atheros AR71xx machine type definitions
+ *
+ *  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_MACHTYPE_H
+#define _AR71XX_MACHTYPE_H
+
+#include <asm/mips_machine.h>
+
+enum ar71xx_mach_type {
+	AR71XX_MACH_GENERIC = 0,
+	AR71XX_MACH_AP81,	/* Atheros AP81 */
+	AR71XX_MACH_AP83,	/* Atheros AP83 */
+	AR71XX_MACH_AW_NR580,	/* AzureWave AW-NR580 */
+	AR71XX_MACH_DIR_615_C1,	/* D-Link DIR-615 rev. C1 */
+	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 */
+	AR71XX_MACH_RB_433U,	/* MikroTik RouterBOARD 433UAH */
+	AR71XX_MACH_RB_450,	/* MikroTik RouterBOARD 450 */
+	AR71XX_MACH_RB_450G,	/* MikroTik RouterBOARD 450G */
+	AR71XX_MACH_RB_493,	/* Mikrotik RouterBOARD 493/493AH */
+	AR71XX_MACH_PB42,	/* Atheros PB42 */
+	AR71XX_MACH_PB44,	/* Atheros PB44 */
+	AR71XX_MACH_MZK_W04NU,	/* Planex MZK-W04NU */
+	AR71XX_MACH_MZK_W300NH,	/* Planex MZK-W300NH */
+	AR71XX_MACH_TEW_632BRP,	/* TRENDnet TEW-632BRP */
+	AR71XX_MACH_TL_WR741ND,	/* TP-LINK TL-WR741ND */
+	AR71XX_MACH_TL_WR841N_V1, /* TP-LINK TL-WR841N v1 */
+	AR71XX_MACH_TL_WR941ND,	/* TP-LINK TL-WR941ND */
+	AR71XX_MACH_TL_WR1043ND, /* TP-LINK TL-WR1041ND */
+	AR71XX_MACH_UBNT_LSSR71, /* Ubiquiti LS-SR71 */
+	AR71XX_MACH_UBNT_LSX,	/* Ubiquiti LSX */
+	AR71XX_MACH_UBNT_RS,	/* Ubiquiti RouterStation */
+	AR71XX_MACH_UBNT_RSPRO,	/* Ubiquiti RouterStation Pro */
+	AR71XX_MACH_UBNT_BULLET_M, /* Ubiquiti Bullet M */
+	AR71XX_MACH_UBNT_ROCKET_M, /* Ubiquiti Rocket M */
+	AR71XX_MACH_UBNT_NANO_M, /* Ubiquiti NanoStation M */
+	AR71XX_MACH_WNDR3700,	/* NETGEAR WNDR3700 */
+	AR71XX_MACH_WNR2000,	/* NETGEAR WNR2000 */
+	AR71XX_MACH_WP543,	/* Compex WP543 */
+	AR71XX_MACH_WRT160NL,	/* Linksys WRT160NL */
+	AR71XX_MACH_WRT400N,	/* Linksys WRT400N */
+};
+
+extern enum ar71xx_mach_type ar71xx_mach;
+
+#endif /* _AR71XX_MACHTYPE_H */
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
@ -20,6 +20,7 @@

 #include <asm/mach-ar71xx/ar71xx.h>

+#include "machtype.h"
 #include "devices.h"

 struct board_rec {
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c
@ -24,6 +24,7 @@
 #include <asm/mach-ar71xx/ar71xx.h>
 #include <asm/mach-ar71xx/pci.h>

+#include "machtype.h"
 #include "devices.h"

 #define AR71XX_SYS_TYPE_LEN	64
--- 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
@ -119,45 +119,6 @@ enum ar71xx_soc_type {

 extern enum ar71xx_soc_type ar71xx_soc;

-enum ar71xx_mach_type {
-	AR71XX_MACH_GENERIC = 0,
-	AR71XX_MACH_AP81,	/* Atheros AP81 */
-	AR71XX_MACH_AP83,	/* Atheros AP83 */
-	AR71XX_MACH_AW_NR580,	/* AzureWave AW-NR580 */
-	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 */
-	AR71XX_MACH_RB_433U,	/* MikroTik RouterBOARD 433UAH */
-	AR71XX_MACH_RB_450,	/* MikroTik RouterBOARD 450 */
-	AR71XX_MACH_RB_450G,	/* MikroTik RouterBOARD 450G */
-	AR71XX_MACH_RB_493,	/* Mikrotik RouterBOARD 493/493AH */
-	AR71XX_MACH_PB42,	/* Atheros PB42 */
-	AR71XX_MACH_PB44,	/* Atheros PB44 */
-	AR71XX_MACH_MZK_W04NU,	/* Planex MZK-W04NU */
-	AR71XX_MACH_MZK_W300NH,	/* Planex MZK-W300NH */
-	AR71XX_MACH_TEW_632BRP,	/* TRENDnet TEW-632BRP */
-	AR71XX_MACH_DIR_615_C1,	/* D-Link DIR-615 rev. C1 */
-	AR71XX_MACH_TL_WR741ND,	/* TP-LINK TL-WR741ND */
-	AR71XX_MACH_TL_WR841N_V1, /* TP-LINK TL-WR841N v1 */
-	AR71XX_MACH_TL_WR941ND,	/* TP-LINK TL-WR941ND */
-	AR71XX_MACH_TL_WR1043ND, /* TP-LINK TL-WR1041ND */
-	AR71XX_MACH_UBNT_LSSR71, /* Ubiquiti LS-SR71 */
-	AR71XX_MACH_UBNT_LSX,	/* Ubiquiti LSX */
-	AR71XX_MACH_UBNT_RS,	/* Ubiquiti RouterStation */
-	AR71XX_MACH_UBNT_RSPRO,	/* Ubiquiti RouterStation Pro */
-	AR71XX_MACH_UBNT_BULLET_M, /* Ubiquiti Bullet M */
-	AR71XX_MACH_UBNT_ROCKET_M, /* Ubiquiti Rocket M */
-	AR71XX_MACH_UBNT_NANO_M, /* Ubiquiti NanoStation M */
-	AR71XX_MACH_WNR2000,	/* NETGEAR WNR2000 */
-	AR71XX_MACH_WNDR3700,	/* NETGEAR WNDR3700 */
-	AR71XX_MACH_WP543,	/* Compex WP543 */
-	AR71XX_MACH_WRT160NL,	/* Linksys WRT160NL */
-	AR71XX_MACH_WRT400N,	/* Linksys WRT400N */
-};
-
-extern enum ar71xx_mach_type ar71xx_mach;
-
 /*
 * PLL block
 */