diff options
| author | cognet <cognet@FreeBSD.org> | 2010-10-06 22:25:21 +0000 |
|---|---|---|
| committer | cognet <cognet@FreeBSD.org> | 2010-10-06 22:25:21 +0000 |
| commit | 2edabad8a47c024ddbf097f91202a71b88cff6fc (patch) | |
| tree | c231f180320438f262879021e2e02bbace0911b3 /sys/arm/at91/at91_twireg.h | |
| parent | 87987160d6251c2bc94a904a9995d519ac8df5fd (diff) | |
| download | FreeBSD-src-2edabad8a47c024ddbf097f91202a71b88cff6fc.zip FreeBSD-src-2edabad8a47c024ddbf097f91202a71b88cff6fc.tar.gz | |
if_ate.c:
* Support for sam9 "EMAC" controller.
* Support for rmii interface to phy.
at91.c & at91sam9.c:
* Eliminate separate at91sam9.c file.
* Add new devices to at91sam9_devs table.
at91_machdep.c & at at91sam9_machdep.c:
* Automatic chip type determination.
* Remove compile time chip dependencies.
* Eliminate separate at91sam9_machdep.c file.
at91_pmc.c:
* Corrected support for all of the sam926? and sam9g20 chips.
* Remove compile time chip dependencies.
My apologies to Greg for taking so long to take care of it.
Diffstat (limited to 'sys/arm/at91/at91_twireg.h')
| -rw-r--r-- | sys/arm/at91/at91_twireg.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/arm/at91/at91_twireg.h b/sys/arm/at91/at91_twireg.h index 6cca101..7d61a4a 100644 --- a/sys/arm/at91/at91_twireg.h +++ b/sys/arm/at91/at91_twireg.h @@ -63,7 +63,10 @@ #define TWI_CWGR_CKDIV(x) ((x) << 16) /* Clock Divider */ #define TWI_CWGR_CHDIV(x) ((x) << 8) /* Clock High Divider */ #define TWI_CWGR_CLDIV(x) ((x) << 0) /* Clock Low Divider */ -#define TWI_CWGR_DIV(rate) ((at91_master_clock /(4*(rate))) - 2) +#define TWI_CWGR_DIV(rate) \ + (at91_is_sam9() ? \ + ((at91_master_clock /(4*(rate))) - 3) : \ + ((at91_master_clock /(4*(rate))) - 2)) /* TWI_SR */ /* TWI_IER */ |
