Message ID | 1437391715-1344-2-git-send-email-Peng.Fan@freescale.com |
---|---|
State | Awaiting Upstream |
Delegated to: | Stefano Babic |
Headers | show |
On 20/07/2015 13:28, Peng Fan wrote: > Add MXC_CPU_MX6UL for i.MX6UL CPU type which is got at runtime from > DIGPROG register. But the value has been occupied by MXC_CPU_MX6D which > is not real id from DIGPROG register, so change i.MX6D to value 0x67 which > was not occupied. > > Signed-off-by: Peng Fan <Peng.Fan@freescale.com> > Signed-off-by: Ye.Li <B37916@freescale.com> > --- > > Changes v3: > None > > Changes v2: > Refine commit msg. > > arch/arm/imx-common/cpu.c | 2 ++ > arch/arm/include/asm/arch-imx/cpu.h | 3 ++- > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c > index 096d22e..e27546c 100644 > --- a/arch/arm/imx-common/cpu.c > +++ b/arch/arm/imx-common/cpu.c > @@ -138,6 +138,8 @@ const char *get_imx_type(u32 imxtype) > return "6SL"; /* Solo-Lite version of the mx6 */ > case MXC_CPU_MX6SX: > return "6SX"; /* SoloX version of the mx6 */ > + case MXC_CPU_MX6UL: > + return "6UL"; /* Ultra-Lite version of the mx6 */ > case MXC_CPU_MX51: > return "51"; > case MXC_CPU_MX53: > diff --git a/arch/arm/include/asm/arch-imx/cpu.h b/arch/arm/include/asm/arch-imx/cpu.h > index 99e0e32..c7f9fff 100644 > --- a/arch/arm/include/asm/arch-imx/cpu.h > +++ b/arch/arm/include/asm/arch-imx/cpu.h > @@ -10,8 +10,9 @@ > #define MXC_CPU_MX6DL 0x61 > #define MXC_CPU_MX6SX 0x62 > #define MXC_CPU_MX6Q 0x63 > -#define MXC_CPU_MX6D 0x64 > +#define MXC_CPU_MX6UL 0x64 > #define MXC_CPU_MX6SOLO 0x65 /* dummy ID */ > +#define MXC_CPU_MX6D 0x67 > #define MXC_CPU_MX6DP 0x68 > #define MXC_CPU_MX6QP 0x69 > > Applied to u-boot-imx, thanks ! Best regards, Stefano Babic
diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c index 096d22e..e27546c 100644 --- a/arch/arm/imx-common/cpu.c +++ b/arch/arm/imx-common/cpu.c @@ -138,6 +138,8 @@ const char *get_imx_type(u32 imxtype) return "6SL"; /* Solo-Lite version of the mx6 */ case MXC_CPU_MX6SX: return "6SX"; /* SoloX version of the mx6 */ + case MXC_CPU_MX6UL: + return "6UL"; /* Ultra-Lite version of the mx6 */ case MXC_CPU_MX51: return "51"; case MXC_CPU_MX53: diff --git a/arch/arm/include/asm/arch-imx/cpu.h b/arch/arm/include/asm/arch-imx/cpu.h index 99e0e32..c7f9fff 100644 --- a/arch/arm/include/asm/arch-imx/cpu.h +++ b/arch/arm/include/asm/arch-imx/cpu.h @@ -10,8 +10,9 @@ #define MXC_CPU_MX6DL 0x61 #define MXC_CPU_MX6SX 0x62 #define MXC_CPU_MX6Q 0x63 -#define MXC_CPU_MX6D 0x64 +#define MXC_CPU_MX6UL 0x64 #define MXC_CPU_MX6SOLO 0x65 /* dummy ID */ +#define MXC_CPU_MX6D 0x67 #define MXC_CPU_MX6DP 0x68 #define MXC_CPU_MX6QP 0x69