[PATCH v2 7/7] arm: dts: k3-j721e: Sync with v6.5-rc1
Neha Malcom Francis
n-francis at ti.com
Fri Sep 8 10:43:50 CEST 2023
Hi Manorit
On 08/09/23 13:42, Manorit Chawdhry wrote:
> Hi Neha,
>
> On 19:44-20230907, Neha Malcom Francis wrote:
>> Sync k3-j721e DTS with kernel.org v6.5-rc1.
>>
>> Signed-off-by: Neha Malcom Francis <n-francis at ti.com>
>> ---
>> .../k3-j721e-common-proc-board-u-boot.dtsi | 146 +--
>> 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 | 302 +-----
>> arch/arm/dts/k3-j721e-r5-sk.dts | 522 +---------
>> arch/arm/dts/k3-j721e-sk-u-boot.dtsi | 177 +---
>> arch/arm/dts/k3-j721e-sk.dts | 663 +++++++++---
>> arch/arm/dts/k3-j721e-som-p0.dtsi | 226 ++--
>> arch/arm/dts/k3-j721e-thermal.dtsi | 75 ++
>> arch/arm/dts/k3-j721e.dtsi | 32 +-
>> 11 files changed, 2365 insertions(+), 1515 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..4cca01be61 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
>> @@ -7,15 +7,7 @@
> [..]
>> -
>> aliases {
>> - ethernet0 = &cpsw_port1;
>> - spi0 = &ospi0;
>> - spi1 = &ospi1;
>> remoteproc0 = &mcu_r5fss0_core0;
>> remoteproc1 = &mcu_r5fss0_core1;
>> remoteproc2 = &main_r5fss0_core0;
>> @@ -25,61 +17,49 @@
>> remoteproc6 = &c66_0;
>> remoteproc7 = &c66_1;
>> remoteproc8 = &c71_0;
>
> I don't think these aliases are used anywhere, they can be removed ig.
>
I kept them from v1 review comment by Nishanth that remoteproc aliases have not
been taken in upstream kernel [1]
>> - i2c0 = &wkup_i2c0;
>> - i2c1 = &mcu_i2c0;
>> - i2c2 = &mcu_i2c1;
>> - i2c3 = &main_i2c0;
>> };
>> };
> [..]
>
>> diff --git a/arch/arm/dts/k3-j721e-common-proc-board.dts b/arch/arm/dts/k3-j721e-common-proc-board.dts
>> index 1b600547c0..c1cbbae761 100644
>> --- a/arch/arm/dts/k3-j721e-common-proc-board.dts
>> +++ b/arch/arm/dts/k3-j721e-common-proc-board.dts
>
> [..]
>
>> diff --git a/arch/arm/dts/k3-j721e-main.dtsi b/arch/arm/dts/k3-j721e-main.dtsi
>> index cf3482376c..2ded1ee1a8 100644
>> --- a/arch/arm/dts/k3-j721e-main.dtsi
>> +++ b/arch/arm/dts/k3-j721e-main.dtsi
>
> [..]
>
>> 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..0452e94b6d 100644
>> --- a/arch/arm/dts/k3-j721e-r5-common-proc-board.dts
>> +++ b/arch/arm/dts/k3-j721e-r5-common-proc-board.dts
>> @@ -12,16 +12,15 @@
> -};
>> -
>> -&wkup_uart0 {
>> +&secure_proxy_mcu {
>> bootph-pre-ram;
>> - pinctrl-names = "default";
>> - pinctrl-0 = <&wkup_uart0_pins_default>;
>> status = "okay";
>
> Am not sure if this should be okay or did I break something in my series
> by not setting this as okay, will see what Nishanth has to comment
> regarding this.
>
Looking at k3-j721e-r5-common-proc-board.dts before sync, I see that the status
was set to okay. I will look into whether it's in use any where or not.
>> };
>>
>> -&wkup_gpio0 {
>> - pinctrl-names = "default";
>> - pinctrl-0 = <&wkup_gpio_pins_default>;
>> +&cbass_mcu_wakeup {
>> + sysctrler: sysctrler {
>> + bootph-pre-ram;
>> + compatible = "ti,am654-system-controller";
>> + mboxes= <&secure_proxy_mcu 4>, <&secure_proxy_mcu 5>;
>> + mbox-names = "tx", "rx";
>> + };
>> };
>>
>> &mcu_uart0 {
>> - /delete-property/ power-domains;
>> - /delete-property/ clocks;
>> - /delete-property/ clock-names;
>> - pinctrl-names = "default";
>> - pinctrl-0 = <&mcu_uart0_pins_default>;
>> - status = "okay";
>> clock-frequency = <48000000>;
>> };
>>
>> -&main_uart0 {
>> - pinctrl-names = "default";
>> - pinctrl-0 = <&main_uart0_pins_default>;
>> - status = "okay";
>> - power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>;
>> -};
>> -
>> &main_sdhci0 {
>> - /delete-property/ power-domains;
>> - /delete-property/ assigned-clocks;
>> - /delete-property/ assigned-clock-parents;
>> - clock-names = "clk_xin";
>> - clocks = <&clk_200mhz>;
>> - ti,driver-strength-ohm = <50>;
>> - non-removable;
>> + clock-frequency = <200000000>;
>> bus-width = <8>;
>
> This property will need to be removed too I believe.
>
Yes I see it's not used in the U-Boot driver, will remove it.
>> };
>>
>> &main_sdhci1 {
>> - /delete-property/ power-domains;
>> - /delete-property/ assigned-clocks;
>> - /delete-property/ assigned-clock-parents;
>> - pinctrl-names = "default";
>> - pinctrl-0 = <&main_mmc1_pins_default>;
>> - clock-names = "clk_xin";
>> - clocks = <&clk_200mhz>;
>> - ti,driver-strength-ohm = <50>;
>> + clock-frequency = <19200000>;
>> };
>>
>> &wkup_i2c0 {
>> @@ -293,96 +124,35 @@
>> };
>>
>> &usbss0 {
>> - /delete-property/ power-domains;
>> - /delete-property/ assigned-clocks;
>> - /delete-property/ assigned-clock-parents;
>> - clocks = <&clk_19_2mhz>;
>> - clock-names = "ref";
>> - pinctrl-names = "default";
>> - pinctrl-0 = <&main_usbss0_pins_default>;
>> - ti,vbus-divider;
>> -};
>> -
>
> [..]
>> diff --git a/arch/arm/dts/k3-j721e-r5-sk.dts b/arch/arm/dts/k3-j721e-r5-sk.dts
>> index 1cc64d07f7..f5eb29a861 100644
>> --- a/arch/arm/dts/k3-j721e-r5-sk.dts
>> +++ b/arch/arm/dts/k3-j721e-r5-sk.dts
>
> With the above comments.
>
> Reviewed-By: Manorit Chawdhry <m-chawdhry at ti.com>
>
Thanks for the review!
> Regards,
> Manorit
[1] https://lore.kernel.org/lkml/20230822215042.yjaqtwhuhls57pbu@glamour/T/
--
Thanking You
Neha Malcom Francis
More information about the U-Boot
mailing list