On Wed, 22 May 2024 at 23:33, Quentin Schulz quentin.schulz@cherry.de wrote:
Hi Jianfeng Liu,
On 5/22/24 6:58 PM, Jianfeng Liu wrote: [...]
Note that these commits:
- e18e5e8188f2 (arm64: dts: rockchip: add USBDP phys on rk3588)
- 6fca4edb93d3 (arm64: dts: rockchip: Add rk3588 GPU node)
are not synced to u-boot, so I remove usb3 drd nodes and gpu from kernel devicetree.
[...]> diff --git a/dts/upstream/src/arm64/rockchip/rk3588-armsom-sige7.dts b/dts/upstream/src/arm64/rockchip/rk3588-armsom-sige7.dts
new file mode 100644 index 0000000000..c7b46536ec --- /dev/null +++ b/dts/upstream/src/arm64/rockchip/rk3588-armsom-sige7.dts
Sorry, I failed to explain properly what was expected.
dts/upstream should never be touched except with dts/update-dts-subtree.sh script.
Sadly, your board is not supported in v6.9 yet, only in the upcoming v6.10 :/
So we have two options, we keep the dts in arch/arm/dts/ like you used to do, until we merge v6.10 dts in U-Boot (probably for v2024.10?), or we cherry-pick the changes for your board with dts/update-dts-subtree.sh script, see the instructions in the docs Tom has started writing: https://lore.kernel.org/u-boot/20240517174930.1028063-2-trini@konsulko.com/. I would very much like to see someone starting to look into the second option :)
However... it seems we'll likely need to also cherry-pick patches for the GPU (should probably be straightforward as nothing would be using the GPU anyway in U-Boot) and the USBDP PHY... but this one we would need to update all -u-boot.dtsi for rk3588(s) boards that have it already to make it use the new label/DT, make sure that the driver still works... etc. Maybe not a small feat, but someone will have to do it at some point anyway :)
You'd be the first one to do this cherry-picking into dts/upstream, so it'd be really interesting to us if you could provide feedback on what is unclear/not working, etc... so we can update the documentation or fix tools if they were to be insufficient.
+1
Although it is very much similar to normal cherry-picking patches, the dts/update-dts-subtree.sh script is just there to hide the git subtree specific details.
-Sumit
Looking forward to your next patch, Cheers, Quentin