[U-Boot] [PATCH V2 02/11] s5p: cpu_info: print "cpu-model" if exists in dts

Simon Glass
2015-10-03T14:27:58Z

On 21 September 2015 at 13:26, Przemyslaw Marczak <p.marczak@samsung.com> wrote:
> The CPU name for Exynos was concatenated with cpu id,
> but for new Exynos platforms, like Chromebook Peach Pi
> based on Exynos5800, the name of SoC variant does not
> include the real SoC cpu id (0x5422).
>
> For such case, the CPU name should be defined in device tree.
>
> This commit introduces new device-tree property for Exynos:
> - "cpu-model" - with cpu name string
> If defined, then the cpu id is not printed.
>
> Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
> ---
> Changes V2:
> - new commit
> ---
> arch/arm/cpu/armv7/s5p-common/cpu_info.c | 14 +++++++++++++-
> 1 file changed, 13 insertions(+), 1 deletion(-)
>

Reviewed-by: Simon Glass <sjg@chromium.org>

Please see nit below.

> diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
> index 154d674..97d611f 100644
> --- a/arch/arm/cpu/armv7/s5p-common/cpu_info.c
> +++ b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
> @@ -5,9 +5,12 @@
> * SPDX-License-Identifier: GPL-2.0+
> */
> #include <common.h>
> +#include <fdtdec.h>
> #include <asm/io.h>
> #include <asm/arch/clk.h>
>
> +DECLARE_GLOBAL_DATA_PTR;
> +
> /* Default is s5pc100 */
> unsigned int s5p_cpu_id = 0xC100;
> /* Default is EVT1 */
> @@ -30,7 +33,16 @@ u32 get_device_type(void)
> #ifdef CONFIG_DISPLAY_CPUINFO
> int print_cpuinfo(void)
> {
> - printf("CPU: %s%X @ ", s5p_get_cpu_name(), s5p_cpu_id);
> + const char *cpu_model = NULL;
> + int len = 0;

No need to init these two variables.

> +
> + /* For SoC with no real CPU ID in naming convention. */
> + cpu_model = fdt_getprop(gd->fdt_blob, 0, "cpu-model", &len);
> + if (cpu_model)
> + printf("CPU: %.*s @ ", len, cpu_model);
> + else
> + printf("CPU: %s%X @ ", s5p_get_cpu_name(), s5p_cpu_id);
> +
> print_freq(get_arm_clk(), "\n");
>
> return 0;
> --
> 1.9.1
>