From: Piotr Dymacz Date: Sat, 14 Nov 2015 01:15:33 +0000 (+0100) Subject: Fix definitions for QCA953x revisions X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=15279e19b0b7532959a064e2bfd8170f1e52f91f;p=oweals%2Fu-boot_mod.git Fix definitions for QCA953x revisions --- diff --git a/u-boot/cpu/mips/ar7240/qca_common.c b/u-boot/cpu/mips/ar7240/qca_common.c index e878617..6e10620 100644 --- a/u-boot/cpu/mips/ar7240/qca_common.c +++ b/u-boot/cpu/mips/ar7240/qca_common.c @@ -67,11 +67,10 @@ void qca_soc_name_rev(char *buf) break; #endif #if (SOC_TYPE == QCA_QCA9531_SOC || SOC_TYPE == QCA_QCA9533_SOC) - case QCA_RST_REVISION_ID_MAJOR_QCA9531_VAL: - case QCA_RST_REVISION_ID_MAJOR_QCA9533_VAL: + case QCA_RST_REVISION_ID_MAJOR_QCA953X_VAL: sprintf(buf, "QCA953x ver. 1 rev. %d", rev); break; - case QCA_RST_REVISION_ID_MAJOR_QCA9533_V2_VAL: + case QCA_RST_REVISION_ID_MAJOR_QCA953X_V2_VAL: sprintf(buf, "QCA953x ver. 2 rev. %d", rev); break; #endif diff --git a/u-boot/include/soc/qca_soc_common.h b/u-boot/include/soc/qca_soc_common.h index 51c50aa..e6a20af 100644 --- a/u-boot/include/soc/qca_soc_common.h +++ b/u-boot/include/soc/qca_soc_common.h @@ -822,9 +822,8 @@ #define QCA_RST_REVISION_ID_MAJOR_AR9331_VAL 0x1110 #define QCA_RST_REVISION_ID_MAJOR_AR9341_VAL 0x0120 #define QCA_RST_REVISION_ID_MAJOR_AR9344_VAL 0x2120 -#define QCA_RST_REVISION_ID_MAJOR_QCA9531_VAL 0x0140 -#define QCA_RST_REVISION_ID_MAJOR_QCA9533_VAL 0x0140 -#define QCA_RST_REVISION_ID_MAJOR_QCA9533_V2_VAL 0x0160 +#define QCA_RST_REVISION_ID_MAJOR_QCA953X_VAL 0x0140 +#define QCA_RST_REVISION_ID_MAJOR_QCA953X_V2_VAL 0x0160 #define QCA_RST_REVISION_ID_MAJOR_QCA9558_VAL 0x1130