diff options
| author | gonzo <gonzo@FreeBSD.org> | 2013-07-08 04:27:03 +0000 |
|---|---|---|
| committer | gonzo <gonzo@FreeBSD.org> | 2013-07-08 04:27:03 +0000 |
| commit | 9d8d39dde6d7ef975d69b3991055995964aa1653 (patch) | |
| tree | c035cbe386f4f0f1a1700feecc3981c14942e197 /sys/arm | |
| parent | 1d83289ae6bdeb9c1146a53dd6b64cfc72fe0320 (diff) | |
| download | FreeBSD-src-9d8d39dde6d7ef975d69b3991055995964aa1653.zip FreeBSD-src-9d8d39dde6d7ef975d69b3991055995964aa1653.tar.gz | |
- AM335x requires updated soft-reset logic too
Diffstat (limited to 'sys/arm')
| -rw-r--r-- | sys/arm/ti/ti_mmchs.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/arm/ti/ti_mmchs.c b/sys/arm/ti/ti_mmchs.c index d4f436f..7587723 100644 --- a/sys/arm/ti/ti_mmchs.c +++ b/sys/arm/ti/ti_mmchs.c @@ -213,10 +213,13 @@ ti_mmchs_reset_controller(struct ti_mmchs_softc *sc, uint32_t bit) sysctl = ti_mmchs_read_4(sc, MMCHS_SYSCTL); ti_mmchs_write_4(sc, MMCHS_SYSCTL, sysctl | bit); - if ((ti_chip() == CHIP_OMAP_4) && (ti_revision() > OMAP4430_REV_ES1_0)) { - /* OMAP4 ES2 and greater has an updated reset logic. - * Monitor a 0->1 transition first - */ + + /* + * AM335x and OMAP4 ES2 and greater has an updated reset logic. + * Monitor a 0->1 transition first + */ + if ((ti_chip() == CHIP_AM335X) || + ((ti_chip() == CHIP_OMAP_4) && (ti_revision() > OMAP4430_REV_ES1_0))) { attempts = 10000; while (!(ti_mmchs_read_4(sc, MMCHS_SYSCTL) & bit) && (attempts-- > 0)) continue; |
