From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Thu, 9 May 2019 13:48:22 +0000 (+0200)
Subject: arm: mx6: fix cpu_rev calculation
X-Git-Tag: KARO-TX6-2019-07-31~9
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=98792b30fbddf8626c5f77f33c56f2b836dbe3d7

arm: mx6: fix cpu_rev calculation
---

diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
index 314f29463b..1db85a1d8a 100644
--- a/arch/arm/cpu/armv7/mx6/soc.c
+++ b/arch/arm/cpu/armv7/mx6/soc.c
@@ -116,6 +116,20 @@ u32 get_cpu_rev(void)
 			type = MXC_CPU_MX6DP;
 	}
 	reg &= 0xff;		/* mx6 silicon revision */
+	if (type == MXC_CPU_MX6Q) {
+		switch (reg) {
+		case 0x02:
+			break;
+		case 0x05:
+			reg = 0x03;
+			break;
+		case 0x06:
+			reg = 0x06;
+			break;
+		default:
+			printf("Unknown CPU Rev.: 0x%02x\n", reg);
+		}
+	}
 	return (type << 12) | (reg + (0x10 * (major + 1)));
 }
 
@@ -583,8 +597,6 @@ __weak void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
 		mac[5] = mac1 >> 16;
 	}
 }
-
-//void imx_get_mac_from_fuse(int dev_id, unsigned char *mac) __attribute__((weak("__imx_get_mac_from_fuse")));
 #endif
 
 void boot_mode_apply(unsigned cfg_val)