summaryrefslogtreecommitdiffstats
path: root/sys/arm/at91/at91_pmc.c
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2012-06-06 06:19:52 +0000
committerimp <imp@FreeBSD.org>2012-06-06 06:19:52 +0000
commit691dfc2d38f86af8b930db40efa6e0ec1a6e455d (patch)
tree617d0d8012fd119d3365d9c0af1002c05b650c26 /sys/arm/at91/at91_pmc.c
parent189fa08e47a3906066f9b390ce70cd71487ca409 (diff)
downloadFreeBSD-src-691dfc2d38f86af8b930db40efa6e0ec1a6e455d.zip
FreeBSD-src-691dfc2d38f86af8b930db40efa6e0ec1a6e455d.tar.gz
Enhance the Atmel SoC chip identification routines to account for more
SoC variants. Fold the AT91SAM9XE chips into the AT91SAM9260 handling, where appropriate. The following SoCs/SoC families are recognized: at91cap9, at91rm9200, at91sam9260, at91sam9261, at91sam9263, at91sam9g10, at91sam9g20, at91sam9g45, at91sam9n12, at91sam9rl, at91sam9x5 and the following variations are also recognized: at91rm9200_bga, at91rm9200_pqfp, at91sam9xe, at91sam9g45, at91sam9m10, at91sam9g46, at91sam9m11, at91sam9g15, at91sam9g25, at91sam9g35, at91sam9x25, at91sam9x35 This is only the identification routine: no additional Atmel devices are supported at this time. # With these changes, I'm able to boot to the point of identification # on a few different Atmel SoCs that we don't yet support using the # KB920X config file -- someday tht will be an ATMEL config file...
Diffstat (limited to 'sys/arm/at91/at91_pmc.c')
-rw-r--r--sys/arm/at91/at91_pmc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arm/at91/at91_pmc.c b/sys/arm/at91/at91_pmc.c
index 2a7ee5e..799a87b 100644
--- a/sys/arm/at91/at91_pmc.c
+++ b/sys/arm/at91/at91_pmc.c
@@ -471,7 +471,7 @@ at91_pmc_init_clock(void)
at91_pmc_pll_rate(&plla, RD4(sc, CKGR_PLLAR));
- if (at91_cpu_is(AT91_CPU_SAM9G45) && (mckr & PMC_MCKR_PLLADIV2))
+ if (at91_cpu_is(AT91_T_SAM9G45) && (mckr & PMC_MCKR_PLLADIV2))
plla.hz /= 2;
/*
@@ -512,7 +512,7 @@ at91_pmc_init_clock(void)
mck.hz /= (1 + mdiv);
/* Only found on SAM9G20 */
- if (at91_cpu_is(AT91_CPU_SAM9G20))
+ if (at91_cpu_is(AT91_T_SAM9G20))
cpu.hz /= (mckr & PMC_MCKR_PDIV) ? 2 : 1;
at91_master_clock = mck.hz;
OpenPOWER on IntegriCloud