Date: Thu, 28 Mar 2013 19:30:57 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r248844 - head/sys/mips/atheros Message-ID: <201303281930.r2SJUvZu071051@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Thu Mar 28 19:30:56 2013 New Revision: 248844 URL: http://svnweb.freebsd.org/changeset/base/248844 Log: Tie in the AR933x support into -HEAD. Modified: head/sys/mips/atheros/ar71xx_setup.c head/sys/mips/atheros/files.ar71xx Modified: head/sys/mips/atheros/ar71xx_setup.c ============================================================================== --- head/sys/mips/atheros/ar71xx_setup.c Thu Mar 28 19:27:06 2013 (r248843) +++ head/sys/mips/atheros/ar71xx_setup.c Thu Mar 28 19:30:56 2013 (r248844) @@ -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); Modified: head/sys/mips/atheros/files.ar71xx ============================================================================== --- head/sys/mips/atheros/files.ar71xx Thu Mar 28 19:27:06 2013 (r248843) +++ head/sys/mips/atheros/files.ar71xx Thu Mar 28 19:30:56 2013 (r248844) @@ -14,6 +14,9 @@ mips/atheros/ar71xx_wdog.c optional ar71 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303281930.r2SJUvZu071051>