diff options
| author | Tom Rini <trini@konsulko.com> | 2017-12-18 18:39:00 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-12-18 18:39:00 -0500 |
| commit | 1a3fc354b50b2a86361964b6d695ce26058248f5 (patch) | |
| tree | d4d6fa80b189ff547e8ec320daecdbe4675e7ffe /drivers | |
| parent | 1a1e7072e3f5499c919fadf949ddb5ce654a17a3 (diff) | |
| parent | 1b7910a37ccc889e1b58a5f6e095a39728564bb8 (diff) | |
| download | u-boot-1a3fc354b50b2a86361964b6d695ce26058248f5.zip u-boot-1a3fc354b50b2a86361964b6d695ce26058248f5.tar.gz u-boot-1a3fc354b50b2a86361964b6d695ce26058248f5.tar.bz2 | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/fsl-mc/dpio/qbman_private.h | 4 | ||||
| -rw-r--r-- | drivers/usb/common/fsl-errata.c | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/drivers/net/fsl-mc/dpio/qbman_private.h b/drivers/net/fsl-mc/dpio/qbman_private.h index 73bbae3..873323b 100644 --- a/drivers/net/fsl-mc/dpio/qbman_private.h +++ b/drivers/net/fsl-mc/dpio/qbman_private.h @@ -175,8 +175,8 @@ void qbman_version(u32 *major, u32 *minor) * LS2080A SoC and its personalities has qbman cotroller version 4.0 * New SoCs like LS2088A, LS1088A has qbman conroller version 4.1 */ - svr_dev_id = get_svr() >> 16; - if (svr_dev_id == SVR_DEV_LS2080A) { + svr_dev_id = get_svr(); + if (IS_SVR_DEV(svr_dev_id, SVR_DEV(SVR_LS2080A))) { *major = 4; *minor = 0; } else { diff --git a/drivers/usb/common/fsl-errata.c b/drivers/usb/common/fsl-errata.c index 823beb3..6e2a464 100644 --- a/drivers/usb/common/fsl-errata.c +++ b/drivers/usb/common/fsl-errata.c @@ -198,6 +198,11 @@ bool has_erratum_a010151(void) u32 svr = get_svr(); u32 soc = SVR_SOC_VER(svr); +#ifdef CONFIG_ARM64 + if (IS_SVR_DEV(svr, SVR_DEV(SVR_LS1043A))) + return IS_SVR_REV(svr, 1, 0) || IS_SVR_REV(svr, 1, 1); +#endif + switch (soc) { #ifdef CONFIG_ARM64 case SVR_LS2080A: @@ -209,8 +214,6 @@ bool has_erratum_a010151(void) case SVR_LS1046A: case SVR_LS1012A: return IS_SVR_REV(svr, 1, 0); - case SVR_LS1043A: - return IS_SVR_REV(svr, 1, 0) || IS_SVR_REV(svr, 1, 1); #endif #ifdef CONFIG_ARCH_LS1021A case SOC_VER_LS1020: |