[PATCH] mips: ralink: introduce commonly used remap node function

[PATCH] mips: ralink: introduce commonly used remap node function

[Shiji Yang]

The ralink_of_remap() function is repeated several times on SoC specific
source files. They have the same structure, but just differ in compatible
strings. In order to make commonly use of these codes, this patch
introduces a newly designed mtmips_of_remap_node() function to match and
remap all supported system controller and memory controller nodes.

Build and run tested on MT7620 and MT7628.

Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
---
 arch/mips/ralink/common.h |  2 --
 arch/mips/ralink/mt7620.c |  9 ---------
 arch/mips/ralink/mt7621.c |  9 ---------
 arch/mips/ralink/of.c     | 42 ++++++++++++++++++++++++++++++++-------
 arch/mips/ralink/rt288x.c |  9 ---------
 arch/mips/ralink/rt305x.c |  9 ---------
 arch/mips/ralink/rt3883.c |  9 ---------
 7 files changed, 35 insertions(+), 54 deletions(-)

diff --git a/arch/mips/ralink/common.h b/arch/mips/ralink/common.h
index 87fc16751..e56f9a3e7 100644
--- a/arch/mips/ralink/common.h
+++ b/arch/mips/ralink/common.h
@@ -30,6 +30,4 @@ extern void ralink_rst_init(void);
 
 extern void __init prom_soc_init(struct ralink_soc_info *soc_info);
 
-__iomem void *plat_of_remap_node(const char *node);
-
 #endif /* _RALINK_COMMON_H__ */
diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c
index 4435f50b8..2c60e8df5 100644
--- a/arch/mips/ralink/mt7620.c
+++ b/arch/mips/ralink/mt7620.c
@@ -273,15 +273,6 @@ void __init ralink_clk_init(void)
 	}
 }
 
-void __init ralink_of_remap(void)
-{
-	rt_sysc_membase = plat_of_remap_node("ralink,mt7620a-sysc");
-	rt_memc_membase = plat_of_remap_node("ralink,mt7620a-memc");
-
-	if (!rt_sysc_membase || !rt_memc_membase)
-		panic("Failed to remap core resources");
-}
-
 static __init void
 mt7620_dram_init(struct ralink_soc_info *soc_info)
 {
diff --git a/arch/mips/ralink/mt7621.c b/arch/mips/ralink/mt7621.c
index c3fbab50b..137781d0b 100644
--- a/arch/mips/ralink/mt7621.c
+++ b/arch/mips/ralink/mt7621.c
@@ -89,15 +89,6 @@ static void __init mt7621_memory_detect(void)
 	memblock_add(MT7621_HIGHMEM_BASE, MT7621_HIGHMEM_SIZE);
 }
 
-void __init ralink_of_remap(void)
-{
-	rt_sysc_membase = plat_of_remap_node("mediatek,mt7621-sysc");
-	rt_memc_membase = plat_of_remap_node("mediatek,mt7621-memc");
-
-	if (!rt_sysc_membase || !rt_memc_membase)
-		panic("Failed to remap core resources");
-}
-
 static unsigned int __init mt7621_get_soc_name0(void)
 {
 	return __raw_readl(MT7621_SYSC_BASE + SYSC_REG_CHIP_NAME0);
diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
index 4d06de77d..53a2ae9ee 100644
--- a/arch/mips/ralink/of.c
+++ b/arch/mips/ralink/of.c
@@ -29,28 +29,56 @@ __iomem void *rt_sysc_membase;
 __iomem void *rt_memc_membase;
 EXPORT_SYMBOL_GPL(rt_sysc_membase);
 
-__iomem void *plat_of_remap_node(const char *node)
+static const struct of_device_id mtmips_memc_match[] = {
+	{ .compatible = "mediatek,mt7621-memc" },
+	{ .compatible = "ralink,mt7620a-memc" },
+	{ .compatible = "ralink,rt2880-memc" },
+	{ .compatible = "ralink,rt3050-memc" },
+	{ .compatible = "ralink,rt3883-memc" },
+	{}
+};
+
+static const struct of_device_id mtmips_sysc_match[] = {
+	{ .compatible = "mediatek,mt7621-sysc" },
+	{ .compatible = "ralink,mt7620a-sysc" },
+	{ .compatible = "ralink,rt2880-sysc" },
+	{ .compatible = "ralink,rt3050-sysc" },
+	{ .compatible = "ralink,rt3883-sysc" },
+	{}
+};
+
+static __iomem void *
+mtmips_of_remap_node(const struct of_device_id *match, const char *type)
 {
 	struct resource res;
 	struct device_node *np;
 
-	np = of_find_compatible_node(NULL, NULL, node);
+	np = of_find_matching_node(NULL, match);
 	if (!np)
-		panic("Failed to find %s node", node);
+		panic("Failed to find %s controller node", type);
 
 	if (of_address_to_resource(np, 0, &res))
-		panic("Failed to get resource for %s", node);
-
-	of_node_put(np);
+		panic("Failed to get resource for %s node", np->name);
 
 	if (!request_mem_region(res.start,
 				resource_size(&res),
 				res.name))
-		panic("Failed to request resources for %s", node);
+		panic("Failed to request resources for %s node", np->name);
+
+	of_node_put(np);
 
 	return ioremap(res.start, resource_size(&res));
 }
 
+void __init ralink_of_remap(void)
+{
+	rt_sysc_membase = mtmips_of_remap_node(mtmips_sysc_match, "system");
+	rt_memc_membase = mtmips_of_remap_node(mtmips_memc_match, "memory");
+
+	if (!rt_sysc_membase || !rt_memc_membase)
+		panic("Failed to remap core resources");
+}
+
 void __init plat_mem_setup(void)
 {
 	void *dtb;
diff --git a/arch/mips/ralink/rt288x.c b/arch/mips/ralink/rt288x.c
index 456ba0b25..ed1d13251 100644
--- a/arch/mips/ralink/rt288x.c
+++ b/arch/mips/ralink/rt288x.c
@@ -52,15 +52,6 @@ void __init ralink_clk_init(void)
 	ralink_clk_add("480000.wmac", wmac_rate);
 }
 
-void __init ralink_of_remap(void)
-{
-	rt_sysc_membase = plat_of_remap_node("ralink,rt2880-sysc");
-	rt_memc_membase = plat_of_remap_node("ralink,rt2880-memc");
-
-	if (!rt_sysc_membase || !rt_memc_membase)
-		panic("Failed to remap core resources");
-}
-
 static unsigned int __init rt2880_get_soc_name0(void)
 {
 	return __raw_readl(RT2880_SYSC_BASE + SYSC_REG_CHIP_NAME0);
diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c
index d8dcc5cc6..d3b842883 100644
--- a/arch/mips/ralink/rt305x.c
+++ b/arch/mips/ralink/rt305x.c
@@ -134,15 +134,6 @@ void __init ralink_clk_init(void)
 	ralink_clk_add("10180000.wmac", wmac_rate);
 }
 
-void __init ralink_of_remap(void)
-{
-	rt_sysc_membase = plat_of_remap_node("ralink,rt3050-sysc");
-	rt_memc_membase = plat_of_remap_node("ralink,rt3050-memc");
-
-	if (!rt_sysc_membase || !rt_memc_membase)
-		panic("Failed to remap core resources");
-}
-
 static unsigned int __init rt305x_get_soc_name0(void)
 {
 	return __raw_readl(RT305X_SYSC_BASE + SYSC_REG_CHIP_NAME0);
diff --git a/arch/mips/ralink/rt3883.c b/arch/mips/ralink/rt3883.c
index cca887af3..f2fcec1d3 100644
--- a/arch/mips/ralink/rt3883.c
+++ b/arch/mips/ralink/rt3883.c
@@ -65,15 +65,6 @@ void __init ralink_clk_init(void)
 	ralink_clk_add("10180000.wmac", 40000000);
 }
 
-void __init ralink_of_remap(void)
-{
-	rt_sysc_membase = plat_of_remap_node("ralink,rt3883-sysc");
-	rt_memc_membase = plat_of_remap_node("ralink,rt3883-memc");
-
-	if (!rt_sysc_membase || !rt_memc_membase)
-		panic("Failed to remap core resources");
-}
-
 static unsigned int __init rt3883_get_soc_name0(void)
 {
 	return __raw_readl(RT3883_SYSC_BASE + RT3883_SYSC_REG_CHIPID0_3);
-- 
2.30.2

Re: [PATCH] mips: ralink: introduce commonly used remap node function

[Sergio Paracuellos]

On Tue, Jun 20, 2023 at 1:46 PM Shiji Yang <yangshiji66@outlook.com> wrote:
>
> The ralink_of_remap() function is repeated several times on SoC specific
> source files. They have the same structure, but just differ in compatible
> strings. In order to make commonly use of these codes, this patch
> introduces a newly designed mtmips_of_remap_node() function to match and
> remap all supported system controller and memory controller nodes.
>
> Build and run tested on MT7620 and MT7628.
>
> Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
> ---
>  arch/mips/ralink/common.h |  2 --
>  arch/mips/ralink/mt7620.c |  9 ---------
>  arch/mips/ralink/mt7621.c |  9 ---------
>  arch/mips/ralink/of.c     | 42 ++++++++++++++++++++++++++++++++-------
>  arch/mips/ralink/rt288x.c |  9 ---------
>  arch/mips/ralink/rt305x.c |  9 ---------
>  arch/mips/ralink/rt3883.c |  9 ---------
>  7 files changed, 35 insertions(+), 54 deletions(-)

Awesome! More deletions than additions in arch folders is always a
good thing :-).

Changes look good to me. Thanks for doing this!

Reviewed-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>

Best regards,
    Sergio Paracuellos

Re: [PATCH] mips: ralink: introduce commonly used remap node function

[Shiji Yang]

>On Tue, Jun 20, 2023 at 1:46 PM Shiji Yang <yangshiji66@outlook.com> wrote:
>>
>> The ralink_of_remap() function is repeated several times on SoC specific
>> source files. They have the same structure, but just differ in compatible
>> strings. In order to make commonly use of these codes, this patch
>> introduces a newly designed mtmips_of_remap_node() function to match and
>> remap all supported system controller and memory controller nodes.
>>
>> Build and run tested on MT7620 and MT7628.
>>
>> Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
>> ---
>>  arch/mips/ralink/common.h |  2 --
>>  arch/mips/ralink/mt7620.c |  9 ---------
>>  arch/mips/ralink/mt7621.c |  9 ---------
>>  arch/mips/ralink/of.c     | 42 ++++++++++++++++++++++++++++++++-------
>>  arch/mips/ralink/rt288x.c |  9 ---------
>>  arch/mips/ralink/rt305x.c |  9 ---------
>>  arch/mips/ralink/rt3883.c |  9 ---------
>>  7 files changed, 35 insertions(+), 54 deletions(-)
>
>Awesome! More deletions than additions in arch folders is always a
>good thing :-).
>
>Changes look good to me. Thanks for doing this!
>
>Reviewed-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
>
>Best regards,
>    Sergio Paracuellos

Thank you for your review. After your new system control driver[1] is
merged, with this patch, we can add more compatible IDs to the list.

[1] https://lore.kernel.org/all/20230619040941.1340372-1-sergio.paracuellos@gmail.com/

Best regards,
    Shiji Yang

Re: [PATCH] mips: ralink: introduce commonly used remap node function

[Thomas Bogendoerfer]

On Tue, Jun 20, 2023 at 07:44:32PM +0800, Shiji Yang wrote:
> The ralink_of_remap() function is repeated several times on SoC specific
> source files. They have the same structure, but just differ in compatible
> strings. In order to make commonly use of these codes, this patch
> introduces a newly designed mtmips_of_remap_node() function to match and
> remap all supported system controller and memory controller nodes.
> 
> Build and run tested on MT7620 and MT7628.
> 
> Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
> ---
>  arch/mips/ralink/common.h |  2 --
>  arch/mips/ralink/mt7620.c |  9 ---------
>  arch/mips/ralink/mt7621.c |  9 ---------
>  arch/mips/ralink/of.c     | 42 ++++++++++++++++++++++++++++++++-------
>  arch/mips/ralink/rt288x.c |  9 ---------
>  arch/mips/ralink/rt305x.c |  9 ---------
>  arch/mips/ralink/rt3883.c |  9 ---------
>  7 files changed, 35 insertions(+), 54 deletions(-)

applied to mips-next.

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]