* [U-Boot] [PATCH v3] i.MX28: extend print_cpuinfo() to use chip information
@ 2012-07-16 19:59 Otavio Salvador
2012-07-16 20:19 ` Marek Vasut
2012-07-17 7:50 ` Stefano Babic
0 siblings, 2 replies; 4+ messages in thread
From: Otavio Salvador @ 2012-07-16 19:59 UTC (permalink / raw)
To: u-boot
The information now is gathered from HW_DIGCTL_CHIPID register and
includes the chip modem and revision on the output.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v2:
- use ?? for unidentified revision and cpu type
- use numeric revisions
Changes in v3:
- drop mx23 data as it will be posted in a later patch
- fix info order (first rev, then clock)
arch/arm/cpu/arm926ejs/mx28/mx28.c | 38 ++++++++++++++++++++++++--
arch/arm/include/asm/arch-mx28/regs-digctl.h | 4 +++
2 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/mx28/mx28.c b/arch/arm/cpu/arm926ejs/mx28/mx28.c
index ff25772..cf7a50f 100644
--- a/arch/arm/cpu/arm926ejs/mx28/mx28.c
+++ b/arch/arm/cpu/arm926ejs/mx28/mx28.c
@@ -188,13 +188,47 @@ int arch_cpu_init(void)
}
#if defined(CONFIG_DISPLAY_CPUINFO)
+static const char *get_cpu_type(void)
+{
+ struct mx28_digctl_regs *digctl_regs =
+ (struct mx28_digctl_regs *)MXS_DIGCTL_BASE;
+
+ switch (readl(&digctl_regs->hw_digctl_chipid) & HW_DIGCTL_CHIPID_MASK) {
+ case HW_DIGCTL_CHIPID_MX28:
+ return "28";
+ default:
+ return "??";
+ }
+}
+
+static const char *get_cpu_rev(void)
+{
+ struct mx28_digctl_regs *digctl_regs =
+ (struct mx28_digctl_regs *)MXS_DIGCTL_BASE;
+ uint8_t rev = readl(&digctl_regs->hw_digctl_chipid) & 0x000000FF;
+
+ switch (readl(&digctl_regs->hw_digctl_chipid) & HW_DIGCTL_CHIPID_MASK) {
+ case HW_DIGCTL_CHIPID_MX28:
+ switch (rev) {
+ case 0x1:
+ return "1.2";
+ default:
+ return "??";
+ }
+ default:
+ return "??";
+ }
+}
+
int print_cpuinfo(void)
{
struct mx28_spl_data *data = (struct mx28_spl_data *)
((CONFIG_SYS_TEXT_BASE - sizeof(struct mx28_spl_data)) & ~0xf);
- printf("Freescale i.MX28 family at %d MHz\n",
- mxc_get_clock(MXC_ARM_CLK) / 1000000);
+ printf("CPU: Freescale i.MX%s rev%s at %d MHz\n",
+ get_cpu_type(),
+ get_cpu_rev(),
+ mxc_get_clock(MXC_ARM_CLK) / 1000000);
printf("BOOT: %s\n", mx28_boot_modes[data->boot_mode_idx].mode);
return 0;
}
diff --git a/arch/arm/include/asm/arch-mx28/regs-digctl.h b/arch/arm/include/asm/arch-mx28/regs-digctl.h
index 9a63594..247da6e 100644
--- a/arch/arm/include/asm/arch-mx28/regs-digctl.h
+++ b/arch/arm/include/asm/arch-mx28/regs-digctl.h
@@ -152,4 +152,8 @@ struct mx28_digctl_regs {
};
#endif
+/* Product code identification */
+#define HW_DIGCTL_CHIPID_MASK (0xffff << 16)
+#define HW_DIGCTL_CHIPID_MX28 (0x2800 << 16)
+
#endif /* __MX28_REGS_DIGCTL_H__ */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v3] i.MX28: extend print_cpuinfo() to use chip information
2012-07-16 19:59 [U-Boot] [PATCH v3] i.MX28: extend print_cpuinfo() to use chip information Otavio Salvador
@ 2012-07-16 20:19 ` Marek Vasut
2012-07-16 20:38 ` Otavio Salvador
2012-07-17 7:50 ` Stefano Babic
1 sibling, 1 reply; 4+ messages in thread
From: Marek Vasut @ 2012-07-16 20:19 UTC (permalink / raw)
To: u-boot
Dear Otavio Salvador,
> The information now is gathered from HW_DIGCTL_CHIPID register and
> includes the chip modem and revision on the output.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This one is OK with me, queue for next maybe?
Acked-by: Marek Vasut <marex@denx.de>
> ---
> Changes in v2:
> - use ?? for unidentified revision and cpu type
> - use numeric revisions
>
> Changes in v3:
> - drop mx23 data as it will be posted in a later patch
> - fix info order (first rev, then clock)
>
> arch/arm/cpu/arm926ejs/mx28/mx28.c | 38
> ++++++++++++++++++++++++-- arch/arm/include/asm/arch-mx28/regs-digctl.h |
> 4 +++
> 2 files changed, 40 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/cpu/arm926ejs/mx28/mx28.c
> b/arch/arm/cpu/arm926ejs/mx28/mx28.c index ff25772..cf7a50f 100644
> --- a/arch/arm/cpu/arm926ejs/mx28/mx28.c
> +++ b/arch/arm/cpu/arm926ejs/mx28/mx28.c
> @@ -188,13 +188,47 @@ int arch_cpu_init(void)
> }
>
> #if defined(CONFIG_DISPLAY_CPUINFO)
> +static const char *get_cpu_type(void)
> +{
> + struct mx28_digctl_regs *digctl_regs =
> + (struct mx28_digctl_regs *)MXS_DIGCTL_BASE;
> +
> + switch (readl(&digctl_regs->hw_digctl_chipid) & HW_DIGCTL_CHIPID_MASK) {
> + case HW_DIGCTL_CHIPID_MX28:
> + return "28";
> + default:
> + return "??";
> + }
> +}
> +
> +static const char *get_cpu_rev(void)
> +{
> + struct mx28_digctl_regs *digctl_regs =
> + (struct mx28_digctl_regs *)MXS_DIGCTL_BASE;
> + uint8_t rev = readl(&digctl_regs->hw_digctl_chipid) & 0x000000FF;
> +
> + switch (readl(&digctl_regs->hw_digctl_chipid) & HW_DIGCTL_CHIPID_MASK) {
> + case HW_DIGCTL_CHIPID_MX28:
> + switch (rev) {
> + case 0x1:
> + return "1.2";
> + default:
> + return "??";
> + }
> + default:
> + return "??";
> + }
> +}
> +
> int print_cpuinfo(void)
> {
> struct mx28_spl_data *data = (struct mx28_spl_data *)
> ((CONFIG_SYS_TEXT_BASE - sizeof(struct mx28_spl_data)) & ~0xf);
>
> - printf("Freescale i.MX28 family at %d MHz\n",
> - mxc_get_clock(MXC_ARM_CLK) / 1000000);
> + printf("CPU: Freescale i.MX%s rev%s at %d MHz\n",
> + get_cpu_type(),
> + get_cpu_rev(),
> + mxc_get_clock(MXC_ARM_CLK) / 1000000);
> printf("BOOT: %s\n", mx28_boot_modes[data->boot_mode_idx].mode);
> return 0;
> }
> diff --git a/arch/arm/include/asm/arch-mx28/regs-digctl.h
> b/arch/arm/include/asm/arch-mx28/regs-digctl.h index 9a63594..247da6e
> 100644
> --- a/arch/arm/include/asm/arch-mx28/regs-digctl.h
> +++ b/arch/arm/include/asm/arch-mx28/regs-digctl.h
> @@ -152,4 +152,8 @@ struct mx28_digctl_regs {
> };
> #endif
>
> +/* Product code identification */
> +#define HW_DIGCTL_CHIPID_MASK (0xffff << 16)
> +#define HW_DIGCTL_CHIPID_MX28 (0x2800 << 16)
> +
> #endif /* __MX28_REGS_DIGCTL_H__ */
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v3] i.MX28: extend print_cpuinfo() to use chip information
2012-07-16 20:19 ` Marek Vasut
@ 2012-07-16 20:38 ` Otavio Salvador
0 siblings, 0 replies; 4+ messages in thread
From: Otavio Salvador @ 2012-07-16 20:38 UTC (permalink / raw)
To: u-boot
On Mon, Jul 16, 2012 at 5:19 PM, Marek Vasut <marex@denx.de> wrote:
>> The information now is gathered from HW_DIGCTL_CHIPID register and
>> includes the chip modem and revision on the output.
>>
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>
> This one is OK with me, queue for next maybe?
Fine with me. This is not urgent but a nice to have one.
--
Otavio Salvador O.S. Systems
E-mail: otavio at ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v3] i.MX28: extend print_cpuinfo() to use chip information
2012-07-16 19:59 [U-Boot] [PATCH v3] i.MX28: extend print_cpuinfo() to use chip information Otavio Salvador
2012-07-16 20:19 ` Marek Vasut
@ 2012-07-17 7:50 ` Stefano Babic
1 sibling, 0 replies; 4+ messages in thread
From: Stefano Babic @ 2012-07-17 7:50 UTC (permalink / raw)
To: u-boot
On 16/07/2012 21:59, Otavio Salvador wrote:
> The information now is gathered from HW_DIGCTL_CHIPID register and
> includes the chip modem and revision on the output.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
Applied to u-boot-imx, next branch, 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] 4+ messages in thread
end of thread, other threads:[~2012-07-17 7:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-16 19:59 [U-Boot] [PATCH v3] i.MX28: extend print_cpuinfo() to use chip information Otavio Salvador
2012-07-16 20:19 ` Marek Vasut
2012-07-16 20:38 ` Otavio Salvador
2012-07-17 7:50 ` Stefano Babic
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox