diff options
author | Tom Rini <trini@konsulko.com> | 2016-08-28 10:36:20 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-08-28 10:36:20 -0400 |
commit | ff62bdfbd5dd67d37901002a35b541f2c65ad78d (patch) | |
tree | e6f3990b140ea1f469b5c16cd334404b7d3faedd /arch/arm/mach-uniphier/micro-support-card.c | |
parent | b89dfcfd926b8224edd24608065eb9bb601c0d3b (diff) | |
parent | 8d11f804130d27a8f5ed6954f3a8a7f62a10ac45 (diff) | |
download | u-boot-imx-ff62bdfbd5dd67d37901002a35b541f2c65ad78d.zip u-boot-imx-ff62bdfbd5dd67d37901002a35b541f2c65ad78d.tar.gz u-boot-imx-ff62bdfbd5dd67d37901002a35b541f2c65ad78d.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'arch/arm/mach-uniphier/micro-support-card.c')
-rw-r--r-- | arch/arm/mach-uniphier/micro-support-card.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/mach-uniphier/micro-support-card.c b/arch/arm/mach-uniphier/micro-support-card.c index eeb515a..6987d1e 100644 --- a/arch/arm/mach-uniphier/micro-support-card.c +++ b/arch/arm/mach-uniphier/micro-support-card.c @@ -1,5 +1,7 @@ /* - * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com> + * Copyright (C) 2012-2015 Panasonic Corporation + * Copyright (C) 2015-2016 Socionext Inc. + * Author: Masahiro Yamada <yamada.masahiro@socionext.com> * * SPDX-License-Identifier: GPL-2.0+ */ @@ -38,7 +40,12 @@ static int support_card_show_revision(void) u32 revision; revision = readl(MICRO_SUPPORT_CARD_REVISION); - printf("(CPLD version %d.%d)\n", revision >> 4, revision & 0xf); + revision &= 0xff; + + /* revision 3.6.x card changed the revision format */ + printf("(CPLD version %s%d.%d)\n", revision >> 4 == 6 ? "3." : "", + revision >> 4, revision & 0xf); + return 0; } |