Re: [PATCH v6 2/3] soc: qcom: socinfo: create soc_id table from bindings
From: Bjorn Andersson <andersson@kernel.org>
Date: 2022-08-29 20:49:42
Also in:
linux-arm-msm, lkml
On Tue, Jul 05, 2022 at 03:02:59PM +0200, Krzysztof Kozlowski wrote:
The Qualcomm SoC ID values are encoded in few places: DTS files, Devicetree bindings (both used by some of Qualcomm bootloaders or tools) and in soc_id table of socinfo driver. Do not duplicate the actual values in the last one but use the constants from the bindings. Tested by comparing output object file (exactly the same). Signed-off-by: Krzysztof Kozlowski <redacted>
I didn't have a strong opinion either way on this, so was hoping someone else would chime in. Doesn't seem like that has happened, but unfortunately the soc_id[] list has changed. Would you mind rebasing the two patches to match the latest list?
quoted hunk ↗ jump to hunk
--- drivers/soc/qcom/socinfo.c | 259 +++++++++++++++++++------------------ 1 file changed, 133 insertions(+), 126 deletions(-)diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c index cee579a267a6..d515d3a97f0e 100644 --- a/drivers/soc/qcom/socinfo.c +++ b/drivers/soc/qcom/socinfo.c@@ -12,11 +12,14 @@ #include <linux/slab.h> #include <linux/soc/qcom/smem.h> #include <linux/string.h> +#include <linux/stringify.h> #include <linux/sys_soc.h> #include <linux/types.h> #include <asm/unaligned.h> +#include <dt-bindings/arm/qcom,ids.h> + /* * SoC version type with major number in the upper 16 bits and minor * number in the lower 16 bits.@@ -25,6 +28,10 @@ #define SOCINFO_MINOR(ver) ((ver) & 0xffff) #define SOCINFO_VERSION(maj, min) ((((maj) & 0xffff) << 16)|((min) & 0xffff)) +/* Helper macros to create soc_id table */ +#define qcom_board_id(id) QCOM_ID_ ## id, __stringify(id) +#define qcom_board_id2(id, name) QCOM_ID_ ## id, (name)
How about naming this qcom_board_id_named() ? Regards, Bjorn