From 7d5f589a522889d3fd56ad0c43961b90d07b4a93 Mon Sep 17 00:00:00 2001 From: Leonard Crestez Date: Wed, 5 Jun 2019 13:37:05 +0300 Subject: [PATCH] cpufreq: imx-cpufreq-dt: Remove global platform match list This is not currently needed, instead a platform device is always created from SOC-specific code. We can use of_machine_is_compatible for per-SOC behavior instead. Suggested-by: Viresh Kumar Signed-off-by: Leonard Crestez Signed-off-by: Viresh Kumar --- drivers/cpufreq/imx-cpufreq-dt.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/drivers/cpufreq/imx-cpufreq-dt.c b/drivers/cpufreq/imx-cpufreq-dt.c index 35b6717d7255..b54fd26ea7df 100644 --- a/drivers/cpufreq/imx-cpufreq-dt.c +++ b/drivers/cpufreq/imx-cpufreq-dt.c @@ -19,12 +19,6 @@ #define OCOTP_CFG3_MKT_SEGMENT_SHIFT 6 #define OCOTP_CFG3_MKT_SEGMENT_MASK (0x3 << 6) -static const struct of_device_id imx_cpufreq_dt_match_list[] = { - { .compatible = "fsl,imx8mm" }, - { .compatible = "fsl,imx8mq" }, - {} -}; - /* cpufreq-dt device registered by imx-cpufreq-dt */ static struct platform_device *cpufreq_dt_pdev; static struct opp_table *cpufreq_opp_table; @@ -32,18 +26,10 @@ static struct opp_table *cpufreq_opp_table; static int imx_cpufreq_dt_probe(struct platform_device *pdev) { struct device *cpu_dev = get_cpu_device(0); - struct device_node *np; - const struct of_device_id *match; u32 cell_value, supported_hw[2]; int speed_grade, mkt_segment; int ret; - np = of_find_node_by_path("/"); - match = of_match_node(imx_cpufreq_dt_match_list, np); - of_node_put(np); - if (!match) - return -ENODEV; - ret = nvmem_cell_read_u32(cpu_dev, "speed_grade", &cell_value); if (ret) return ret; @@ -61,8 +47,8 @@ static int imx_cpufreq_dt_probe(struct platform_device *pdev) * Applies to 8mq and 8mm. */ if (mkt_segment == 0 && speed_grade == 0 && ( - !strcmp(match->compatible, "fsl,imx8mm") || - !strcmp(match->compatible, "fsl,imx8mq"))) + of_machine_is_compatible("fsl,imx8mm") || + of_machine_is_compatible("fsl,imx8mq"))) speed_grade = 1; supported_hw[0] = BIT(speed_grade); -- 2.45.2