Re: [PATCH v1 2/4] arm: dts: k3-j721e: Sync with v6.5-rc1

2023-08-31 Thread Nishanth Menon
On 13:51-20230831, Neha Malcom Francis wrote:
> Hi Nishanth
> 
> On 28/08/23 22:39, Nishanth Menon wrote:
> > On 17:01-20230828, Neha Malcom Francis wrote:
> > > Sync k3-j721e DTS with kernel.org v6.5-rc1.
> > >   * pcie_epx nodes have been deleted, they are not needed [1]
> > >   * use mcu_timer0 instead of the redundant timer1. Also delete
> > > clock and power domain properties since J721E follows legacy
> > > boot flow where system firmware is not yet available to modify
> > > clocks
> > >   * remove mcu_i2c0 as it is used for tps659413 PMIC in j721e-sk
> > > for which support is not yet added.
> > >   * remove main_i2c2 pinmux for j721e-sk as it is connected to the
> > > test automation header for which support is not there
> > >   * change mcu_secproxy to secure_proxy_mcu since linux has
> > > defined these nodes
> > >   * hbmc nodes have been disabled as their support in kernel
> > > itself is unfinished (dependent series not merged) [2]
> > >   * Drop mcu_cpsw node in U-Boot as it is no longer needed here
> > > thanks to [3]
> > > 
> > > [1] https://lore.kernel.org/lkml/20230515172137.474626-2-...@ti.com/
> > > [2] https://lore.kernel.org/all/20230513123313.11462-2-vaishna...@ti.com/
> > > [3] https://lore.kernel.org/all/20230722193151.117345-1-rog...@kernel.org/
> > > 
> > > Signed-off-by: Neha Malcom Francis 
> > > ---
> > >   .../k3-j721e-common-proc-board-u-boot.dtsi| 139 ++-
> > >   arch/arm/dts/k3-j721e-common-proc-board.dts   | 483 ++---
> > >   arch/arm/dts/k3-j721e-main.dtsi   | 974 --
> > >   arch/arm/dts/k3-j721e-mcu-wakeup.dtsi | 280 -
> > >   .../arm/dts/k3-j721e-r5-common-proc-board.dts | 270 +
> > >   arch/arm/dts/k3-j721e-r5-sk.dts   | 493 +
> > >   arch/arm/dts/k3-j721e-sk-u-boot.dtsi  | 158 +--
> > >   arch/arm/dts/k3-j721e-sk.dts  | 663 +---
> > >   arch/arm/dts/k3-j721e-som-p0.dtsi | 213 ++--
> > 
> > Are you sure you copied this correctly?
> > I see this change when i copy in files from 6.5-rc1 linux kernel *after*
> > I applied this series of patches.
> > 
> 
> I had mentioned in the coverletter that I had applied a patch that cleans
> this duplicating wkup_i2c0 node up. Will mention it in this patch instead to
> be clearer in v2.

Please just pick the dts as is. the duplicate node is cleared up and
sync with 6.6-rc1 will fix things.

> 
> > diff --git a/arch/arm/dts/k3-j721e-som-p0.dtsi 
> > b/arch/arm/dts/k3-j721e-som-p0.dtsi
> > index e90e43202546..38ae13cc3aa3 100644
> > --- a/arch/arm/dts/k3-j721e-som-p0.dtsi
> > +++ b/arch/arm/dts/k3-j721e-som-p0.dtsi
> > @@ -201,6 +201,19 @@
> > };
> >   };
> > +_i2c0 {
> > +   status = "okay";
> > +   pinctrl-names = "default";
> > +   pinctrl-0 = <_i2c0_pins_default>;
> > +   clock-frequency = <40>;
> > +
> > +   eeprom@50 {
> > +   /* CAV24C256WE-GT3 */
> > +   compatible = "atmel,24c256";
> > +   reg = <0x50>;
> > +   };
> > +};
> > +
> >{
> > pinctrl-names = "default";
> > pinctrl-0 = <_fss0_ospi0_pins_default>;
> > 
> 
> -- 
> Thanking You
> Neha Malcom Francis

-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 
849D 1736 249D


Re: [PATCH v1 2/4] arm: dts: k3-j721e: Sync with v6.5-rc1

2023-08-31 Thread Neha Malcom Francis

Hi Nishanth

On 28/08/23 22:59, Nishanth Menon wrote:

On 17:01-20230828, Neha Malcom Francis wrote:

Sync k3-j721e DTS with kernel.org v6.5-rc1.
* pcie_epx nodes have been deleted, they are not needed [1]
* use mcu_timer0 instead of the redundant timer1. Also delete
  clock and power domain properties since J721E follows legacy
  boot flow where system firmware is not yet available to modify
  clocks
* remove mcu_i2c0 as it is used for tps659413 PMIC in j721e-sk
  for which support is not yet added.
* remove main_i2c2 pinmux for j721e-sk as it is connected to the
  test automation header for which support is not there
* change mcu_secproxy to secure_proxy_mcu since linux has
  defined these nodes
* hbmc nodes have been disabled as their support in kernel
  itself is unfinished (dependent series not merged) [2]
* Drop mcu_cpsw node in U-Boot as it is no longer needed here
  thanks to [3]


Just use spaces.

You do not need to provide changelog to all the u-boot changes in the commit
message - use the diffstat for that. if you are referring to topics such
as those use commit id style.

[...]


diff --git a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi 
b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
index 540c847eb3..6a95ed2a96 100644
--- a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
@@ -8,12 +8,10 @@
  
  / {

chosen {
-   stdout-path = "serial2:115200n8";
-   tick-timer = 
+   tick-timer = _timer0;


Looking at Manorit's series, I realized that tick-timer property is only
needed for R5 dts.


};
  
  	aliases {

-   ethernet0 = _port1;
spi0 = 
spi1 = 

You don't need any of these. nor do you need i2c aliases etc. all those
come from the board.dts.


remoteproc0 = _r5fss0_core0;


remoteproc aliases is probably needed to remain sane - upstream kernel
maintainer hasn't agreed[1] to pick up aliases so far.


@@ -34,52 +32,44 @@
  
  _main{


watch for that space after nodename _main { instead of _main{


bootph-pre-ram;

[...]


assigned-clock-parents = <_clks 295 0>, <_clks 295 9>;


Why do we still have this for _pll1_refclk and _pll1_refclk
_pcie_link ?

Also why  are we dropping assigned-clocks and assigned-clock-parents in
? And these dont even have a bootph or u-boot, property - so
what is the point in invoking them if they are'nt getting set in early
stages of boot. if this is a valid clocking bug, fix should have gone to
kernel - and document it as such.

[...]

I will comment about dr_mode and usb

There is a bit of a debate ongoing on this.
https://lore.kernel.org/u-boot/20230706-handle-otg-as-periph-v3-0-27e24fa17...@baylibre.com/

But I don't see why we need to hold off for that resolution.


  _mmc1_pins_default {
bootph-pre-ram;
  };
@@ -169,8 +158,14 @@
bootph-pre-ram;
  };
  
+_uart0 {

+   bootph-pre-ram;
+   status = "okay";
+};
+
  _i2c0 {
bootph-pre-ram;
+   status = "okay";
  };
  
  _i2c0 {

@@ -181,6 +176,10 @@
bootph-pre-ram;
  };
  
+_esm{


Watch out for that space before {.


+   bootph-pre-ram;
+};
+
   {
bootph-pre-ram;
  };
@@ -194,6 +193,7 @@
  };
  
   {

+   status = "disabled";
bootph-pre-ram;
  
  	flash@0,0 {


Just drop the flash information etc in the node and mark the node as disabled.


@@ -268,7 +268,38 @@
assigned-clock-parents = <_pll1_refclk>;
  };
  
-_qsgmii_link {

-   assigned-clocks = < CDNS_SIERRA_PLL_CMNLC1>;
-   assigned-clock-parents = <_pll1_refclk>;
+_crypto {
+   dma-coherent;
+};


Why?


+
+ {
+   clocks = <_clks 264 1>;
+};


We don't even use rng in u-boot.


+
+_i2c2 {
+   status = "okay";
+};
+
+_i2c4 {
+   status = "okay";
+};
+
+_i2c5 {
+   status = "okay";
+};


You need all of these in u-boot? They dont even have bootph properties.
nothing without bootph OR u-boot, properties should even be present in
u-boot.dtsi


+
+_uart0 {
+   status = "okay";
+};
+
+_i2c0 {
+   status = "okay";
+};
+
+_i2c1 {
+   status = "okay";
+};
+
+ {
+   status = "disabled";
  };


Why not just leave things as is from kernel dts?

[...]


diff --git a/arch/arm/dts/k3-j721e-r5-common-proc-board.dts 
b/arch/arm/dts/k3-j721e-r5-common-proc-board.dts
index 7bb5ce775c..da8cf7f37b 100644
--- a/arch/arm/dts/k3-j721e-r5-common-proc-board.dts
+++ b/arch/arm/dts/k3-j721e-r5-common-proc-board.dts


[...]
  
  _uart0 {

/delete-property/ power-domains;
/delete-property/ clocks;
/delete-property/ clock-names;


NAK. no explanation why we have to delete these properties. and why not
we add data to handle it if it is mandatory.


-   pinctrl-names = "default";
-   pinctrl-0 = <_uart0_pins_default>;
-   

Re: [PATCH v1 2/4] arm: dts: k3-j721e: Sync with v6.5-rc1

2023-08-31 Thread Neha Malcom Francis

Hi Nishanth

On 28/08/23 22:39, Nishanth Menon wrote:

On 17:01-20230828, Neha Malcom Francis wrote:

Sync k3-j721e DTS with kernel.org v6.5-rc1.
* pcie_epx nodes have been deleted, they are not needed [1]
* use mcu_timer0 instead of the redundant timer1. Also delete
  clock and power domain properties since J721E follows legacy
  boot flow where system firmware is not yet available to modify
  clocks
* remove mcu_i2c0 as it is used for tps659413 PMIC in j721e-sk
  for which support is not yet added.
* remove main_i2c2 pinmux for j721e-sk as it is connected to the
  test automation header for which support is not there
* change mcu_secproxy to secure_proxy_mcu since linux has
  defined these nodes
* hbmc nodes have been disabled as their support in kernel
  itself is unfinished (dependent series not merged) [2]
* Drop mcu_cpsw node in U-Boot as it is no longer needed here
  thanks to [3]

[1] https://lore.kernel.org/lkml/20230515172137.474626-2-...@ti.com/
[2] https://lore.kernel.org/all/20230513123313.11462-2-vaishna...@ti.com/
[3] https://lore.kernel.org/all/20230722193151.117345-1-rog...@kernel.org/

Signed-off-by: Neha Malcom Francis 
---
  .../k3-j721e-common-proc-board-u-boot.dtsi| 139 ++-
  arch/arm/dts/k3-j721e-common-proc-board.dts   | 483 ++---
  arch/arm/dts/k3-j721e-main.dtsi   | 974 --
  arch/arm/dts/k3-j721e-mcu-wakeup.dtsi | 280 -
  .../arm/dts/k3-j721e-r5-common-proc-board.dts | 270 +
  arch/arm/dts/k3-j721e-r5-sk.dts   | 493 +
  arch/arm/dts/k3-j721e-sk-u-boot.dtsi  | 158 +--
  arch/arm/dts/k3-j721e-sk.dts  | 663 +---
  arch/arm/dts/k3-j721e-som-p0.dtsi | 213 ++--


Are you sure you copied this correctly?
I see this change when i copy in files from 6.5-rc1 linux kernel *after*
I applied this series of patches.



I had mentioned in the coverletter that I had applied a patch that cleans this 
duplicating wkup_i2c0 node up. Will mention it in this patch instead to be 
clearer in v2.



diff --git a/arch/arm/dts/k3-j721e-som-p0.dtsi 
b/arch/arm/dts/k3-j721e-som-p0.dtsi
index e90e43202546..38ae13cc3aa3 100644
--- a/arch/arm/dts/k3-j721e-som-p0.dtsi
+++ b/arch/arm/dts/k3-j721e-som-p0.dtsi
@@ -201,6 +201,19 @@
};
  };
  
+_i2c0 {

+   status = "okay";
+   pinctrl-names = "default";
+   pinctrl-0 = <_i2c0_pins_default>;
+   clock-frequency = <40>;
+
+   eeprom@50 {
+   /* CAV24C256WE-GT3 */
+   compatible = "atmel,24c256";
+   reg = <0x50>;
+   };
+};
+
   {
pinctrl-names = "default";
pinctrl-0 = <_fss0_ospi0_pins_default>;



--
Thanking You
Neha Malcom Francis


Re: [PATCH v1 2/4] arm: dts: k3-j721e: Sync with v6.5-rc1

2023-08-28 Thread Nishanth Menon
On 17:01-20230828, Neha Malcom Francis wrote:
> Sync k3-j721e DTS with kernel.org v6.5-rc1.
>   * pcie_epx nodes have been deleted, they are not needed [1]
>   * use mcu_timer0 instead of the redundant timer1. Also delete
> clock and power domain properties since J721E follows legacy
> boot flow where system firmware is not yet available to modify
> clocks
>   * remove mcu_i2c0 as it is used for tps659413 PMIC in j721e-sk
> for which support is not yet added.
>   * remove main_i2c2 pinmux for j721e-sk as it is connected to the
> test automation header for which support is not there
>   * change mcu_secproxy to secure_proxy_mcu since linux has
> defined these nodes
>   * hbmc nodes have been disabled as their support in kernel
> itself is unfinished (dependent series not merged) [2]
>   * Drop mcu_cpsw node in U-Boot as it is no longer needed here
> thanks to [3]

Just use spaces.

You do not need to provide changelog to all the u-boot changes in the commit
message - use the diffstat for that. if you are referring to topics such
as those use commit id style.

[...]

> diff --git a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi 
> b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
> index 540c847eb3..6a95ed2a96 100644
> --- a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
> +++ b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
> @@ -8,12 +8,10 @@
>  
>  / {
>   chosen {
> - stdout-path = "serial2:115200n8";
> - tick-timer = 
> + tick-timer = _timer0;

Looking at Manorit's series, I realized that tick-timer property is only
needed for R5 dts.

>   };
>  
>   aliases {
> - ethernet0 = _port1;
>   spi0 = 
>   spi1 = 
You don't need any of these. nor do you need i2c aliases etc. all those
come from the board.dts.

>   remoteproc0 = _r5fss0_core0;

remoteproc aliases is probably needed to remain sane - upstream kernel
maintainer hasn't agreed[1] to pick up aliases so far.

> @@ -34,52 +32,44 @@
>  
>  _main{

watch for that space after nodename _main { instead of _main{

>   bootph-pre-ram;
[...]

>   assigned-clock-parents = <_clks 295 0>, <_clks 295 9>;

Why do we still have this for _pll1_refclk and _pll1_refclk
_pcie_link ?

Also why  are we dropping assigned-clocks and assigned-clock-parents in
? And these dont even have a bootph or u-boot, property - so
what is the point in invoking them if they are'nt getting set in early
stages of boot. if this is a valid clocking bug, fix should have gone to
kernel - and document it as such.

[...]

I will comment about dr_mode and usb

There is a bit of a debate ongoing on this.
https://lore.kernel.org/u-boot/20230706-handle-otg-as-periph-v3-0-27e24fa17...@baylibre.com/

But I don't see why we need to hold off for that resolution.

>  _mmc1_pins_default {
>   bootph-pre-ram;
>  };
> @@ -169,8 +158,14 @@
>   bootph-pre-ram;
>  };
>  
> +_uart0 {
> + bootph-pre-ram;
> + status = "okay";
> +};
> +
>  _i2c0 {
>   bootph-pre-ram;
> + status = "okay";
>  };
>  
>  _i2c0 {
> @@ -181,6 +176,10 @@
>   bootph-pre-ram;
>  };
>  
> +_esm{

Watch out for that space before {.

> + bootph-pre-ram;
> +};
> +
>   {
>   bootph-pre-ram;
>  };
> @@ -194,6 +193,7 @@
>  };
>  
>   {
> + status = "disabled";
>   bootph-pre-ram;
>  
>   flash@0,0 {

Just drop the flash information etc in the node and mark the node as disabled.

> @@ -268,7 +268,38 @@
>   assigned-clock-parents = <_pll1_refclk>;
>  };
>  
> -_qsgmii_link {
> - assigned-clocks = < CDNS_SIERRA_PLL_CMNLC1>;
> - assigned-clock-parents = <_pll1_refclk>;
> +_crypto {
> + dma-coherent;
> +};

Why?

> +
> + {
> + clocks = <_clks 264 1>;
> +};

We don't even use rng in u-boot.

> +
> +_i2c2 {
> + status = "okay";
> +};
> +
> +_i2c4 {
> + status = "okay";
> +};
> +
> +_i2c5 {
> + status = "okay";
> +};

You need all of these in u-boot? They dont even have bootph properties.
nothing without bootph OR u-boot, properties should even be present in
u-boot.dtsi

> +
> +_uart0 {
> + status = "okay";
> +};
> +
> +_i2c0 {
> + status = "okay";
> +};
> +
> +_i2c1 {
> + status = "okay";
> +};
> +
> + {
> + status = "disabled";
>  };

Why not just leave things as is from kernel dts?

[...]

> diff --git a/arch/arm/dts/k3-j721e-r5-common-proc-board.dts 
> b/arch/arm/dts/k3-j721e-r5-common-proc-board.dts
> index 7bb5ce775c..da8cf7f37b 100644
> --- a/arch/arm/dts/k3-j721e-r5-common-proc-board.dts
> +++ b/arch/arm/dts/k3-j721e-r5-common-proc-board.dts

[...]
>  
>  _uart0 {
>   /delete-property/ power-domains;
>   /delete-property/ clocks;
>   /delete-property/ clock-names;

NAK. no explanation why we have to delete these properties. and why not
we add data to handle it if it is mandatory.

> - pinctrl-names = "default";
> -   

Re: [PATCH v1 2/4] arm: dts: k3-j721e: Sync with v6.5-rc1

2023-08-28 Thread Nishanth Menon
On 17:01-20230828, Neha Malcom Francis wrote:
> Sync k3-j721e DTS with kernel.org v6.5-rc1.
>   * pcie_epx nodes have been deleted, they are not needed [1]
>   * use mcu_timer0 instead of the redundant timer1. Also delete
> clock and power domain properties since J721E follows legacy
> boot flow where system firmware is not yet available to modify
> clocks
>   * remove mcu_i2c0 as it is used for tps659413 PMIC in j721e-sk
> for which support is not yet added.
>   * remove main_i2c2 pinmux for j721e-sk as it is connected to the
> test automation header for which support is not there
>   * change mcu_secproxy to secure_proxy_mcu since linux has
> defined these nodes
>   * hbmc nodes have been disabled as their support in kernel
> itself is unfinished (dependent series not merged) [2]
>   * Drop mcu_cpsw node in U-Boot as it is no longer needed here
> thanks to [3]
> 
> [1] https://lore.kernel.org/lkml/20230515172137.474626-2-...@ti.com/
> [2] https://lore.kernel.org/all/20230513123313.11462-2-vaishna...@ti.com/
> [3] https://lore.kernel.org/all/20230722193151.117345-1-rog...@kernel.org/
> 
> Signed-off-by: Neha Malcom Francis 
> ---
>  .../k3-j721e-common-proc-board-u-boot.dtsi| 139 ++-
>  arch/arm/dts/k3-j721e-common-proc-board.dts   | 483 ++---
>  arch/arm/dts/k3-j721e-main.dtsi   | 974 --
>  arch/arm/dts/k3-j721e-mcu-wakeup.dtsi | 280 -
>  .../arm/dts/k3-j721e-r5-common-proc-board.dts | 270 +
>  arch/arm/dts/k3-j721e-r5-sk.dts   | 493 +
>  arch/arm/dts/k3-j721e-sk-u-boot.dtsi  | 158 +--
>  arch/arm/dts/k3-j721e-sk.dts  | 663 +---
>  arch/arm/dts/k3-j721e-som-p0.dtsi | 213 ++--

Are you sure you copied this correctly?
I see this change when i copy in files from 6.5-rc1 linux kernel *after*
I applied this series of patches.

diff --git a/arch/arm/dts/k3-j721e-som-p0.dtsi 
b/arch/arm/dts/k3-j721e-som-p0.dtsi
index e90e43202546..38ae13cc3aa3 100644
--- a/arch/arm/dts/k3-j721e-som-p0.dtsi
+++ b/arch/arm/dts/k3-j721e-som-p0.dtsi
@@ -201,6 +201,19 @@
};
 };
 
+_i2c0 {
+   status = "okay";
+   pinctrl-names = "default";
+   pinctrl-0 = <_i2c0_pins_default>;
+   clock-frequency = <40>;
+
+   eeprom@50 {
+   /* CAV24C256WE-GT3 */
+   compatible = "atmel,24c256";
+   reg = <0x50>;
+   };
+};
+
  {
pinctrl-names = "default";
pinctrl-0 = <_fss0_ospi0_pins_default>;

-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 
849D 1736 249D


[PATCH v1 2/4] arm: dts: k3-j721e: Sync with v6.5-rc1

2023-08-28 Thread Neha Malcom Francis
Sync k3-j721e DTS with kernel.org v6.5-rc1.
* pcie_epx nodes have been deleted, they are not needed [1]
* use mcu_timer0 instead of the redundant timer1. Also delete
  clock and power domain properties since J721E follows legacy
  boot flow where system firmware is not yet available to modify
  clocks
* remove mcu_i2c0 as it is used for tps659413 PMIC in j721e-sk
  for which support is not yet added.
* remove main_i2c2 pinmux for j721e-sk as it is connected to the
  test automation header for which support is not there
* change mcu_secproxy to secure_proxy_mcu since linux has
  defined these nodes
* hbmc nodes have been disabled as their support in kernel
  itself is unfinished (dependent series not merged) [2]
* Drop mcu_cpsw node in U-Boot as it is no longer needed here
  thanks to [3]

[1] https://lore.kernel.org/lkml/20230515172137.474626-2-...@ti.com/
[2] https://lore.kernel.org/all/20230513123313.11462-2-vaishna...@ti.com/
[3] https://lore.kernel.org/all/20230722193151.117345-1-rog...@kernel.org/

Signed-off-by: Neha Malcom Francis 
---
 .../k3-j721e-common-proc-board-u-boot.dtsi| 139 ++-
 arch/arm/dts/k3-j721e-common-proc-board.dts   | 483 ++---
 arch/arm/dts/k3-j721e-main.dtsi   | 974 --
 arch/arm/dts/k3-j721e-mcu-wakeup.dtsi | 280 -
 .../arm/dts/k3-j721e-r5-common-proc-board.dts | 270 +
 arch/arm/dts/k3-j721e-r5-sk.dts   | 493 +
 arch/arm/dts/k3-j721e-sk-u-boot.dtsi  | 158 +--
 arch/arm/dts/k3-j721e-sk.dts  | 663 +---
 arch/arm/dts/k3-j721e-som-p0.dtsi | 213 ++--
 arch/arm/dts/k3-j721e-thermal.dtsi|  75 ++
 arch/arm/dts/k3-j721e.dtsi|  32 +-
 11 files changed, 2413 insertions(+), 1367 deletions(-)
 create mode 100644 arch/arm/dts/k3-j721e-thermal.dtsi

diff --git a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi 
b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
index 540c847eb3..6a95ed2a96 100644
--- a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
@@ -8,12 +8,10 @@
 
 / {
chosen {
-   stdout-path = "serial2:115200n8";
-   tick-timer = 
+   tick-timer = _timer0;
};
 
aliases {
-   ethernet0 = _port1;
spi0 = 
spi1 = 
remoteproc0 = _r5fss0_core0;
@@ -34,52 +32,44 @@
 
 _main{
bootph-pre-ram;
+};
 
-   main_navss: bus@3000 {
-   bootph-pre-ram;
-   };
+_navss {
+   bootph-pre-ram;
 };
 
 _mcu_wakeup {
bootph-pre-ram;
 
-   timer1: timer@4040 {
-   compatible = "ti,omap5430-timer";
-   reg = <0x0 0x4040 0x0 0x80>;
-   ti,timer-alwon;
-   clock-frequency = <25000>;
+   chipid@4314 {
bootph-pre-ram;
};
+};
 
-   mcu_navss: bus@2838 {
-   bootph-pre-ram;
+_navss {
+   bootph-pre-ram;
+};
 
-   ringacc@2b80 {
-   reg =   <0x0 0x2b80 0x0 0x40>,
-   <0x0 0x2b00 0x0 0x40>,
-   <0x0 0x2859 0x0 0x100>,
-   <0x0 0x2a50 0x0 0x4>,
-   <0x0 0x2844 0x0 0x4>;
-   reg-names = "rt", "fifos", "proxy_gcfg", 
"proxy_target", "cfg";
-   bootph-pre-ram;
-   };
-
-   dma-controller@285c {
-   reg =   <0x0 0x285c 0x0 0x100>,
-   <0x0 0x284c 0x0 0x4000>,
-   <0x0 0x2a80 0x0 0x4>,
-   <0x0 0x284a 0x0 0x4000>,
-   <0x0 0x2aa0 0x0 0x4>,
-   <0x0 0x2840 0x0 0x2000>;
-   reg-names = "gcfg", "rchan", "rchanrt", "tchan",
-   "tchanrt", "rflow";
-   bootph-pre-ram;
-   };
-   };
+_ringacc {
+   reg =   <0x0 0x2b80 0x0 0x40>,
+   <0x0 0x2b00 0x0 0x40>,
+   <0x0 0x2859 0x0 0x100>,
+   <0x0 0x2a50 0x0 0x4>,
+   <0x0 0x2844 0x0 0x4>;
+   reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target", "cfg";
+   bootph-pre-ram;
+};
 
-   chipid@4314 {
-   bootph-pre-ram;
-   };
+_udmap {
+   reg =   <0x0 0x285c 0x0 0x100>,
+   <0x0 0x284c 0x0 0x4000>,
+   <0x0 0x2a80 0x0 0x4>,
+   <0x0 0x284a 0x0 0x4000>,
+   <0x0 0x2aa0 0x0 0x4>,
+   <0x0 0x2840 0x0 0x2000>;
+   reg-names = "gcfg",