Re: [PATCH v7 10/14] MIPS: ingenic: Detect machtype from SoC compatible string

[James Hogan]

On Tue, Jan 16, 2018 at 04:48:00PM +0100, Paul Cercueil wrote:
> Previously, the mips_machtype variable was always initialized
> to MACH_INGENIC_JZ4740 even if running on different SoCs.
> 
> Signed-off-by: Paul Cercueil <p...@crapouillou.net>
> ---
>  arch/mips/jz4740/prom.c  |  1 -
>  arch/mips/jz4740/setup.c | 22 +++++++++++++++++++---
>  2 files changed, 19 insertions(+), 4 deletions(-)
> 
>  v2: No change
>  v3: No change
>  v4: No change
>  v5: Use SPDX license identifier
>  v6: Init mips_machtype from DT compatible string instead of using
>      MIPS_MACHINE
>  v7: Fix system name not initialized
> 
> diff --git a/arch/mips/jz4740/prom.c b/arch/mips/jz4740/prom.c
> index a62dd8e6ecf9..eb9f2f97bedb 100644
> --- a/arch/mips/jz4740/prom.c
> +++ b/arch/mips/jz4740/prom.c
> @@ -25,7 +25,6 @@
>  
>  void __init prom_init(void)
>  {
> -     mips_machtype = MACH_INGENIC_JZ4740;
>       fw_init_cmdline();
>  }
>  
> diff --git a/arch/mips/jz4740/setup.c b/arch/mips/jz4740/setup.c
> index 6d0152321819..afb40f8bce96 100644
> --- a/arch/mips/jz4740/setup.c
> +++ b/arch/mips/jz4740/setup.c
> @@ -53,6 +53,16 @@ static void __init jz4740_detect_mem(void)
>       add_memory_region(0, size, BOOT_MEM_RAM);
>  }
>  
> +static unsigned long __init get_board_mach_type(const void *fdt)
> +{
> +     if (!fdt_node_check_compatible(fdt, 0, "ingenic,jz4780"))
> +             return MACH_INGENIC_JZ4780;
> +     if (!fdt_node_check_compatible(fdt, 0, "ingenic,jz4770"))
> +             return MACH_INGENIC_JZ4770;

Based on the assumption that fdt will always be non-NULL since commit
ffb1843d059c ("MIPS: JZ4740: require & include DT"):

Reviewed-by: James Hogan <jho...@kernel.org>

Cheers
James

> +
> +     return MACH_INGENIC_JZ4740;
> +}
> +
>  void __init plat_mem_setup(void)
>  {
>       int offset;
> @@ -63,6 +73,8 @@ void __init plat_mem_setup(void)
>       offset = fdt_path_offset(__dtb_start, "/memory");
>       if (offset < 0)
>               jz4740_detect_mem();
> +
> +     mips_machtype = get_board_mach_type(__dtb_start);
>  }
>  
>  void __init device_tree_init(void)
> @@ -75,10 +87,14 @@ void __init device_tree_init(void)
>  
>  const char *get_system_type(void)
>  {
> -     if (IS_ENABLED(CONFIG_MACH_JZ4780))
> +     switch (mips_machtype) {
> +     case MACH_INGENIC_JZ4780:
>               return "JZ4780";
> -
> -     return "JZ4740";
> +     case MACH_INGENIC_JZ4770:
> +             return "JZ4770";
> +     default:
> +             return "JZ4740";
> +     }
>  }
>  
>  void __init arch_init_irq(void)
> -- 
> 2.11.0
> 

signature.asc
Description: Digital signature