On Wed, Jan 08, 2025 at 03:29:42PM +0100, Caleb Connolly wrote:
On 08/01/2025 15:20, Sumit Garg via groups.io wrote:
On Wed, 8 Jan 2025 at 19:36, Caleb Connolly caleb.connolly@linaro.org wrote:
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@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@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:
- 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!)
- somehow cherry-pick the relevant patch into the subtree early
This is the preferred approach, following should create a cherry-pick patch for this platform on top of next branch:
$ ./tools/update-subtree.sh pick dts db6231faa8ef46e5ff5d5ece0c930a07c6358562
Then you should rather include that cherry picked patch in this patch-set instead. The next DT sync will take care of it automatically.
ah that's perfect, thanks Sumit. Then this is the right way to go.
Thanks Caleb and Sumit. Will post a new spin.
-Varada
[ . . . ]