[PATCH 2/9] arm: dts: ls1028a: move devices into /soc

[Michael Walle]

Am 2021-08-31 20:46, schrieb Vladimir Oltean:
> On Tue, Aug 31, 2021 at 05:40:21PM +0200, Michael Walle wrote:
>> Move all the CCSR related device nodes into /soc similiar to the linux
>> device tree.
>> 
>> Signed-off-by: Michael Walle <michael at walle.cc>
>> ---
>>  .../dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi  |   4 +
>>  .../dts/fsl-ls1028a-qds-1xxx-sch-30842.dtsi   |   2 +-
>>  .../dts/fsl-ls1028a-qds-6xxx-sch-30842.dtsi   |   2 +-
>>  .../dts/fsl-ls1028a-qds-7777-sch-30841.dtsi   |   8 +-
>>  .../dts/fsl-ls1028a-qds-7xx7-sch-30841R.dtsi  |   4 +-
>>  .../dts/fsl-ls1028a-qds-8xxx-sch-24801.dtsi   |   2 +-
>>  .../fsl-ls1028a-qds-9999-sch-24801-LBRW.dtsi  |   8 +-
>>  .../dts/fsl-ls1028a-qds-9999-sch-24801.dtsi   |   8 +-
>>  .../fsl-ls1028a-qds-x3xx-sch-30841-LBRW.dtsi  |   8 +-
>>  .../fsl-ls1028a-qds-x5xx-sch-28021-LBRW.dtsi  |   8 +-
>>  .../dts/fsl-ls1028a-qds-x7xx-sch-30842.dtsi   |   2 +-
>>  .../dts/fsl-ls1028a-qds-xx7x-sch-30842.dtsi   |   2 +-
>>  arch/arm/dts/fsl-ls1028a-qds.dtsi             |   4 +
>>  arch/arm/dts/fsl-ls1028a-rdb.dts              |   4 +
>>  arch/arm/dts/fsl-ls1028a.dtsi                 | 767 
>> +++++++++---------
>>  15 files changed, 426 insertions(+), 407 deletions(-)
>> 
>> diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi 
>> b/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
>> index b3861ed98c..fa4c05212a 100644
>> --- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
>> +++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
>> @@ -266,6 +266,10 @@
>>  	u-boot,dm-pre-reloc;
>>  };
>> 
>> +&soc {
>> +	u-boot,dm-pre-reloc;
>> +};
>> +
> 
> Does the Kontron SL28 use SPL?

Yep :) No BL1/BL2 for TF-A, BL31 is optionally loaded by the
u-boot SPL. Mainly because NXP doesn't seem to be interested
in bringing layerscape (besides one architecture) support in
upstream TF-A. And I don't want to fork yet another software
part from some vendor supplied tree. Not really needed, so I
skipped that. Sorry for that rant ;)

>>  &sysclk {
>>  	u-boot,dm-pre-reloc;
>>  };
>> diff --git a/arch/arm/dts/fsl-ls1028a-qds-x7xx-sch-30842.dtsi 
>> b/arch/arm/dts/fsl-ls1028a-qds-x7xx-sch-30842.dtsi
>> index 1fb2cdf0c2..1834418ae2 100644
>> --- a/arch/arm/dts/fsl-ls1028a-qds-x7xx-sch-30842.dtsi
>> +++ b/arch/arm/dts/fsl-ls1028a-qds-x7xx-sch-30842.dtsi
>> @@ -20,7 +20,7 @@
>>  &mscc_felix_port1 {
>>  	status = "okay";
>>  	phy-mode = "sgmii-2500";
>> -	phy-handle = <&{/i2c at 2000000/fpga at 66/mux-mdio at 54/mdio at 50/phy at 02}>;
>> +	phy-handle = 
>> <&{/soc/i2c at 2000000/fpga at 66/mux-mdio at 54/mdio at 50/phy at 02}>;
>>  };
>> 
>>  &mscc_felix_port4 {
>> diff --git a/arch/arm/dts/fsl-ls1028a-qds-xx7x-sch-30842.dtsi 
>> b/arch/arm/dts/fsl-ls1028a-qds-xx7x-sch-30842.dtsi
>> index 2333f74e5a..2ee11bcacb 100644
>> --- a/arch/arm/dts/fsl-ls1028a-qds-xx7x-sch-30842.dtsi
>> +++ b/arch/arm/dts/fsl-ls1028a-qds-xx7x-sch-30842.dtsi
>> @@ -20,7 +20,7 @@
>>  &mscc_felix_port2 {
>>  	status = "okay";
>>  	phy-mode = "sgmii-2500";
>> -	phy-handle = <&{/i2c at 2000000/fpga at 66/mux-mdio at 54/mdio at 60/phy at 02}>;
>> +	phy-handle = 
>> <&{/soc/i2c at 2000000/fpga at 66/mux-mdio at 54/mdio at 60/phy at 02}>;
>>  };
>> 
>>  &mscc_felix_port4 {
>> diff --git a/arch/arm/dts/fsl-ls1028a-qds.dtsi 
>> b/arch/arm/dts/fsl-ls1028a-qds.dtsi
>> index 69632fa796..3b223a5b52 100644
>> --- a/arch/arm/dts/fsl-ls1028a-qds.dtsi
>> +++ b/arch/arm/dts/fsl-ls1028a-qds.dtsi
>> @@ -241,6 +241,10 @@
>>  	status = "okay";
>>  };
>> 
>> +&soc {
>> +	u-boot,dm-pre-reloc;
>> +};
>> +
> 
> The LS1028A-QDS does not use SPL, it uses TF-A, hence the name:
> configs/ls1028aqds_tfa_defconfig

The fsl-ls1028a-qds.dts has "u-boot,dm-pre-reloc" set for the
i2c0 node, which doesn't work without the same flag for /soc.
So that means I should remove the u-boot,dm-pre-reloc from the
i2c0 node instead?

>>  &usb1 {
>>  	status = "okay";
>>  };
>> diff --git a/arch/arm/dts/fsl-ls1028a-rdb.dts 
>> b/arch/arm/dts/fsl-ls1028a-rdb.dts
>> index 82a8c0a0cd..06ee4e747a 100644
>> --- a/arch/arm/dts/fsl-ls1028a-rdb.dts
>> +++ b/arch/arm/dts/fsl-ls1028a-rdb.dts
>> @@ -123,6 +123,10 @@
>>  	status = "okay";
>>  };
>> 
>> +&soc {
>> +	u-boot,dm-pre-reloc;
>> +};
>> +
> 
> Likewise.

likewise ;)

> Otherwise, the patch itself is pretty much impossible to follow. I 
> guess
> the only option would be to move nodes one by one to /soc such that it
> becomes obvious. I don't have a strong preference, just saying that I
> can't judge it for correctness.

Sounds like many small patches, but I don't have a strong optinion
either.

-michael