"fsl,P2020RDB-PC" compatible string was present in Turris 1.x DTS file just
because Linux kernel required it for proper detection of P2020 processor
during boot.
This was quite a hack as CZ,NIC Turris 1.x is not compatible with
Freescale P2020-RDB-PC board.
Now when kernel has generic unified support for boards with P2020
processors, there is no need to have this "hack" in turris1x.dts file.
So remove incorrect "fsl,P2020RDB-PC" compatible string from turris1x.dts.
Signed-off-by: Pali Rohár <[email protected]>
---
arch/powerpc/boot/dts/turris1x.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/boot/dts/turris1x.dts b/arch/powerpc/boot/dts/turris1x.dts
index 12e08271e61f..69c38ed8a3a5 100644
--- a/arch/powerpc/boot/dts/turris1x.dts
+++ b/arch/powerpc/boot/dts/turris1x.dts
@@ -15,7 +15,7 @@
/ {
model = "Turris 1.x";
- compatible = "cznic,turris1x", "fsl,P2020RDB-PC"; /* fsl,P2020RDB-PC is required for booting Linux */
+ compatible = "cznic,turris1x";
aliases {
ethernet0 = &enet0;
--
2.20.1
Le 19/08/2022 à 21:15, Pali Rohár a écrit :
> "fsl,P2020RDB-PC" compatible string was present in Turris 1.x DTS file just
> because Linux kernel required it for proper detection of P2020 processor
> during boot.
>
> This was quite a hack as CZ,NIC Turris 1.x is not compatible with
> Freescale P2020-RDB-PC board.
>
> Now when kernel has generic unified support for boards with P2020
> processors, there is no need to have this "hack" in turris1x.dts file.
>
> So remove incorrect "fsl,P2020RDB-PC" compatible string from turris1x.dts.
Oh, I thought it was not possible to modify DTSes.
If it is, can you have a common compatible to all p2020, for instance
"fsl,p2020', so that you can use it in patch 5 instead of
of_find_node_by_path("/cpus/PowerPC,P2020@0") ?
>
> Signed-off-by: Pali Rohár <[email protected]>
> ---
> arch/powerpc/boot/dts/turris1x.dts | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/powerpc/boot/dts/turris1x.dts b/arch/powerpc/boot/dts/turris1x.dts
> index 12e08271e61f..69c38ed8a3a5 100644
> --- a/arch/powerpc/boot/dts/turris1x.dts
> +++ b/arch/powerpc/boot/dts/turris1x.dts
> @@ -15,7 +15,7 @@
>
> / {
> model = "Turris 1.x";
> - compatible = "cznic,turris1x", "fsl,P2020RDB-PC"; /* fsl,P2020RDB-PC is required for booting Linux */
> + compatible = "cznic,turris1x";
>
> aliases {
> ethernet0 = &enet0;
On Monday 26 September 2022 10:10:19 Christophe Leroy wrote:
> Le 19/08/2022 à 21:15, Pali Rohár a écrit :
> > "fsl,P2020RDB-PC" compatible string was present in Turris 1.x DTS file just
> > because Linux kernel required it for proper detection of P2020 processor
> > during boot.
> >
> > This was quite a hack as CZ,NIC Turris 1.x is not compatible with
> > Freescale P2020-RDB-PC board.
> >
> > Now when kernel has generic unified support for boards with P2020
> > processors, there is no need to have this "hack" in turris1x.dts file.
> >
> > So remove incorrect "fsl,P2020RDB-PC" compatible string from turris1x.dts.
>
> Oh, I thought it was not possible to modify DTSes.
Boards which have hardcoded DTB binaries in bootloader or are
kernel out-of-tree, they obviously needs to be still supported by
kernel.
> If it is, can you have a common compatible to all p2020, for instance
> "fsl,p2020', so that you can use it in patch 5 instead of
> of_find_node_by_path("/cpus/PowerPC,P2020@0") ?
I can add fsl,p2020. But it does not solve issue for other boards.
This string fsl,p2020 is not used by any board (yet).
Also Turris 1.x boards have burned some older DTB file in Flash NOR.
So it is problematic.
> >
> > Signed-off-by: Pali Rohár <[email protected]>
> > ---
> > arch/powerpc/boot/dts/turris1x.dts | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/powerpc/boot/dts/turris1x.dts b/arch/powerpc/boot/dts/turris1x.dts
> > index 12e08271e61f..69c38ed8a3a5 100644
> > --- a/arch/powerpc/boot/dts/turris1x.dts
> > +++ b/arch/powerpc/boot/dts/turris1x.dts
> > @@ -15,7 +15,7 @@
> >
> > / {
> > model = "Turris 1.x";
> > - compatible = "cznic,turris1x", "fsl,P2020RDB-PC"; /* fsl,P2020RDB-PC is required for booting Linux */
> > + compatible = "cznic,turris1x";
> >
> > aliases {
> > ethernet0 = &enet0;