Hi Jianfeng,
On 2024-05-27 19:02, Jianfeng Liu wrote:
Devicetree of ArmSoM Sige7 is merged to kernel v6.10-rc1 with USBDP and GPU nodes. So I use update-dts-subtree.sh to pick related commits of rk3588s.dtsi, and then pick the commit of ArmSoM Sige7's devicetree. I also did run command: ./dts/update-dts-subtree.sh pull v6.10-rc1-dts based on my work but there is a merge conflict of file: dts/upstream/Bindings/Makefile I think this should not be related to my work.
I have only received the cover letter and patch 7/7 but have two quick notes:
This seem to be missing 2 patches from v6.10-rc1-dts for rk3588s.dtsi: - f6835a60a8a2 ("arm64: dts: rockchip: reorder usb2phy properties for rk3588") - ea9a34aa0d78 ("arm64: dts: rockchip: add rk3588 pcie and php IOMMUs")
Probably better to fully sync the rk3588/rk3588s.dtsi-files to the v6.10-rc1-dts state.
Also please add a commit that removes the usbdpphy-grf, usb2phy-grf, usbdp-phy, vo-grf and usb-grf related nodes from rk3588-u-boot.dtsi and rk3588s-u-boot.dtsi. The usb nodes in rk3588 -u-boot.dtsi-files should be obsolete after this series.
Regards, Jonas
Changes in v3:
- Use update-dts-subtree.sh to pick upstream dts
Changes in v2:
- Fix alphabetical order of MAINTAINERS
- Use arch/arm/dts/rk3588-armsom-sige7* in board MAINTAINERS
- Remove spi flash related config
- Move kernel dts to dts/upstream/src/arm64/rockchip/
Boris Brezillon (1): arm64: dts: rockchip: Add rk3588 GPU node
Diederik de Haas (1): arm64: dts: rockchip: Fix ordering of nodes on rk3588s
Jianfeng Liu (2): arm64: dts: rockchip: Add ArmSom Sige7 board board: rockchip: add ArmSoM Sige7 Rk3588 board
Sebastian Reichel (3): arm64: dts: rockchip: fix usb2phy nodename for rk3588 arm64: dts: rockchip: add USBDP phys on rk3588 arm64: dts: rockchip: add USB3 DRD controllers on rk3588
MAINTAINERS | 1 + arch/arm/dts/rk3588-armsom-sige7-u-boot.dtsi | 28 + arch/arm/mach-rockchip/rk3588/Kconfig | 26 + board/armsom/sige7-rk3588/Kconfig | 12 + board/armsom/sige7-rk3588/MAINTAINERS | 7 + configs/sige7-rk3588_defconfig | 93 +++ doc/board/rockchip/rockchip.rst | 1 + .../arm64/rockchip/rk3588-armsom-sige7.dts | 721 ++++++++++++++++++ dts/upstream/src/arm64/rockchip/rk3588.dtsi | 72 ++ dts/upstream/src/arm64/rockchip/rk3588s.dtsi | 337 +++++--- include/configs/sige7-rk3588.h | 15 + 11 files changed, 1215 insertions(+), 98 deletions(-) create mode 100644 arch/arm/dts/rk3588-armsom-sige7-u-boot.dtsi create mode 100644 board/armsom/sige7-rk3588/Kconfig create mode 100644 board/armsom/sige7-rk3588/MAINTAINERS create mode 100644 configs/sige7-rk3588_defconfig create mode 100644 dts/upstream/src/arm64/rockchip/rk3588-armsom-sige7.dts create mode 100644 include/configs/sige7-rk3588.h