From 91491c6e37b69cc26acd82f3685e71720c415831 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Fri, 19 Dec 2008 19:17:53 +0000 Subject: rename RouterStation stuff, and add machine type for the LSX board SVN-Revision: 13694 --- target/linux/ar71xx/config-2.6.26 | 2 +- target/linux/ar71xx/config-2.6.27 | 2 +- target/linux/ar71xx/config-2.6.28 | 1 + .../arch/mips/include/asm/mach-ar71xx/ar71xx.h | 3 +- target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig | 4 +-- .../linux/ar71xx/files/arch/mips/ar71xx/Makefile | 2 +- .../files/arch/mips/ar71xx/mach-routerstation.c | 37 ---------------------- .../ar71xx/files/arch/mips/ar71xx/mach-ubnt.c | 37 ++++++++++++++++++++++ .../files/include/asm-mips/mach-ar71xx/ar71xx.h | 3 +- 9 files changed, 47 insertions(+), 44 deletions(-) delete mode 100644 target/linux/ar71xx/files/arch/mips/ar71xx/mach-routerstation.c create mode 100644 target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c diff --git a/target/linux/ar71xx/config-2.6.26 b/target/linux/ar71xx/config-2.6.26 index f091cdf58a..6fe9333963 100644 --- a/target/linux/ar71xx/config-2.6.26 +++ b/target/linux/ar71xx/config-2.6.26 @@ -8,8 +8,8 @@ CONFIG_AR71XX_MACH_AP83=y CONFIG_AR71XX_MACH_AW_NR580=y CONFIG_AR71XX_MACH_GENERIC=y CONFIG_AR71XX_MACH_RB_4XX=y -CONFIG_AR71XX_MACH_ROUTERSTATION=y CONFIG_AR71XX_MACH_TEW_632BRP=y +CONFIG_AR71XX_MACH_UBNT=y CONFIG_AR71XX_MACH_WP543=y CONFIG_AR71XX_WDT=y # CONFIG_ARCH_HAS_ILOG2_U32 is not set diff --git a/target/linux/ar71xx/config-2.6.27 b/target/linux/ar71xx/config-2.6.27 index 566c8cda51..5cb344df2d 100644 --- a/target/linux/ar71xx/config-2.6.27 +++ b/target/linux/ar71xx/config-2.6.27 @@ -8,8 +8,8 @@ CONFIG_AR71XX_MACH_AP83=y CONFIG_AR71XX_MACH_AW_NR580=y CONFIG_AR71XX_MACH_GENERIC=y CONFIG_AR71XX_MACH_RB_4XX=y -CONFIG_AR71XX_MACH_ROUTERSTATION=y CONFIG_AR71XX_MACH_TEW_632BRP=y +CONFIG_AR71XX_MACH_UBNT=y CONFIG_AR71XX_MACH_WP543=y CONFIG_AR71XX_WDT=y # CONFIG_ARCH_HAS_ILOG2_U32 is not set diff --git a/target/linux/ar71xx/config-2.6.28 b/target/linux/ar71xx/config-2.6.28 index 077260dd9c..17eafa13d7 100644 --- a/target/linux/ar71xx/config-2.6.28 +++ b/target/linux/ar71xx/config-2.6.28 @@ -9,6 +9,7 @@ CONFIG_AR71XX_MACH_AW_NR580=y CONFIG_AR71XX_MACH_GENERIC=y CONFIG_AR71XX_MACH_RB_4XX=y CONFIG_AR71XX_MACH_TEW_632BRP=y +CONFIG_AR71XX_MACH_UBNT=y CONFIG_AR71XX_MACH_WP543=y CONFIG_AR71XX_WDT=y # CONFIG_ARCH_HAS_ILOG2_U32 is not set diff --git a/target/linux/ar71xx/files-2.6.28/arch/mips/include/asm/mach-ar71xx/ar71xx.h b/target/linux/ar71xx/files-2.6.28/arch/mips/include/asm/mach-ar71xx/ar71xx.h index 87af166d5e..8379aedab1 100644 --- a/target/linux/ar71xx/files-2.6.28/arch/mips/include/asm/mach-ar71xx/ar71xx.h +++ b/target/linux/ar71xx/files-2.6.28/arch/mips/include/asm/mach-ar71xx/ar71xx.h @@ -114,7 +114,8 @@ extern unsigned long ar71xx_mach_type; #define AR71XX_MACH_AW_NR580 6 /* AzureWave AW-NR580 */ #define AR71XX_MACH_AP83 7 /* Atheros AP83 */ #define AR71XX_MACH_TEW_632BRP 8 /* TRENDnet TEW-632BRP */ -#define AR71XX_MACH_ROUTERSTATION 9 /* Ubiquiti RouterStation */ +#define AR71XX_MACH_UBNT_RS 9 /* Ubiquiti RouterStation */ +#define AR71XX_MACH_UBNT_LSX 10 /* Ubiquiti LSX */ /* * PLL block diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig b/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig index d16fdb8240..66500a94bd 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig @@ -31,8 +31,8 @@ config AR71XX_MACH_TEW_632BRP bool "TRENDnet TEW-632BRP support" default y -config AR71XX_MACH_ROUTERSTATION - bool "Ubiquiti RouterStation support" +config AR71XX_MACH_UBNT + bool "Ubiquiti AR71xx based boards support" default y endmenu diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/Makefile b/target/linux/ar71xx/files/arch/mips/ar71xx/Makefile index f53dc9daf1..902cbc353f 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/Makefile +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/Makefile @@ -14,6 +14,6 @@ obj-$(CONFIG_AR71XX_MACH_AP83) += mach-ap83.o obj-$(CONFIG_AR71XX_MACH_AW_NR580) += mach-aw-nr580.o obj-$(CONFIG_AR71XX_MACH_GENERIC) += mach-generic.o obj-$(CONFIG_AR71XX_MACH_RB_4XX) += mach-rb-4xx.o -obj-$(CONFIG_AR71XX_MACH_ROUTERSTATION) += mach-routerstation.o obj-$(CONFIG_AR71XX_MACH_TEW_632BRP) += mach-tew-632brp.o +obj-$(CONFIG_AR71XX_MACH_UBNT) += mach-ubnt.o obj-$(CONFIG_AR71XX_MACH_WP543) += mach-wp543.o diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-routerstation.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-routerstation.c deleted file mode 100644 index a8de7117f5..0000000000 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-routerstation.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Ubiquiti RouterStation support - * - * Copyright (C) 2008 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. - */ - -#include -#include -#include - -#include -#include -#include -#include - -static struct spi_board_info routerstation_spi_info[] = { - { - .bus_num = 0, - .chip_select = 0, - .max_speed_hz = 25000000, - .modalias = "m25p80", - } -}; - -static void __init routerstation_setup(void) -{ - ar71xx_add_device_spi(NULL, routerstation_spi_info, - ARRAY_SIZE(routerstation_spi_info)); -} - -MIPS_MACHINE(AR71XX_MACH_ROUTERSTATION, "Ubiquiti RouterStation", - routerstation_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c new file mode 100644 index 0000000000..b1b18f9d47 --- /dev/null +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c @@ -0,0 +1,37 @@ +/* + * Ubiquiti RouterStation support + * + * Copyright (C) 2008 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. + */ + +#include +#include +#include + +#include +#include +#include +#include + +static struct spi_board_info routerstation_spi_info[] = { + { + .bus_num = 0, + .chip_select = 0, + .max_speed_hz = 25000000, + .modalias = "m25p80", + } +}; + +static void __init routerstation_setup(void) +{ + ar71xx_add_device_spi(NULL, routerstation_spi_info, + ARRAY_SIZE(routerstation_spi_info)); +} + +MIPS_MACHINE(AR71XX_MACH_UBNT_RS, "Ubiquiti RouterStation", + routerstation_setup); diff --git a/target/linux/ar71xx/files/include/asm-mips/mach-ar71xx/ar71xx.h b/target/linux/ar71xx/files/include/asm-mips/mach-ar71xx/ar71xx.h index 87af166d5e..8379aedab1 100644 --- a/target/linux/ar71xx/files/include/asm-mips/mach-ar71xx/ar71xx.h +++ b/target/linux/ar71xx/files/include/asm-mips/mach-ar71xx/ar71xx.h @@ -114,7 +114,8 @@ extern unsigned long ar71xx_mach_type; #define AR71XX_MACH_AW_NR580 6 /* AzureWave AW-NR580 */ #define AR71XX_MACH_AP83 7 /* Atheros AP83 */ #define AR71XX_MACH_TEW_632BRP 8 /* TRENDnet TEW-632BRP */ -#define AR71XX_MACH_ROUTERSTATION 9 /* Ubiquiti RouterStation */ +#define AR71XX_MACH_UBNT_RS 9 /* Ubiquiti RouterStation */ +#define AR71XX_MACH_UBNT_LSX 10 /* Ubiquiti LSX */ /* * PLL block -- cgit v1.2.3