* [PATCH 1/2] ARM: mxs: Do not search for "fsl,clkctrl"
@ 2023-12-05 14:47 Fabio Estevam
2023-12-05 14:47 ` [PATCH 2/2] ARM: dts: imx23/28: Remove undocumented "fsl,clkctrl" Fabio Estevam
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Fabio Estevam @ 2023-12-05 14:47 UTC (permalink / raw)
To: shawnguo; +Cc: linux-arm-kernel, Fabio Estevam
From: Fabio Estevam <festevam@denx.de>
The "fsl,clkctrl" compatible string is not documented.
It is used only to find the base address of the clock controller.
Instead of searching for an undocumented compatible string, search
for "fsl,imx23-clkctrl" and "fsl,imx28-clkctrl".
Signed-off-by: Fabio Estevam <festevam@denx.de>
---
arch/arm/mach-mxs/mach-mxs.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index 3faf9a1e3e36..6e017fa306c8 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -356,7 +356,9 @@ static int __init mxs_restart_init(void)
{
struct device_node *np;
- np = of_find_compatible_node(NULL, NULL, "fsl,clkctrl");
+ np = of_find_compatible_node(NULL, NULL, "fsl,imx23-clkctrl");
+ if (!np)
+ np = of_find_compatible_node(NULL, NULL, "fsl,imx28-clkctrl");
reset_addr = of_iomap(np, 0);
if (!reset_addr)
return -ENODEV;
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] ARM: dts: imx23/28: Remove undocumented "fsl,clkctrl"
2023-12-05 14:47 [PATCH 1/2] ARM: mxs: Do not search for "fsl,clkctrl" Fabio Estevam
@ 2023-12-05 14:47 ` Fabio Estevam
2023-12-05 18:54 ` Stefan Wahren
2023-12-05 18:49 ` [PATCH 1/2] ARM: mxs: Do not search for "fsl,clkctrl" Stefan Wahren
2023-12-06 3:22 ` Shawn Guo
2 siblings, 1 reply; 5+ messages in thread
From: Fabio Estevam @ 2023-12-05 14:47 UTC (permalink / raw)
To: shawnguo; +Cc: linux-arm-kernel, Fabio Estevam
From: Fabio Estevam <festevam@denx.de>
Per imx23-clock.yaml and imx28-clock.yaml, fsl,clkctrl is not a valid
compatible string.
Remove it to fix the following dt-schema warning:
imx28-evk.dtb: clkctrl@80040000: compatible: ['fsl,imx28-clkctrl', 'fsl,clkctrl'] is too long
from schema $id: http://devicetree.org/schemas/clock/imx28-clock.yaml#
Signed-off-by: Fabio Estevam <festevam@denx.de>
---
arch/arm/boot/dts/nxp/mxs/imx23.dtsi | 2 +-
arch/arm/boot/dts/nxp/mxs/imx28.dtsi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/nxp/mxs/imx23.dtsi b/arch/arm/boot/dts/nxp/mxs/imx23.dtsi
index fdf18b7cb2f6..69e65e218afe 100644
--- a/arch/arm/boot/dts/nxp/mxs/imx23.dtsi
+++ b/arch/arm/boot/dts/nxp/mxs/imx23.dtsi
@@ -484,7 +484,7 @@ apbx@80040000 {
ranges;
clks: clkctrl@80040000 {
- compatible = "fsl,imx23-clkctrl", "fsl,clkctrl";
+ compatible = "fsl,imx23-clkctrl";
reg = <0x80040000 0x2000>;
#clock-cells = <1>;
};
diff --git a/arch/arm/boot/dts/nxp/mxs/imx28.dtsi b/arch/arm/boot/dts/nxp/mxs/imx28.dtsi
index 6932d23fb29d..39b59619eb2e 100644
--- a/arch/arm/boot/dts/nxp/mxs/imx28.dtsi
+++ b/arch/arm/boot/dts/nxp/mxs/imx28.dtsi
@@ -1100,7 +1100,7 @@ apbx@80040000 {
ranges;
clks: clkctrl@80040000 {
- compatible = "fsl,imx28-clkctrl", "fsl,clkctrl";
+ compatible = "fsl,imx28-clkctrl";
reg = <0x80040000 0x2000>;
#clock-cells = <1>;
};
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 2/2] ARM: dts: imx23/28: Remove undocumented "fsl,clkctrl"
2023-12-05 14:47 ` [PATCH 2/2] ARM: dts: imx23/28: Remove undocumented "fsl,clkctrl" Fabio Estevam
@ 2023-12-05 18:54 ` Stefan Wahren
0 siblings, 0 replies; 5+ messages in thread
From: Stefan Wahren @ 2023-12-05 18:54 UTC (permalink / raw)
To: Fabio Estevam, shawnguo; +Cc: linux-arm-kernel, Fabio Estevam
Hi Fabio,
Am 05.12.23 um 15:47 schrieb Fabio Estevam:
> From: Fabio Estevam <festevam@denx.de>
>
> Per imx23-clock.yaml and imx28-clock.yaml, fsl,clkctrl is not a valid
> compatible string.
>
> Remove it to fix the following dt-schema warning:
>
> imx28-evk.dtb: clkctrl@80040000: compatible: ['fsl,imx28-clkctrl', 'fsl,clkctrl'] is too long
> from schema $id: http://devicetree.org/schemas/clock/imx28-clock.yaml#
>
> Signed-off-by: Fabio Estevam <festevam@denx.de>
> ---
> arch/arm/boot/dts/nxp/mxs/imx23.dtsi | 2 +-
> arch/arm/boot/dts/nxp/mxs/imx28.dtsi | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/nxp/mxs/imx23.dtsi b/arch/arm/boot/dts/nxp/mxs/imx23.dtsi
> index fdf18b7cb2f6..69e65e218afe 100644
> --- a/arch/arm/boot/dts/nxp/mxs/imx23.dtsi
> +++ b/arch/arm/boot/dts/nxp/mxs/imx23.dtsi
> @@ -484,7 +484,7 @@ apbx@80040000 {
> ranges;
>
> clks: clkctrl@80040000 {
> - compatible = "fsl,imx23-clkctrl", "fsl,clkctrl";
> + compatible = "fsl,imx23-clkctrl";
this look fine:
Reviewed-by: Stefan Wahren <wahrenst@gmx.net>
Btw the node name clkctrl is also incorrect here. According to the yaml
it should be clock-controller.
Regards
> reg = <0x80040000 0x2000>;
> #clock-cells = <1>;
> };
> diff --git a/arch/arm/boot/dts/nxp/mxs/imx28.dtsi b/arch/arm/boot/dts/nxp/mxs/imx28.dtsi
> index 6932d23fb29d..39b59619eb2e 100644
> --- a/arch/arm/boot/dts/nxp/mxs/imx28.dtsi
> +++ b/arch/arm/boot/dts/nxp/mxs/imx28.dtsi
> @@ -1100,7 +1100,7 @@ apbx@80040000 {
> ranges;
>
> clks: clkctrl@80040000 {
> - compatible = "fsl,imx28-clkctrl", "fsl,clkctrl";
> + compatible = "fsl,imx28-clkctrl";
> reg = <0x80040000 0x2000>;
> #clock-cells = <1>;
> };
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] ARM: mxs: Do not search for "fsl,clkctrl"
2023-12-05 14:47 [PATCH 1/2] ARM: mxs: Do not search for "fsl,clkctrl" Fabio Estevam
2023-12-05 14:47 ` [PATCH 2/2] ARM: dts: imx23/28: Remove undocumented "fsl,clkctrl" Fabio Estevam
@ 2023-12-05 18:49 ` Stefan Wahren
2023-12-06 3:22 ` Shawn Guo
2 siblings, 0 replies; 5+ messages in thread
From: Stefan Wahren @ 2023-12-05 18:49 UTC (permalink / raw)
To: Fabio Estevam, shawnguo; +Cc: linux-arm-kernel, Fabio Estevam
Hi Fabio,
Am 05.12.23 um 15:47 schrieb Fabio Estevam:
> From: Fabio Estevam <festevam@denx.de>
>
> The "fsl,clkctrl" compatible string is not documented.
>
> It is used only to find the base address of the clock controller.
>
> Instead of searching for an undocumented compatible string, search
> for "fsl,imx23-clkctrl" and "fsl,imx28-clkctrl".
>
> Signed-off-by: Fabio Estevam <festevam@denx.de>
> ---
> arch/arm/mach-mxs/mach-mxs.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
> index 3faf9a1e3e36..6e017fa306c8 100644
> --- a/arch/arm/mach-mxs/mach-mxs.c
> +++ b/arch/arm/mach-mxs/mach-mxs.c
> @@ -356,7 +356,9 @@ static int __init mxs_restart_init(void)
> {
> struct device_node *np;
>
> - np = of_find_compatible_node(NULL, NULL, "fsl,clkctrl");
> + np = of_find_compatible_node(NULL, NULL, "fsl,imx23-clkctrl");
> + if (!np)
> + np = of_find_compatible_node(NULL, NULL, "fsl,imx28-clkctrl");
i'm fine with getting the rid off "fsl,clkctrl", but some lines below we
search for "fsl,imx23-clkctrl" again to adjust reset_addr.
Can we avoid this unnecessary search?
> reset_addr = of_iomap(np, 0);
> if (!reset_addr)
> return -ENODEV;
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] ARM: mxs: Do not search for "fsl,clkctrl"
2023-12-05 14:47 [PATCH 1/2] ARM: mxs: Do not search for "fsl,clkctrl" Fabio Estevam
2023-12-05 14:47 ` [PATCH 2/2] ARM: dts: imx23/28: Remove undocumented "fsl,clkctrl" Fabio Estevam
2023-12-05 18:49 ` [PATCH 1/2] ARM: mxs: Do not search for "fsl,clkctrl" Stefan Wahren
@ 2023-12-06 3:22 ` Shawn Guo
2 siblings, 0 replies; 5+ messages in thread
From: Shawn Guo @ 2023-12-06 3:22 UTC (permalink / raw)
To: Fabio Estevam; +Cc: linux-arm-kernel, Fabio Estevam
On Tue, Dec 05, 2023 at 11:47:12AM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <festevam@denx.de>
>
> The "fsl,clkctrl" compatible string is not documented.
>
> It is used only to find the base address of the clock controller.
>
> Instead of searching for an undocumented compatible string, search
> for "fsl,imx23-clkctrl" and "fsl,imx28-clkctrl".
>
> Signed-off-by: Fabio Estevam <festevam@denx.de>
Applied both, thanks!
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-12-06 3:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-05 14:47 [PATCH 1/2] ARM: mxs: Do not search for "fsl,clkctrl" Fabio Estevam
2023-12-05 14:47 ` [PATCH 2/2] ARM: dts: imx23/28: Remove undocumented "fsl,clkctrl" Fabio Estevam
2023-12-05 18:54 ` Stefan Wahren
2023-12-05 18:49 ` [PATCH 1/2] ARM: mxs: Do not search for "fsl,clkctrl" Stefan Wahren
2023-12-06 3:22 ` Shawn Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox