diff mbox

[U-Boot] armv8: ls2080a: update fdt path for fsl-mc node

Message ID 1456958233-23235-1-git-send-email-stuart.yoder@nxp.com
State Accepted
Commit e91f1deca57da2265394e0f87947c7ef4653809a
Delegated to: York Sun
Headers show

Commit Message

Stuart Yoder March 2, 2016, 10:37 p.m. UTC 
From: Stuart Yoder <stuart.yoder@nxp.com>

The fsl-mc node has been moved under /soc, so update
the path references accordingly.  Backwards compatibility
is retained for /fsl-mc.

Delete backwards compatibility for the completely obsolete
/fsl,dprc@0.

Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
---
 board/freescale/ls2080a/ls2080a.c       |    6 +++---
 board/freescale/ls2080aqds/ls2080aqds.c |    4 ++--
 board/freescale/ls2080ardb/ls2080ardb.c |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

Comments

Prabhakar Kushwaha March 3, 2016, 2:44 a.m. UTC | #1 
> -----Original Message-----
> From: Stuart Yoder [mailto:stuart.yoder@nxp.com]
> Sent: Thursday, March 03, 2016 4:07 AM
> To: u-boot@lists.denx.de
> Cc: york sun <york.sun@nxp.com>; Prabhakar Kushwaha
> <prabhakar.kushwaha@nxp.com>; Yang-Leo Li <leoyang.li@nxp.com>;
> Stuart Yoder <stuart.yoder@nxp.com>
> Subject: [PATCH] armv8: ls2080a: update fdt path for fsl-mc node
> 
> From: Stuart Yoder <stuart.yoder@nxp.com>
> 
> The fsl-mc node has been moved under /soc, so update the path references
> accordingly.  Backwards compatibility is retained for /fsl-mc.
> 
> Delete backwards compatibility for the completely obsolete /fsl,dprc@0.
> 
> Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>

How will backward compatibility maintained for older Linux version which has previous device tree format..

--prabhakar
Stuart Yoder March 3, 2016, 3:01 a.m. UTC | #2 
> -----Original Message-----
> From: Prabhakar Kushwaha
> Sent: Wednesday, March 02, 2016 8:45 PM
> To: Stuart Yoder <stuart.yoder@nxp.com>; u-boot@lists.denx.de
> Cc: york sun <york.sun@nxp.com>; Yang-Leo Li <leoyang.li@nxp.com>; Stuart Yoder
> <stuart.yoder@nxp.com>
> Subject: RE: [PATCH] armv8: ls2080a: update fdt path for fsl-mc node
> 
> 
> > -----Original Message-----
> > From: Stuart Yoder [mailto:stuart.yoder@nxp.com]
> > Sent: Thursday, March 03, 2016 4:07 AM
> > To: u-boot@lists.denx.de
> > Cc: york sun <york.sun@nxp.com>; Prabhakar Kushwaha
> > <prabhakar.kushwaha@nxp.com>; Yang-Leo Li <leoyang.li@nxp.com>;
> > Stuart Yoder <stuart.yoder@nxp.com>
> > Subject: [PATCH] armv8: ls2080a: update fdt path for fsl-mc node
> >
> > From: Stuart Yoder <stuart.yoder@nxp.com>
> >
> > The fsl-mc node has been moved under /soc, so update the path references
> > accordingly.  Backwards compatibility is retained for /fsl-mc.
> >
> > Delete backwards compatibility for the completely obsolete /fsl,dprc@0.
> >
> > Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
> 
> How will backward compatibility maintained for older Linux version which has previous
> device tree format..

As you can see in the patch, we first check /soc/fsl-mc.  If that is not
there we check /fsl-mc.  So, both will work.

Use of /fsl,dprc@0 I think was Freescale-internal only and there is
no actual use of it remaining.

Stuart
York Sun March 22, 2016, 7:04 p.m. UTC | #3 
On 03/02/2016 07:01 PM, Stuart Yoder wrote:
> 
> 
>> -----Original Message-----
>> From: Prabhakar Kushwaha
>> Sent: Wednesday, March 02, 2016 8:45 PM
>> To: Stuart Yoder <stuart.yoder@nxp.com>; u-boot@lists.denx.de
>> Cc: york sun <york.sun@nxp.com>; Yang-Leo Li <leoyang.li@nxp.com>; Stuart Yoder
>> <stuart.yoder@nxp.com>
>> Subject: RE: [PATCH] armv8: ls2080a: update fdt path for fsl-mc node
>>
>>
>>> -----Original Message-----
>>> From: Stuart Yoder [mailto:stuart.yoder@nxp.com]
>>> Sent: Thursday, March 03, 2016 4:07 AM
>>> To: u-boot@lists.denx.de
>>> Cc: york sun <york.sun@nxp.com>; Prabhakar Kushwaha
>>> <prabhakar.kushwaha@nxp.com>; Yang-Leo Li <leoyang.li@nxp.com>;
>>> Stuart Yoder <stuart.yoder@nxp.com>
>>> Subject: [PATCH] armv8: ls2080a: update fdt path for fsl-mc node
>>>
>>> From: Stuart Yoder <stuart.yoder@nxp.com>
>>>
>>> The fsl-mc node has been moved under /soc, so update the path references
>>> accordingly.  Backwards compatibility is retained for /fsl-mc.
>>>
>>> Delete backwards compatibility for the completely obsolete /fsl,dprc@0.
>>>
>>> Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
>>
>> How will backward compatibility maintained for older Linux version which has previous
>> device tree format..
> 
> As you can see in the patch, we first check /soc/fsl-mc.  If that is not
> there we check /fsl-mc.  So, both will work.
> 
> Use of /fsl,dprc@0 I think was Freescale-internal only and there is
> no actual use of it remaining.
> 

Prabhakar,

Are you OK with Stuart's answer?

York
Prabhakar Kushwaha March 23, 2016, 8:12 a.m. UTC | #4 
> -----Original Message-----
> From: york sun
> Sent: Wednesday, March 23, 2016 12:34 AM
> To: Stuart Yoder <stuart.yoder@nxp.com>; Prabhakar Kushwaha
> <prabhakar.kushwaha@nxp.com>; u-boot@lists.denx.de
> Cc: Yang-Leo Li <leoyang.li@nxp.com>
> Subject: Re: [PATCH] armv8: ls2080a: update fdt path for fsl-mc node
> 
> On 03/02/2016 07:01 PM, Stuart Yoder wrote:
> >
> >
> >> -----Original Message-----
> >> From: Prabhakar Kushwaha
> >> Sent: Wednesday, March 02, 2016 8:45 PM
> >> To: Stuart Yoder <stuart.yoder@nxp.com>; u-boot@lists.denx.de
> >> Cc: york sun <york.sun@nxp.com>; Yang-Leo Li <leoyang.li@nxp.com>;
> >> Stuart Yoder <stuart.yoder@nxp.com>
> >> Subject: RE: [PATCH] armv8: ls2080a: update fdt path for fsl-mc node
> >>
> >>
> >>> -----Original Message-----
> >>> From: Stuart Yoder [mailto:stuart.yoder@nxp.com]
> >>> Sent: Thursday, March 03, 2016 4:07 AM
> >>> To: u-boot@lists.denx.de
> >>> Cc: york sun <york.sun@nxp.com>; Prabhakar Kushwaha
> >>> <prabhakar.kushwaha@nxp.com>; Yang-Leo Li <leoyang.li@nxp.com>;
> >>> Stuart Yoder <stuart.yoder@nxp.com>
> >>> Subject: [PATCH] armv8: ls2080a: update fdt path for fsl-mc node
> >>>
> >>> From: Stuart Yoder <stuart.yoder@nxp.com>
> >>>
> >>> The fsl-mc node has been moved under /soc, so update the path
> >>> references accordingly.  Backwards compatibility is retained for /fsl-mc.
> >>>
> >>> Delete backwards compatibility for the completely obsolete /fsl,dprc@0.
> >>>
> >>> Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
> >>
> >> How will backward compatibility maintained for older Linux version
> >> which has previous device tree format..
> >
> > As you can see in the patch, we first check /soc/fsl-mc.  If that is
> > not there we check /fsl-mc.  So, both will work.
> >
> > Use of /fsl,dprc@0 I think was Freescale-internal only and there is no
> > actual use of it remaining.
> >
> 
> Prabhakar,
> 
> Are you OK with Stuart's answer?
> 

Yes York.

--prabhakar
York Sun March 29, 2016, 3:40 p.m. UTC | #5 
On 03/02/2016 02:58 PM, Stuart Yoder wrote:
> From: Stuart Yoder <stuart.yoder@nxp.com>
> 
> The fsl-mc node has been moved under /soc, so update
> the path references accordingly.  Backwards compatibility
> is retained for /fsl-mc.
> 
> Delete backwards compatibility for the completely obsolete
> /fsl,dprc@0.
> 
> Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
> ---
>  board/freescale/ls2080a/ls2080a.c       |    6 +++---
>  board/freescale/ls2080aqds/ls2080aqds.c |    4 ++--
>  board/freescale/ls2080ardb/ls2080ardb.c |    4 ++--
>  3 files changed, 7 insertions(+), 7 deletions(-)

Applied to u-boot-fsl-qoriq master. Awaiting upstream.

Thanks.

York
diff mbox

Patch

diff --git a/board/freescale/ls2080a/ls2080a.c b/board/freescale/ls2080a/ls2080a.c
index 7bce8b0..ace0d79 100644
--- a/board/freescale/ls2080a/ls2080a.c
+++ b/board/freescale/ls2080a/ls2080a.c
@@ -87,14 +87,14 @@  void fdt_fixup_board_enet(void *fdt)
 {
 	int offset;
 
-	offset = fdt_path_offset(fdt, "/fsl-mc");
+	offset = fdt_path_offset(fdt, "/soc/fsl-mc");
 
 	/*
 	 * TODO: Remove this when backward compatibility
-	 * with old DT node (fsl,dprc@0) is no longer needed.
+	 * with old DT node (/fsl-mc) is no longer needed.
 	 */
 	if (offset < 0)
-		offset = fdt_path_offset(fdt, "/fsl,dprc@0");
+		offset = fdt_path_offset(fdt, "/fsl-mc");
 
 	if (offset < 0) {
 		printf("%s: ERROR: fsl-mc node not found in device tree (error %d)\n",
diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c
index aa256a2..f3925e2 100644
--- a/board/freescale/ls2080aqds/ls2080aqds.c
+++ b/board/freescale/ls2080aqds/ls2080aqds.c
@@ -258,10 +258,10 @@  void fdt_fixup_board_enet(void *fdt)
 {
 	int offset;
 
-	offset = fdt_path_offset(fdt, "/fsl-mc");
+	offset = fdt_path_offset(fdt, "/soc/fsl-mc");
 
 	if (offset < 0)
-		offset = fdt_path_offset(fdt, "/fsl,dprc@0");
+		offset = fdt_path_offset(fdt, "/fsl-mc");
 
 	if (offset < 0) {
 		printf("%s: ERROR: fsl-mc node not found in device tree (error %d)\n",
diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c
index c63b639..6f518b2 100644
--- a/board/freescale/ls2080ardb/ls2080ardb.c
+++ b/board/freescale/ls2080ardb/ls2080ardb.c
@@ -224,10 +224,10 @@  void fdt_fixup_board_enet(void *fdt)
 {
 	int offset;
 
-	offset = fdt_path_offset(fdt, "/fsl-mc");
+	offset = fdt_path_offset(fdt, "/soc/fsl-mc");
 
 	if (offset < 0)
-		offset = fdt_path_offset(fdt, "/fsl,dprc@0");
+		offset = fdt_path_offset(fdt, "/fsl-mc");
 
 	if (offset < 0) {
 		printf("%s: ERROR: fsl-mc node not found in device tree (error %d)\n",