* [U-Boot] [PATCH v4 1/2] imx: Introduce a header for the imx cpu versions
@ 2014-01-26 17:06 Fabio Estevam
2014-01-26 17:06 ` [U-Boot] [PATCH v4 2/2] mx6: Distinguish mx6dual from mx6quad Fabio Estevam
2014-02-11 10:26 ` [U-Boot] [PATCH v4 1/2] imx: Introduce a header for the imx cpu versions Stefano Babic
0 siblings, 2 replies; 6+ messages in thread
From: Fabio Estevam @ 2014-01-26 17:06 UTC (permalink / raw)
To: u-boot
From: Fabio Estevam <fabio.estevam@freescale.com>
Instead of duplicating the CPU definitions at mx5 and mx6 sys_proto.h header
files, introduce a common header to centralize such definitions.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v3:
- no changes
Changes since v2:
- Newly introduced
arch/arm/include/asm/arch-imx/cpu.h | 12 ++++++++++++
arch/arm/include/asm/arch-mx5/sys_proto.h | 7 +------
arch/arm/include/asm/arch-mx6/sys_proto.h | 8 +-------
3 files changed, 14 insertions(+), 13 deletions(-)
create mode 100644 arch/arm/include/asm/arch-imx/cpu.h
diff --git a/arch/arm/include/asm/arch-imx/cpu.h b/arch/arm/include/asm/arch-imx/cpu.h
new file mode 100644
index 0000000..8c725e2
--- /dev/null
+++ b/arch/arm/include/asm/arch-imx/cpu.h
@@ -0,0 +1,12 @@
+/*
+ * (C) Copyright 2014 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#define MXC_CPU_MX51 0x51
+#define MXC_CPU_MX53 0x53
+#define MXC_CPU_MX6SL 0x60
+#define MXC_CPU_MX6DL 0x61
+#define MXC_CPU_MX6SOLO 0x62
+#define MXC_CPU_MX6Q 0x63
diff --git a/arch/arm/include/asm/arch-mx5/sys_proto.h b/arch/arm/include/asm/arch-mx5/sys_proto.h
index 9949ad1..ac7705b 100644
--- a/arch/arm/include/asm/arch-mx5/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx5/sys_proto.h
@@ -8,12 +8,7 @@
#ifndef _SYS_PROTO_H_
#define _SYS_PROTO_H_
-#define MXC_CPU_MX51 0x51
-#define MXC_CPU_MX53 0x53
-#define MXC_CPU_MX6SL 0x60
-#define MXC_CPU_MX6DL 0x61
-#define MXC_CPU_MX6SOLO 0x62
-#define MXC_CPU_MX6Q 0x63
+#include "../arch-imx/cpu.h"
#define is_soc_rev(rev) ((get_cpu_rev() & 0xFF) - rev)
u32 get_cpu_rev(void);
diff --git a/arch/arm/include/asm/arch-mx6/sys_proto.h b/arch/arm/include/asm/arch-mx6/sys_proto.h
index 17125a6..38851a1 100644
--- a/arch/arm/include/asm/arch-mx6/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx6/sys_proto.h
@@ -9,13 +9,7 @@
#define _SYS_PROTO_H_
#include <asm/imx-common/regs-common.h>
-
-#define MXC_CPU_MX51 0x51
-#define MXC_CPU_MX53 0x53
-#define MXC_CPU_MX6SL 0x60
-#define MXC_CPU_MX6DL 0x61
-#define MXC_CPU_MX6SOLO 0x62
-#define MXC_CPU_MX6Q 0x63
+#include "../arch-imx/cpu.h"
#define is_soc_rev(rev) ((get_cpu_rev() & 0xFF) - rev)
u32 get_cpu_rev(void);
--
1.8.1.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH v4 2/2] mx6: Distinguish mx6dual from mx6quad
2014-01-26 17:06 [U-Boot] [PATCH v4 1/2] imx: Introduce a header for the imx cpu versions Fabio Estevam
@ 2014-01-26 17:06 ` Fabio Estevam
2014-01-26 22:39 ` Stefano Babic
2014-02-11 10:26 ` Stefano Babic
2014-02-11 10:26 ` [U-Boot] [PATCH v4 1/2] imx: Introduce a header for the imx cpu versions Stefano Babic
1 sibling, 2 replies; 6+ messages in thread
From: Fabio Estevam @ 2014-01-26 17:06 UTC (permalink / raw)
To: u-boot
From: Fabio Estevam <fabio.estevam@freescale.com>
Currently when we boot a mx6dual U-boot reports that it is a mx6quad.
Report it as MX6D instead:
CPU: Freescale i.MX6D rev1.2 at 792 MHz
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v3:
- Fix From field
Changes since v2:
- use a common cpu.h header
arch/arm/cpu/armv7/mx6/soc.c | 14 +++++++++++---
arch/arm/imx-common/cpu.c | 2 ++
arch/arm/include/asm/arch-imx/cpu.h | 1 +
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
index 0208cba..9acd8c9 100644
--- a/arch/arm/cpu/armv7/mx6/soc.c
+++ b/arch/arm/cpu/armv7/mx6/soc.c
@@ -41,14 +41,19 @@ u32 get_cpu_rev(void)
if (type != MXC_CPU_MX6SL) {
reg = readl(&anatop->digprog);
+ struct scu_regs *scu = (struct scu_regs *)SCU_BASE_ADDR;
+ u32 cfg = readl(&scu->config) & 3;
type = ((reg >> 16) & 0xff);
if (type == MXC_CPU_MX6DL) {
- struct scu_regs *scu = (struct scu_regs *)SCU_BASE_ADDR;
- u32 cfg = readl(&scu->config) & 3;
-
if (!cfg)
type = MXC_CPU_MX6SOLO;
}
+
+ if (type == MXC_CPU_MX6Q) {
+ if (cfg == 1)
+ type = MXC_CPU_MX6D;
+ }
+
}
reg &= 0xff; /* mx6 silicon revision */
return (type << 12) | (reg + 0x10);
@@ -62,6 +67,9 @@ u32 __weak get_board_rev(void)
if (type == MXC_CPU_MX6SOLO)
cpurev = (MXC_CPU_MX6DL) << 12 | (cpurev & 0xFFF);
+ if (type == MXC_CPU_MX6D)
+ cpurev = (MXC_CPU_MX6Q) << 12 | (cpurev & 0xFFF);
+
return cpurev;
}
#endif
diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c
index 9231649..a77c4de 100644
--- a/arch/arm/imx-common/cpu.c
+++ b/arch/arm/imx-common/cpu.c
@@ -106,6 +106,8 @@ const char *get_imx_type(u32 imxtype)
switch (imxtype) {
case MXC_CPU_MX6Q:
return "6Q"; /* Quad-core version of the mx6 */
+ case MXC_CPU_MX6D:
+ return "6D"; /* Dual-core version of the mx6 */
case MXC_CPU_MX6DL:
return "6DL"; /* Dual Lite version of the mx6 */
case MXC_CPU_MX6SOLO:
diff --git a/arch/arm/include/asm/arch-imx/cpu.h b/arch/arm/include/asm/arch-imx/cpu.h
index 8c725e2..a35940e 100644
--- a/arch/arm/include/asm/arch-imx/cpu.h
+++ b/arch/arm/include/asm/arch-imx/cpu.h
@@ -10,3 +10,4 @@
#define MXC_CPU_MX6DL 0x61
#define MXC_CPU_MX6SOLO 0x62
#define MXC_CPU_MX6Q 0x63
+#define MXC_CPU_MX6D 0x64
--
1.8.1.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH v4 2/2] mx6: Distinguish mx6dual from mx6quad
2014-01-26 17:06 ` [U-Boot] [PATCH v4 2/2] mx6: Distinguish mx6dual from mx6quad Fabio Estevam
@ 2014-01-26 22:39 ` Stefano Babic
2014-01-26 23:13 ` Otavio Salvador
2014-02-11 10:26 ` Stefano Babic
1 sibling, 1 reply; 6+ messages in thread
From: Stefano Babic @ 2014-01-26 22:39 UTC (permalink / raw)
To: u-boot
Hi Fabio,
On 26/01/2014 18:06, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> Currently when we boot a mx6dual U-boot reports that it is a mx6quad.
>
> Report it as MX6D instead:
>
> CPU: Freescale i.MX6D rev1.2 at 792 MHz
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> Changes since v3:
> - Fix From field
> Changes since v2:
> - use a common cpu.h header
>
> arch/arm/cpu/armv7/mx6/soc.c | 14 +++++++++++---
> arch/arm/imx-common/cpu.c | 2 ++
> arch/arm/include/asm/arch-imx/cpu.h | 1 +
> 3 files changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
> index 0208cba..9acd8c9 100644
> --- a/arch/arm/cpu/armv7/mx6/soc.c
> +++ b/arch/arm/cpu/armv7/mx6/soc.c
> @@ -41,14 +41,19 @@ u32 get_cpu_rev(void)
>
> if (type != MXC_CPU_MX6SL) {
> reg = readl(&anatop->digprog);
> + struct scu_regs *scu = (struct scu_regs *)SCU_BASE_ADDR;
> + u32 cfg = readl(&scu->config) & 3;
> type = ((reg >> 16) & 0xff);
> if (type == MXC_CPU_MX6DL) {
> - struct scu_regs *scu = (struct scu_regs *)SCU_BASE_ADDR;
> - u32 cfg = readl(&scu->config) & 3;
> -
> if (!cfg)
> type = MXC_CPU_MX6SOLO;
> }
> +
> + if (type == MXC_CPU_MX6Q) {
> + if (cfg == 1)
> + type = MXC_CPU_MX6D;
> + }
> +
> }
> reg &= 0xff; /* mx6 silicon revision */
> return (type << 12) | (reg + 0x10);
> @@ -62,6 +67,9 @@ u32 __weak get_board_rev(void)
> if (type == MXC_CPU_MX6SOLO)
> cpurev = (MXC_CPU_MX6DL) << 12 | (cpurev & 0xFFF);
>
> + if (type == MXC_CPU_MX6D)
> + cpurev = (MXC_CPU_MX6Q) << 12 | (cpurev & 0xFFF);
> +
> return cpurev;
> }
> #endif
> diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c
> index 9231649..a77c4de 100644
> --- a/arch/arm/imx-common/cpu.c
> +++ b/arch/arm/imx-common/cpu.c
> @@ -106,6 +106,8 @@ const char *get_imx_type(u32 imxtype)
> switch (imxtype) {
> case MXC_CPU_MX6Q:
> return "6Q"; /* Quad-core version of the mx6 */
> + case MXC_CPU_MX6D:
> + return "6D"; /* Dual-core version of the mx6 */
> case MXC_CPU_MX6DL:
> return "6DL"; /* Dual Lite version of the mx6 */
> case MXC_CPU_MX6SOLO:
> diff --git a/arch/arm/include/asm/arch-imx/cpu.h b/arch/arm/include/asm/arch-imx/cpu.h
> index 8c725e2..a35940e 100644
> --- a/arch/arm/include/asm/arch-imx/cpu.h
> +++ b/arch/arm/include/asm/arch-imx/cpu.h
> @@ -10,3 +10,4 @@
> #define MXC_CPU_MX6DL 0x61
> #define MXC_CPU_MX6SOLO 0x62
> #define MXC_CPU_MX6Q 0x63
> +#define MXC_CPU_MX6D 0x64
>
Acked-by: Stefano babic <sbabic@denx.de>
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 6+ messages in thread* [U-Boot] [PATCH v4 2/2] mx6: Distinguish mx6dual from mx6quad
2014-01-26 22:39 ` Stefano Babic
@ 2014-01-26 23:13 ` Otavio Salvador
0 siblings, 0 replies; 6+ messages in thread
From: Otavio Salvador @ 2014-01-26 23:13 UTC (permalink / raw)
To: u-boot
On Sun, Jan 26, 2014 at 8:39 PM, Stefano Babic <sbabic@denx.de> wrote:
> Hi Fabio,
>
>
> On 26/01/2014 18:06, Fabio Estevam wrote:
>>
>> From: Fabio Estevam <fabio.estevam@freescale.com>
>>
>> Currently when we boot a mx6dual U-boot reports that it is a mx6quad.
>>
>> Report it as MX6D instead:
>>
>> CPU: Freescale i.MX6D rev1.2 at 792 MHz
>>
>> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
>> ---
>> Changes since v3:
>> - Fix From field
>> Changes since v2:
>> - use a common cpu.h header
>>
>> arch/arm/cpu/armv7/mx6/soc.c | 14 +++++++++++---
>> arch/arm/imx-common/cpu.c | 2 ++
>> arch/arm/include/asm/arch-imx/cpu.h | 1 +
>> 3 files changed, 14 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
>> index 0208cba..9acd8c9 100644
>> --- a/arch/arm/cpu/armv7/mx6/soc.c
>> +++ b/arch/arm/cpu/armv7/mx6/soc.c
>> @@ -41,14 +41,19 @@ u32 get_cpu_rev(void)
>>
>> if (type != MXC_CPU_MX6SL) {
>> reg = readl(&anatop->digprog);
>> + struct scu_regs *scu = (struct scu_regs *)SCU_BASE_ADDR;
>> + u32 cfg = readl(&scu->config) & 3;
>> type = ((reg >> 16) & 0xff);
>> if (type == MXC_CPU_MX6DL) {
>> - struct scu_regs *scu = (struct scu_regs
>> *)SCU_BASE_ADDR;
>> - u32 cfg = readl(&scu->config) & 3;
>> -
>> if (!cfg)
>> type = MXC_CPU_MX6SOLO;
>> }
>> +
>> + if (type == MXC_CPU_MX6Q) {
>> + if (cfg == 1)
>> + type = MXC_CPU_MX6D;
>> + }
>> +
>> }
>> reg &= 0xff; /* mx6 silicon revision */
>> return (type << 12) | (reg + 0x10);
>> @@ -62,6 +67,9 @@ u32 __weak get_board_rev(void)
>> if (type == MXC_CPU_MX6SOLO)
>> cpurev = (MXC_CPU_MX6DL) << 12 | (cpurev & 0xFFF);
>>
>> + if (type == MXC_CPU_MX6D)
>> + cpurev = (MXC_CPU_MX6Q) << 12 | (cpurev & 0xFFF);
>> +
>> return cpurev;
>> }
>> #endif
>> diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c
>> index 9231649..a77c4de 100644
>> --- a/arch/arm/imx-common/cpu.c
>> +++ b/arch/arm/imx-common/cpu.c
>> @@ -106,6 +106,8 @@ const char *get_imx_type(u32 imxtype)
>> switch (imxtype) {
>> case MXC_CPU_MX6Q:
>> return "6Q"; /* Quad-core version of the mx6 */
>> + case MXC_CPU_MX6D:
>> + return "6D"; /* Dual-core version of the mx6 */
>> case MXC_CPU_MX6DL:
>> return "6DL"; /* Dual Lite version of the mx6 */
>> case MXC_CPU_MX6SOLO:
>> diff --git a/arch/arm/include/asm/arch-imx/cpu.h
>> b/arch/arm/include/asm/arch-imx/cpu.h
>> index 8c725e2..a35940e 100644
>> --- a/arch/arm/include/asm/arch-imx/cpu.h
>> +++ b/arch/arm/include/asm/arch-imx/cpu.h
>> @@ -10,3 +10,4 @@
>> #define MXC_CPU_MX6DL 0x61
>> #define MXC_CPU_MX6SOLO 0x62
>> #define MXC_CPU_MX6Q 0x63
>> +#define MXC_CPU_MX6D 0x64
>>
>
> Acked-by: Stefano babic <sbabic@denx.de>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH v4 2/2] mx6: Distinguish mx6dual from mx6quad
2014-01-26 17:06 ` [U-Boot] [PATCH v4 2/2] mx6: Distinguish mx6dual from mx6quad Fabio Estevam
2014-01-26 22:39 ` Stefano Babic
@ 2014-02-11 10:26 ` Stefano Babic
1 sibling, 0 replies; 6+ messages in thread
From: Stefano Babic @ 2014-02-11 10:26 UTC (permalink / raw)
To: u-boot
On 26/01/2014 18:06, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> Currently when we boot a mx6dual U-boot reports that it is a mx6quad.
>
> Report it as MX6D instead:
>
> CPU: Freescale i.MX6D rev1.2 at 792 MHz
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH v4 1/2] imx: Introduce a header for the imx cpu versions
2014-01-26 17:06 [U-Boot] [PATCH v4 1/2] imx: Introduce a header for the imx cpu versions Fabio Estevam
2014-01-26 17:06 ` [U-Boot] [PATCH v4 2/2] mx6: Distinguish mx6dual from mx6quad Fabio Estevam
@ 2014-02-11 10:26 ` Stefano Babic
1 sibling, 0 replies; 6+ messages in thread
From: Stefano Babic @ 2014-02-11 10:26 UTC (permalink / raw)
To: u-boot
On 26/01/2014 18:06, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> Instead of duplicating the CPU definitions at mx5 and mx6 sys_proto.h header
> files, introduce a common header to centralize such definitions.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-02-11 10:26 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-26 17:06 [U-Boot] [PATCH v4 1/2] imx: Introduce a header for the imx cpu versions Fabio Estevam
2014-01-26 17:06 ` [U-Boot] [PATCH v4 2/2] mx6: Distinguish mx6dual from mx6quad Fabio Estevam
2014-01-26 22:39 ` Stefano Babic
2014-01-26 23:13 ` Otavio Salvador
2014-02-11 10:26 ` Stefano Babic
2014-02-11 10:26 ` [U-Boot] [PATCH v4 1/2] imx: Introduce a header for the imx cpu versions Stefano Babic
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox