diff mbox series

[02/10] arm: dts: k3-am68*: Sync with 6.8-rc1

Message ID 20240206-b4-upstream-j721s2-avs-v1-2-b75043c59969@ti.com
State RFC
Delegated to: Tom Rini
Headers show
Series Add AVS support for J721S2 | expand

Commit Message

Manorit Chawdhry Feb. 6, 2024, 12:21 p.m. UTC
Syncs the DT from Linux v6.8-rc1.

Remove udmap overrides and handle location change of chipid node.

Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
---
 arch/arm/dts/k3-am68-sk-base-board.dts | 1 +
 1 file changed, 1 insertion(+)

Comments

Andrew Davis Feb. 6, 2024, 5:38 p.m. UTC | #1
On 2/6/24 6:21 AM, Manorit Chawdhry wrote:
> Syncs the DT from Linux v6.8-rc1.
> 
> Remove udmap overrides and handle location change of chipid node.

Message doesn't match the patch. This patch should just be squashed
into the previous one anyway.

Andrew

> 
> Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
> ---
>   arch/arm/dts/k3-am68-sk-base-board.dts | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm/dts/k3-am68-sk-base-board.dts b/arch/arm/dts/k3-am68-sk-base-board.dts
> index 1e1a82f9d2b8..d0cfdeac21fb 100644
> --- a/arch/arm/dts/k3-am68-sk-base-board.dts
> +++ b/arch/arm/dts/k3-am68-sk-base-board.dts
> @@ -31,6 +31,7 @@
>   		can1 = &mcu_mcan1;
>   		can2 = &main_mcan6;
>   		can3 = &main_mcan7;
> +		ethernet0 = &cpsw_port1;
>   	};
>   
>   	vusb_main: regulator-vusb-main5v0 {
>
Manorit Chawdhry Feb. 7, 2024, 10:07 a.m. UTC | #2
Hi Andrew,

On 11:38-20240206, Andrew Davis wrote:
> On 2/6/24 6:21 AM, Manorit Chawdhry wrote:
> > Syncs the DT from Linux v6.8-rc1.
> > 
> > Remove udmap overrides and handle location change of chipid node.
> 
> Message doesn't match the patch. This patch should just be squashed
> into the previous one anyway.
> 

Ah yeah, oversight. Would see what should be done about it after Tom's
reply for OF_UPSTREAM, would change accordingly.

Regards,
Manorit

> Andrew
> 
> > 
> > Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
> > ---
> >   arch/arm/dts/k3-am68-sk-base-board.dts | 1 +
> >   1 file changed, 1 insertion(+)
> > 
> > diff --git a/arch/arm/dts/k3-am68-sk-base-board.dts b/arch/arm/dts/k3-am68-sk-base-board.dts
> > index 1e1a82f9d2b8..d0cfdeac21fb 100644
> > --- a/arch/arm/dts/k3-am68-sk-base-board.dts
> > +++ b/arch/arm/dts/k3-am68-sk-base-board.dts
> > @@ -31,6 +31,7 @@
> >   		can1 = &mcu_mcan1;
> >   		can2 = &main_mcan6;
> >   		can3 = &main_mcan7;
> > +		ethernet0 = &cpsw_port1;
> >   	};
> >   	vusb_main: regulator-vusb-main5v0 {
> >
diff mbox series

Patch

diff --git a/arch/arm/dts/k3-am68-sk-base-board.dts b/arch/arm/dts/k3-am68-sk-base-board.dts
index 1e1a82f9d2b8..d0cfdeac21fb 100644
--- a/arch/arm/dts/k3-am68-sk-base-board.dts
+++ b/arch/arm/dts/k3-am68-sk-base-board.dts
@@ -31,6 +31,7 @@ 
 		can1 = &mcu_mcan1;
 		can2 = &main_mcan6;
 		can3 = &main_mcan7;
+		ethernet0 = &cpsw_port1;
 	};
 
 	vusb_main: regulator-vusb-main5v0 {