From bea984e18710a2e9f0f5b46ceceb381b667995b4 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Sat, 26 Dec 2009 14:19:22 +0000 Subject: [PATCH] ar71xx: move mach type definitions into a separate include file SVN-Revision: 18942 --- .../ar71xx/files/arch/mips/ar71xx/mach-ap81.c | 2 +- .../ar71xx/files/arch/mips/ar71xx/mach-ap83.c | 2 +- .../files/arch/mips/ar71xx/mach-aw-nr580.c | 1 + .../files/arch/mips/ar71xx/mach-dir-615-c1.c | 2 +- .../files/arch/mips/ar71xx/mach-dir-825-b1.c | 2 +- .../files/arch/mips/ar71xx/mach-generic.c | 2 +- .../files/arch/mips/ar71xx/mach-mzk-w04nu.c | 2 +- .../files/arch/mips/ar71xx/mach-mzk-w300nh.c | 2 +- .../ar71xx/files/arch/mips/ar71xx/mach-pb42.c | 2 +- .../ar71xx/files/arch/mips/ar71xx/mach-pb44.c | 2 +- .../files/arch/mips/ar71xx/mach-rb-4xx.c | 2 +- .../files/arch/mips/ar71xx/mach-tew-632brp.c | 2 +- .../files/arch/mips/ar71xx/mach-tl-wr1043nd.c | 2 +- .../files/arch/mips/ar71xx/mach-tl-wr741nd.c | 2 +- .../files/arch/mips/ar71xx/mach-tl-wr841n.c | 2 +- .../files/arch/mips/ar71xx/mach-tl-wr941nd.c | 2 +- .../ar71xx/files/arch/mips/ar71xx/mach-ubnt.c | 2 +- .../files/arch/mips/ar71xx/mach-wndr3700.c | 2 +- .../files/arch/mips/ar71xx/mach-wnr2000.c | 2 +- .../files/arch/mips/ar71xx/mach-wp543.c | 2 +- .../files/arch/mips/ar71xx/mach-wrt160nl.c | 2 +- .../files/arch/mips/ar71xx/mach-wrt400n.c | 2 +- .../ar71xx/files/arch/mips/ar71xx/machtype.h | 56 +++++++++++++++++++ .../ar71xx/files/arch/mips/ar71xx/prom.c | 1 + .../ar71xx/files/arch/mips/ar71xx/setup.c | 1 + .../mips/include/asm/mach-ar71xx/ar71xx.h | 39 ------------- 26 files changed, 80 insertions(+), 60 deletions(-) create mode 100644 target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap81.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap81.c index 24d0022fbd..0011ba419a 100644 --- 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 #include -#include #include +#include "machtype.h" #include "devices.h" #include "dev-m25p80.h" #include "dev-ar913x-wmac.h" diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c index fb5d0533c3..d2cbc21874 100644 --- 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 #include -#include #include #include +#include "machtype.h" #include "devices.h" #include "dev-ar913x-wmac.h" #include "dev-gpio-buttons.h" diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-aw-nr580.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-aw-nr580.c index 8d85612291..6052e37e53 100644 --- 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 #include +#include "machtype.h" #include "devices.h" #include "dev-m25p80.h" #include "dev-gpio-buttons.h" diff --git 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 index e756487d36..3f1cbeb3f5 100644 --- 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 #include -#include #include +#include "machtype.h" #include "devices.h" #include "dev-m25p80.h" #include "dev-ar913x-wmac.h" diff --git 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 index 47a2c01564..93a01fd773 100644 --- 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 #include -#include #include +#include "machtype.h" #include "devices.h" #include "dev-m25p80.h" #include "dev-ap94-pci.h" diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-generic.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-generic.c index c183ba937c..49882051e0 100644 --- 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 -#include #include +#include "machtype.h" static void __init ar71xx_generic_init(void) { diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c index 6ebfe38ded..127d90f26a 100644 --- 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 #include -#include #include +#include "machtype.h" #include "devices.h" #include "dev-ar913x-wmac.h" #include "dev-gpio-buttons.h" diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c index 3f394047ac..098c1a6060 100644 --- 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 #include -#include #include +#include "machtype.h" #include "devices.h" #include "dev-m25p80.h" #include "dev-ar913x-wmac.h" 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 10cdf5d2fa..0f70d9525b 100644 --- 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 #include +#include "machtype.h" #include "devices.h" #include "dev-m25p80.h" #include "dev-gpio-buttons.h" diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb44.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb44.c index 34d264cc05..aad5d0af94 100644 --- 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 #include -#include #include +#include "machtype.h" #include "devices.h" #include "dev-pb42-pci.h" #include "dev-gpio-buttons.h" diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb-4xx.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb-4xx.c index 8f89c43743..8b6f34e960 100644 --- 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 #include -#include #include #include +#include "machtype.h" #include "devices.h" #include "dev-gpio-buttons.h" #include "dev-leds-gpio.h" diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c index 3dfc006907..00e90da079 100644 --- 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 #include -#include #include +#include "machtype.h" #include "devices.h" #include "dev-m25p80.h" #include "dev-ar913x-wmac.h" diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c index baaa2a9bdc..f34a4ab613 100644 --- 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 #include -#include #include +#include "machtype.h" #include "devices.h" #include "dev-m25p80.h" #include "dev-ar913x-wmac.h" diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c index 850cc81817..ecedbb5a82 100644 --- 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 #include -#include #include +#include "machtype.h" #include "devices.h" #include "dev-m25p80.h" #include "dev-ap91-pci.h" diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c index bc900a5814..a0a4dda84c 100644 --- 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 #include -#include #include +#include "machtype.h" #include "devices.h" #include "dev-m25p80.h" #include "dev-gpio-buttons.h" diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c index 35ab8ba721..55fde5cb3a 100644 --- 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 #include -#include #include +#include "machtype.h" #include "devices.h" #include "dev-m25p80.h" #include "dev-ar913x-wmac.h" diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c index 478b919c6c..1a63b99d6a 100644 --- 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 #include +#include "machtype.h" #include "devices.h" #include "dev-m25p80.h" #include "dev-ap91-pci.h" diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c index 7cf8e315d1..4220e61cd1 100644 --- 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 #include -#include #include +#include "machtype.h" #include "devices.h" #include "dev-m25p80.h" #include "dev-ap94-pci.h" diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c index 7d7ad96602..251def844e 100644 --- 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 #include -#include #include +#include "machtype.h" #include "devices.h" #include "dev-m25p80.h" #include "dev-ar913x-wmac.h" diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c index 850b0108e3..d20800ea54 100644 --- 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 #include -#include #include +#include "machtype.h" #include "devices.h" #include "dev-m25p80.h" #include "dev-pb42-pci.h" diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt160nl.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt160nl.c index bf3f3c2972..618a4aa0ba 100644 --- 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 #include -#include #include +#include "machtype.h" #include "devices.h" #include "dev-m25p80.h" #include "dev-ar913x-wmac.h" diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c index 51e3335440..0f97ac75bf 100644 --- 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 #include -#include #include +#include "machtype.h" #include "devices.h" #include "dev-m25p80.h" #include "dev-gpio-buttons.h" diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h b/target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h new file mode 100644 index 0000000000..34d7702402 --- /dev/null +++ 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 + * Copyright (C) 2008 Imre Kaloz + * + * 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 + +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 */ diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c index b38b48ba3b..f522d1ff39 100644 --- 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 +#include "machtype.h" #include "devices.h" struct board_rec { diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c b/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c index 4a2295af49..7ea29ed8bd 100644 --- 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 #include +#include "machtype.h" #include "devices.h" #define AR71XX_SYS_TYPE_LEN 64 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 7a52e8b54c..00e7cbc4b7 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 @@ -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 */ -- 2.25.1