From 62414419fc39bf1617247eb8d9a9da791aa2c92d Mon Sep 17 00:00:00 2001
From: george <george@cool-pi.com>
Date: Wed, 9 Oct 2024 09:00:55 +0800
Subject: [PATCH] add cpu node name

---
 arch/arm64/boot/dts/rockchip/rk3588.dtsi  |  4 ++++
 arch/arm64/boot/dts/rockchip/rk3588j.dtsi |  6 ++++++
 arch/arm64/boot/dts/rockchip/rk3588m.dtsi |  6 ++++++
 arch/arm64/boot/dts/rockchip/rk3588s.dtsi |  4 ++++
 arch/arm64/kernel/cpuinfo.c               | 10 ++++++++++
 5 files changed, 30 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588.dtsi b/arch/arm64/boot/dts/rockchip/rk3588.dtsi
index 9262085ff..5fe3a8604 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588.dtsi
@@ -27,6 +27,10 @@
 		usbdp1 = &usbdp_phy1;
 	};
 
+	system {
+		cpu,model = "Rockchip RK3588";
+	};
+
 	rkcif_mipi_lvds4: rkcif-mipi-lvds4 {
 		compatible = "rockchip,rkcif-mipi-lvds";
 		rockchip,hw = <&rkcif>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588j.dtsi b/arch/arm64/boot/dts/rockchip/rk3588j.dtsi
index 7b084b273..f4663ea17 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588j.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588j.dtsi
@@ -6,6 +6,12 @@
 
 #include "rk3588.dtsi"
 
+/{
+	system {
+		cpu,model = "Rockchip RK3588J";
+	};
+};
+
 &cluster0_opp_table {
 	/*
 	 * The Max frequency is 1296MHz in default normal mode.
diff --git a/arch/arm64/boot/dts/rockchip/rk3588m.dtsi b/arch/arm64/boot/dts/rockchip/rk3588m.dtsi
index 38b9dbf38..5cc84991b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588m.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588m.dtsi
@@ -5,3 +5,9 @@
  */
 
 #include "rk3588.dtsi"
+
+/{
+	system {
+		cpu,model = "Rockchip RK3588M";
+	};
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
index 4b991cd21..1dbefbd60 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
@@ -22,6 +22,10 @@
 	#address-cells = <2>;
 	#size-cells = <2>;
 
+	system {
+		cpu,model = "Rockchip RK3588S";
+	};
+
 	aliases {
 		csi2dcphy0 = &csi2_dcphy0;
 		csi2dcphy1 = &csi2_dcphy1;
diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
index 91b351e18..40f486e9e 100644
--- a/arch/arm64/kernel/cpuinfo.c
+++ b/arch/arm64/kernel/cpuinfo.c
@@ -24,6 +24,7 @@
 #include <linux/sched.h>
 #include <linux/smp.h>
 #include <linux/delay.h>
+#include <linux/of_platform.h>
 
 unsigned int system_serial_low;
 EXPORT_SYMBOL(system_serial_low);
@@ -164,6 +165,9 @@ static const char *const compat_hwcap2_str[] = {
 static int c_show(struct seq_file *m, void *v)
 {
 	int i, j;
+	struct device_node *np;
+	const char *cpu_model;
+
 	bool compat = personality(current->personality) == PER_LINUX32 ||
 		      is_compat_task();
 
@@ -218,6 +222,12 @@ static int c_show(struct seq_file *m, void *v)
 		}
 		seq_puts(m, "\n");
 
+		np = of_find_node_by_path("/system");
+		if (np) {
+			if (!of_property_read_string(np, "cpu,model", &cpu_model))
+				seq_printf(m, "cpu model\t: %s\n", cpu_model);
+			of_node_put(np);
+		}
 		seq_printf(m, "CPU implementer\t: 0x%02x\n",
 			   MIDR_IMPLEMENTOR(midr));
 		seq_printf(m, "CPU architecture: 8\n");