diff options
| author | adrian <adrian@FreeBSD.org> | 2013-03-28 19:30:56 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2013-03-28 19:30:56 +0000 |
| commit | 4a2838ceff4b64fde681bc67b2405cae4b1bd8d5 (patch) | |
| tree | d39195b122f6dea635843a0d6e98ce1616654561 | |
| parent | 7eebeb2d9d755fae9127266430445da6c51bbeb3 (diff) | |
| download | FreeBSD-src-4a2838ceff4b64fde681bc67b2405cae4b1bd8d5.zip FreeBSD-src-4a2838ceff4b64fde681bc67b2405cae4b1bd8d5.tar.gz | |
Tie in the AR933x support into -HEAD.
| -rw-r--r-- | sys/mips/atheros/ar71xx_setup.c | 18 | ||||
| -rw-r--r-- | sys/mips/atheros/files.ar71xx | 4 |
2 files changed, 19 insertions, 3 deletions
diff --git a/sys/mips/atheros/ar71xx_setup.c b/sys/mips/atheros/ar71xx_setup.c index ce600e4..34a7c80 100644 --- a/sys/mips/atheros/ar71xx_setup.c +++ b/sys/mips/atheros/ar71xx_setup.c @@ -52,6 +52,8 @@ __FBSDID("$FreeBSD$"); #include <machine/vmparam.h> #include <mips/atheros/ar71xxreg.h> +#include <mips/atheros/ar933xreg.h> + #include <mips/atheros/ar71xx_setup.h> #include <mips/atheros/ar71xx_cpudef.h> @@ -59,8 +61,7 @@ __FBSDID("$FreeBSD$"); #include <mips/atheros/ar71xx_chip.h> #include <mips/atheros/ar724x_chip.h> #include <mips/atheros/ar91xx_chip.h> - -#include <mips/sentry5/s5reg.h> +#include <mips/atheros/ar933x_chip.h> #define AR71XX_SYS_TYPE_LEN 128 @@ -142,7 +143,18 @@ ar71xx_detect_sys_type(void) break; } break; - + case REV_ID_MAJOR_AR9330: + minor = 0; + rev = (id & AR933X_REV_ID_REVISION_MASK); + chip = "9330"; + ar71xx_cpu_ops = &ar933x_chip_def; + break; + case REV_ID_MAJOR_AR9331: + minor = 1; + rev = (id & AR933X_REV_ID_REVISION_MASK); + chip = "9331"; + ar71xx_cpu_ops = &ar933x_chip_def; + break; default: panic("ar71xx: unknown chip id:0x%08x\n", id); diff --git a/sys/mips/atheros/files.ar71xx b/sys/mips/atheros/files.ar71xx index e28c9ea..b72e614 100644 --- a/sys/mips/atheros/files.ar71xx +++ b/sys/mips/atheros/files.ar71xx @@ -14,6 +14,9 @@ mips/atheros/ar71xx_wdog.c optional ar71xx_wdog mips/atheros/if_arge.c optional arge mips/atheros/uart_bus_ar71xx.c optional uart_ar71xx mips/atheros/uart_cpu_ar71xx.c optional uart_ar71xx +mips/atheros/uart_bus_ar933x.c optional uart_ar933x +mips/atheros/uart_cpu_ar933x.c optional uart_ar933x +mips/atheros/uart_dev_ar933x.c optional uart_ar933x mips/atheros/ar71xx_bus_space_reversed.c standard mips/mips/intr_machdep.c standard mips/mips/tick.c standard @@ -21,6 +24,7 @@ mips/atheros/ar71xx_setup.c standard mips/atheros/ar71xx_chip.c standard mips/atheros/ar724x_chip.c standard mips/atheros/ar91xx_chip.c standard +mips/atheros/ar933x_chip.c standard mips/atheros/ar71xx_fixup.c optional ar71xx_ath_eeprom dev/hwpmc/hwpmc_mips24k.c optional hwpmc_mips24k |
