[PATCH v1 1/5] dts: sa8775p-ride-r3-u-boot: add override dtsi

[Caleb Connolly]

On 08/01/2025 06:46, Varadarajan Narayanan wrote:
> On Tue, Jan 07, 2025 at 12:36:23PM +0100, Caleb Connolly wrote:
>>
>>
>> On 07/01/2025 10:24, Varadarajan Narayanan wrote:
>>> On Fri, Jan 03, 2025 at 04:17:14PM +0100, neil.armstrong at linaro.org wrote:
>>>> On 03/01/2025 06:14, Varadarajan Narayanan wrote:
>>>>> Add initial support for the QCS9100 (derived from SA8775p) Ride platforms.
>>>>> Define memory layout statically.
>>>>>
>>>>> Signed-off-by: Varadarajan Narayanan <quic_varada at quicinc.com>
>>>>> ---
>>>>>   arch/arm/dts/sa8775p-ride-r3-u-boot.dtsi | 22 ++++++++++++++++++++++
>>>>>   arch/arm/dts/sa8775p-ride-u-boot.dtsi    | 11 +++++++++++
>>>>>   2 files changed, 33 insertions(+)
>>>>>   create mode 100644 arch/arm/dts/sa8775p-ride-r3-u-boot.dtsi
>>>>>   create mode 100644 arch/arm/dts/sa8775p-ride-u-boot.dtsi
>>>>>
>>>>> diff --git a/arch/arm/dts/sa8775p-ride-r3-u-boot.dtsi b/arch/arm/dts/sa8775p-ride-r3-u-boot.dtsi
>>>>> new file mode 100644
>>>>> index 0000000000..7d01d5f6a1
>>>>> --- /dev/null
>>>>> +++ b/arch/arm/dts/sa8775p-ride-r3-u-boot.dtsi
>>>>> @@ -0,0 +1,22 @@
>>>>> +// SPDX-License-Identifier: BSD-3-Clause
>>>>> +/*
>>>>> + * Copyright (c) 2025, Qualcomm Innovation Center, Inc. All rights reserved.
>>>>> + */
>>>>> +
>>>>> +/ {
>>>>> +	model = "Qualcomm QCS9100 Ride Rev3";
>>>>> +	compatible = "qcom,qcs9100-ride-r3", "qcom,qcs9100", "qcom,sa8775p";
>>>>
>>>> Why do you redefine those ? they are already defined in the upstream sa8775p-ride-r3.dts
>>>
>>> To include QCS9100 info to the model and compatible strings,
>>> so that users might not get confused if a wrong U-Boot has
>>> booted on the platform.
>>
>> They are already defined in dts/upstream/src/arm64/qcom/sa8775p-ride-r3.dts
>>
>> That file is patched at build time to include this dtsi file at the end.
> 
> [1] defines it as "Qualcomm SA8775P Ride Rev3". We want to define
> as "Qualcomm QCS9100 Ride Rev3", i.e. s/SA8775P/QCS9100/. That is
> why having it here. This would not be needed once [2] gets into
> U-Boot.

hmm I see, well that's a pickle. I don't think we have a process yet for
handling these cases where we're blocked on a DTS sync.

I would rather avoid creating this weird situation where we use the
sa8775p dts and pretend it's a different board especially if it's only
temporary until the proper dts lands.

Some proposals:

1. remove the model/compatible properties assuming the sa8775p-ride-r3
board using the same memory map, add another u-boot dtsi for
qcs9100-ride-r3 once it's merged in
2. import qcs9100-ride-r3.dts into arch/arm/dts in u-boot as part of
this series (but need to remember to remove it later!)
3. somehow cherry-pick the relevant patch into the subtree early or ask
Tom to sync the DT subtree
4. wait for the next sync which hopefully won't be too long(?)

I'd be ok with 1 or maybe 2 for this specific case, I'll see if 3/4 are
viable for the future.

Feel free to pick one of those approaches and respin if that works for you.

Kind regards,
> 
> 1. https://source.denx.de/u-boot/u-boot/-/blob/master/dts/upstream/src/arm64/qcom/sa8775p-ride-r3.dts
> 2. https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts/qcom/qcs9100-ride-r3.dts
> 
> Thanks
> Varada
> 
>>> Please let me know if this should still be removed.
>>>
>>> Thanks
>>> Varada
>>>
>>>>> +
>>>>> +	/* Will be removed when bootloader updates later */
>>>>> +	memory at 80000000 {
>>>>> +		device_type = "memory";
>>>>> +		reg = <0x0 0x80000000 0x0 0x3ee00000>,
>>>>> +		      <0x0 0xc0000000 0x0 0x04d00000>,
>>>>> +		      <0xD 0x00000000 0x2 0x54100000>,
>>>>> +		      <0xA 0x80000000 0x1 0x52d00000>,
>>>>> +		      <0x9 0x00000000 0x1 0x80000000>,
>>>>> +		      <0x1 0x00000000 0x2 0xf7500000>,
>>>>> +		      <0x0 0xd0000000 0x0 0x00100000>,
>>>>> +		      <0x0 0xd3500000 0x0 0x07c00000>;
>>>>> +	};
>>>>
>>>> Ack, this should be removed once the SMEM code is merged.
>>>>
>>>>> +};
>>>>> diff --git a/arch/arm/dts/sa8775p-ride-u-boot.dtsi b/arch/arm/dts/sa8775p-ride-u-boot.dtsi
>>>>> new file mode 100644
>>>>> index 0000000000..979462dfec
>>>>> --- /dev/null
>>>>> +++ b/arch/arm/dts/sa8775p-ride-u-boot.dtsi
>>>>> @@ -0,0 +1,11 @@
>>>>> +// SPDX-License-Identifier: BSD-3-Clause
>>>>> +/*
>>>>> + * Copyright (c) 2025, Qualcomm Innovation Center, Inc. All rights reserved.
>>>>> + */
>>>>> +/dts-v1/;
>>>>> +
>>>>> +#include "sa8775p-ride.dts"
>>>>
>>>> Why ? this file will be automatically appended to sa8775p-ride.dts, no need to import is before.
>>>>
>>>>> +/ {
>>>>> +	model = "Qualcomm QCS9100 Ride";
>>>>> +	compatible = "qcom,qcs9100-ride", "qcom,qcs9100", "qcom,sa8775p";
>>>>
>>>> Same, unneeded.
>>>>
>>>> In fact, this file is completely unneeded.
>>>>
>>>>> +};
>>>>
>>>> Neil
>>>>
>>
>> --
>> // Caleb (they/them)
>>

-- 
// Caleb (they/them)