Re: [PATCH v2 6/9] MIPS: generic: Add MACH_INGENIC type and compatible for X1600 and X2600

[Paul Cercueil <paul@crapouillou.net>]

Hi Nikolaus,

Le jeudi 12 novembre 2026 à 09:10 +0100, H. Nikolaus Schaller a écrit :
> Add support for the Ingenic/Lumissil X1600 and X2600 SoC by introducing
> new machine types.
> 
> Update the system type string mapping and add the "ingenic,x1600" and
> "ingenic,x2600" compatible strings to the DT match table in the generic
> Ingenic board support.
> 
> Note that we do not separate between e.g. X1600, X1600E, X1600H since
> they differ only in built-in memory size which can be handled by the
> boot loader.
> 
> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
> ---
> 
> Notes:
>     Note that there is no bindings document for any of the compatible values
>     so we don't add them.
> 
>  arch/mips/generic/board-ingenic.c | 8 +++++++-
>  arch/mips/include/asm/bootinfo.h  | 2 ++
>  2 files changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/mips/generic/board-ingenic.c b/arch/mips/generic/board-
> ingenic.c
> index 1f4906875e7bc..5840293913977 100644
> --- a/arch/mips/generic/board-ingenic.c
> +++ b/arch/mips/generic/board-ingenic.c
> @@ -24,6 +24,8 @@
>  static __init char *ingenic_get_system_type(unsigned long machtype)
>  {
>  	switch (machtype) {
> +	case MACH_INGENIC_X2600:
> +		return "X2600";
>  	case MACH_INGENIC_X2100:
>  		return "X2100";
>  	case MACH_INGENIC_X2000H:
> @@ -34,6 +36,8 @@ static __init char *ingenic_get_system_type(unsigned long
> machtype)
>  		return "X2000";
>  	case MACH_INGENIC_X1830:
>  		return "X1830";
> +	case MACH_INGENIC_X1600:
> +		return "X1600";
>  	case MACH_INGENIC_X1000E:
>  		return "X1000E";
>  	case MACH_INGENIC_X1000:
> @@ -146,11 +150,13 @@ static const struct of_device_id ingenic_of_match[]
> __initconst = {
>  	{ .compatible = "ingenic,jz4780", .data = (void *)MACH_INGENIC_JZ4780
> },
>  	{ .compatible = "ingenic,x1000", .data = (void *)MACH_INGENIC_X1000
> },
>  	{ .compatible = "ingenic,x1000e", .data = (void *)MACH_INGENIC_X1000E
> },
> +	{ .compatible = "ingenic,x1600", .data = (void *)MACH_INGENIC_X1600
> },
>  	{ .compatible = "ingenic,x1830", .data = (void *)MACH_INGENIC_X1830
> },
>  	{ .compatible = "ingenic,x2000", .data = (void *)MACH_INGENIC_X2000
> },
>  	{ .compatible = "ingenic,x2000e", .data = (void *)MACH_INGENIC_X2000E
> },
>  	{ .compatible = "ingenic,x2000h", .data = (void *)MACH_INGENIC_X2000H
> },
>  	{ .compatible = "ingenic,x2100", .data = (void *)MACH_INGENIC_X2100
> },
> +	{ .compatible = "ingenic,x2600", .data = (void *)MACH_INGENIC_X2600
> },

I was going to say that if you add compatibles here you'll also need to add them
to the bindings documentation, but it seems we don't have one?

We have Documentation/devicetree/bindings/mips/ingenic/devices.yaml for boards
but most SoCs listed here don't have an accompanying board.

Given that it's not your mess I'm OK with the patch, but we should really fix
this at some point.

Cheers,
-Paul

>  	{}
>  };
>  
> @@ -188,7 +194,7 @@ static const struct platform_suspend_ops ingenic_pm_ops =
> {
>  
>  static int __init ingenic_pm_init(void)
>  {
> -	if (boot_cpu_type() == CPU_XBURST) {
> +	if (boot_cpu_type() == CPU_XBURST || boot_cpu_type() == CPU_XBURST2)
> {
>  		if (IS_ENABLED(CONFIG_PM_SLEEP))
>  			suspend_set_ops(&ingenic_pm_ops);
>  		_machine_halt = ingenic_halt;
> diff --git a/arch/mips/include/asm/bootinfo.h
> b/arch/mips/include/asm/bootinfo.h
> index 2128ba9033911..f6ae983577f6f 100644
> --- a/arch/mips/include/asm/bootinfo.h
> +++ b/arch/mips/include/asm/bootinfo.h
> @@ -81,11 +81,13 @@ enum ingenic_machine_type {
>  	MACH_INGENIC_JZ4780,
>  	MACH_INGENIC_X1000,
>  	MACH_INGENIC_X1000E,
> +	MACH_INGENIC_X1600,
>  	MACH_INGENIC_X1830,
>  	MACH_INGENIC_X2000,
>  	MACH_INGENIC_X2000E,
>  	MACH_INGENIC_X2000H,
>  	MACH_INGENIC_X2100,
> +	MACH_INGENIC_X2600,
>  };
>  
>  extern char *system_type;