Skip to contentSkip to conversation

Add support for Cool Pi GenBook

PATCH In review Andy Yan 3 participants 8 messages Aug 11, 2024 – Aug 12, 2024

Subsystems (3)
lore
Share & tools
lore

Andy Yan

author
#0 lore raw

cover Add support for Cool Pi GenBook

    Support for Cool Pi GenBook is landing linux-rockchip[], so also

add the support for u-boot here.

[0] https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git/commit/?h=v6.12-armsoc/dts64&id=4a8c1161b843c366776fc872a6fe45b743b2983e

Andy Yan (1):
board: rockchip: Add support for rk3588 GenBook

 .../dts/rk3588-coolpi-cm5-genbook-u-boot.dtsi |  70 ++++
 arch/arm/mach-rockchip/rk3588/Kconfig         |   7 +
 board/coolpi/genbook/Kconfig                  |  12 +
 board/coolpi/genbook/MAINTAINERS              |   7 +
 board/coolpi/genbook/README                   |  23 ++
 configs/coolpi-genbook-rk3588_defconfig       | 104 ++++++
 .../rockchip/rk3588-coolpi-cm5-genbook.dts    | 349 ++++++++++++++++++
 include/configs/genbook-rk3588.h              |  28 ++
 8 files changed, 600 insertions(+)
 create mode 100644 arch/arm/dts/rk3588-coolpi-cm5-genbook-u-boot.dtsi
 create mode 100644 board/coolpi/genbook/Kconfig
 create mode 100644 board/coolpi/genbook/MAINTAINERS
 create mode 100644 board/coolpi/genbook/README
 create mode 100644 configs/coolpi-genbook-rk3588_defconfig
 create mode 100644 dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts
 create mode 100644 include/configs/genbook-rk3588.h
Signature · 1 line
2.34.1
author
#1 lore raw

PATCH 1/1 board: rockchip: Add support for rk3588 GenBook

Add support for Cool Pi GenBook.

Specification:
- Rockchip RK3588
- LPDDR5X 8/32 GB
- eMMC 64 GB
- HDMI Type A out x 1
- USB 3.0 Host x 1
- USB-C 3.0 with DisplayPort AltMode
- PCIE M.2 E Key for RTL8852BE Wireless connection
- PCIE M.2 M Key for NVME connection
- eDP panel with 1920x1080

Test by a Armbian boot on USB disk.

---

 .../dts/rk3588-coolpi-cm5-genbook-u-boot.dtsi |  70 ++++
 arch/arm/mach-rockchip/rk3588/Kconfig         |   7 +
 board/coolpi/genbook/Kconfig                  |  12 +
 board/coolpi/genbook/MAINTAINERS              |   7 +
 board/coolpi/genbook/README                   |  23 ++
 configs/coolpi-genbook-rk3588_defconfig       | 104 ++++++
 .../rockchip/rk3588-coolpi-cm5-genbook.dts    | 349 ++++++++++++++++++
 include/configs/genbook-rk3588.h              |  28 ++
 8 files changed, 600 insertions(+)
 create mode 100644 arch/arm/dts/rk3588-coolpi-cm5-genbook-u-boot.dtsi
 create mode 100644 board/coolpi/genbook/Kconfig
 create mode 100644 board/coolpi/genbook/MAINTAINERS
 create mode 100644 board/coolpi/genbook/README
 create mode 100644 configs/coolpi-genbook-rk3588_defconfig
 create mode 100644 dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts
 create mode 100644 include/configs/genbook-rk3588.h
arch/arm/dts/rk3588-coolpi-cm5-genbook-u-boot.dtsi new file +70 -0
new file mode 100644
index 00000000000..5835bd4352b
@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+#include "rk3588-u-boot.dtsi"
+
+&fspim2_pins {
+	bootph-pre-ram;
+	bootph-some-ram;
+};
+
+&sdhci {
+	cap-mmc-highspeed;
+	mmc-hs200-1_8v;
+};
+
+&sfc {
+	pinctrl-names = "default";
+	pinctrl-0 = <&fspim2_pins>;
+	status = "okay";
+
+	flash@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		bootph-pre-ram;
+		bootph-some-ram;
+		spi-max-frequency = <24000000>;
+		spi-rx-bus-width = <4>;
+		spi-tx-bus-width = <1>;
+	};
+};
+
+&u2phy0 {
+	status = "okay";
+};
+
+&u2phy0_otg {
+	status = "okay";
+};
+
+&usbdp_phy0 {
+	status = "okay";
+};
+
+/* For Keypad */
+&usb_host0_ehci {
+	status = "disabled";
+};
+
+&usb_host0_ohci {
+	status = "disabled";
+};
+
+&usb_host0_xhci {
+	dr_mode = "peripheral";
+	maximum-speed = "high-speed";
+	status = "okay";
+};
+
+/* connected to a HUB for camera and BT */
+&usb_host1_ehci {
+	status = "disabled";
+};
+
+&usb_host1_ohci {
+	status = "disabled";
+};
+
+/* USB A out */
+&usb_host1_xhci {
+	snps,dis_u3_susphy_quirk;
+};
arch/arm/mach-rockchip/rk3588/Kconfig +7 -0
index e751d64e1a1..dc53d559ed9 100644
@@ -6,6 +6,12 @@ config TARGET_EVB_RK3588
 	help
 	  RK3588 EVB is a evaluation board for Rockchp RK3588.
 
+config TARGET_GENBOOK_RK3588
+	bool "Cool Pi GenBook"
+	select BOARD_LATE_INIT
+	help
+	  GeenBook is a notebook based on Rockchip RK3588.
+
 config TARGET_JAGUAR_RK3588
 	bool "Theobroma Systems SBC-RK3588-AMR (Jaguar)"
 	select BOARD_LATE_INIT
@@ -323,5 +329,6 @@ source "board/rockchip/evb_rk3588/Kconfig"
 source "board/rockchip/toybrick_rk3588/Kconfig"
 source "board/theobroma-systems/jaguar_rk3588/Kconfig"
 source "board/theobroma-systems/tiger_rk3588/Kconfig"
+source "board/coolpi/genbook/Kconfig"
 
 endif
board/coolpi/genbook/Kconfig new file +12 -0
new file mode 100644
index 00000000000..48a340d79c5
@@ -0,0 +1,12 @@
+if TARGET_GENBOOK_RK3588
+
+config SYS_BOARD
+	default "genbook"
+
+config SYS_VENDOR
+	default "coolpi"
+
+config SYS_CONFIG_NAME
+	default "genbook-rk3588"
+
+endif
board/coolpi/genbook/MAINTAINERS new file +7 -0
new file mode 100644
index 00000000000..45c2ddc5fa1
@@ -0,0 +1,7 @@
+GENBOOK-RK3588
+M:	andyshrk <[email protected]>
+S:	Maintained
+F:	board/coolpi/genbook
+F:	include/configs/genbook-rk3588.h
+F:	configs/coolpi-genbook-rk3588_defconfig
+F:	arch/arm/dts/rk3588-coolpi-cm5-genbook-u-boot.dtsi
board/coolpi/genbook/README new file +23 -0
new file mode 100644
index 00000000000..ba165953154
@@ -0,0 +1,23 @@
+Compile the U-Boot
+==================
+
+  > cd u-boot
+  > export ROCKCHIP_TPL=../rkbin/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.17.bin
+  > export BL31=../rkbin/bin/rk35/rk3588_bl31_v1.46.elf
+  > make coolpi-genbook-rk3588_defconfig
+  > make CROSS_COMPILE=aarch64-linux-gnu-
+
+  Get u-boot-rockchip.bin for eMMC and u-boot-rockchip-spi.bin for SPI Nor.
+
+
+Write u-boot to eMMC or SPI Nor if you have a bootable linux system on the computer:
+
+Flash the image to eMMC
+==========================
+  > dd if=u-boot-rockchip.bin of=/dev/mmcblk0 bs=512 seek=64
+
+Flash the image to SPI Nor
+==========================
+ > dd if=u-boot-rockchip-spi.bin of=/dev/mtdblock0
+
+Note: The boot priority of SPI Nor is higher than that of eMMC
configs/coolpi-genbook-rk3588_defconfig new file +104 -0

104 lines not on this page · raw message

dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts new file +349 -0

349 lines not on this page · raw message

include/configs/genbook-rk3588.h new file +28 -0
new file mode 100644
index 00000000000..5c5957b8bf5
@@ -0,0 +1,28 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ */
+
+#ifndef __ROCK5B_RK3588_H
+#define __ROCK5B_RK3588_H
+
+#define ROCKCHIP_DEVICE_SETTINGS \
+		"stdout=serial,vidconsole\0" \
+		"stderr=serial,vidconsole\0"
+
+#include <configs/rk3588_common.h>
+
+#undef CFG_EXTRA_ENV_SETTINGS
+
+/*
+ * As a laptop, there is no sdmmc, and we
+ * want to set usb the highest boot priority
+ * for third-part os installation.
+ */
+#define CFG_EXTRA_ENV_SETTINGS \
+	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
+	"partitions=" PARTS_DEFAULT		\
+	ENV_MEM_LAYOUT_SETTINGS			\
+	ROCKCHIP_DEVICE_SETTINGS \
+	"boot_targets=" "usb mmc0" "\0"
+
+#endif /* __GENBOOK_RK3588_H */
Signature · 1 line
2.34.1
#2 lore raw

Re: [PATCH 1/1] board: rockchip: Add support for rk3588 GenBook

Hello Andy,

Please see a few comments below.

Quoted 12 lines · Andy Yan

Add support for Cool Pi GenBook.

Specification:
- Rockchip RK3588
- LPDDR5X 8/32 GB
- eMMC 64 GB
- HDMI Type A out x 1
- USB 3.0 Host x 1
- USB-C 3.0 with DisplayPort AltMode
- PCIE M.2 E Key for RTL8852BE Wireless connection
- PCIE M.2 M Key for NVME connection
- eDP panel with 1920x1080

It should be mentioned that it actually uses CM5 SoM.

Quoted 108 lines

Test by a Armbian boot on USB disk.

---

 .../dts/rk3588-coolpi-cm5-genbook-u-boot.dtsi |  70 ++++
 arch/arm/mach-rockchip/rk3588/Kconfig         |   7 +
 board/coolpi/genbook/Kconfig                  |  12 +
 board/coolpi/genbook/MAINTAINERS              |   7 +
 board/coolpi/genbook/README                   |  23 ++
 configs/coolpi-genbook-rk3588_defconfig       | 104 ++++++
 .../rockchip/rk3588-coolpi-cm5-genbook.dts    | 349 ++++++++++++++++++
 include/configs/genbook-rk3588.h              |  28 ++
 8 files changed, 600 insertions(+)
 create mode 100644 arch/arm/dts/rk3588-coolpi-cm5-genbook-u-boot.dtsi
 create mode 100644 board/coolpi/genbook/Kconfig
 create mode 100644 board/coolpi/genbook/MAINTAINERS
 create mode 100644 board/coolpi/genbook/README
 create mode 100644 configs/coolpi-genbook-rk3588_defconfig
 create mode 100644
dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts
 create mode 100644 include/configs/genbook-rk3588.h
arch/arm/dts/rk3588-coolpi-cm5-genbook-u-boot.dtsi new file +70 -0
new file mode 100644
index 00000000000..5835bd4352b
@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+#include "rk3588-u-boot.dtsi"
+
+&fspim2_pins {
+	bootph-pre-ram;
+	bootph-some-ram;
+};
+
+&sdhci {
+	cap-mmc-highspeed;
+	mmc-hs200-1_8v;
+};
+
+&sfc {
+	pinctrl-names = "default";
+	pinctrl-0 = <&fspim2_pins>;
+	status = "okay";
+
+	flash@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		bootph-pre-ram;
+		bootph-some-ram;
+		spi-max-frequency = <24000000>;
+		spi-rx-bus-width = <4>;
+		spi-tx-bus-width = <1>;
+	};
+};
+
+&u2phy0 {
+	status = "okay";
+};
+
+&u2phy0_otg {
+	status = "okay";
+};
+
+&usbdp_phy0 {
+	status = "okay";
+};
+
+/* For Keypad */
+&usb_host0_ehci {
+	status = "disabled";
+};
+
+&usb_host0_ohci {
+	status = "disabled";
+};
+
+&usb_host0_xhci {
+	dr_mode = "peripheral";
+	maximum-speed = "high-speed";
+	status = "okay";
+};
+
+/* connected to a HUB for camera and BT */
+&usb_host1_ehci {
+	status = "disabled";
+};
+
+&usb_host1_ohci {
+	status = "disabled";
+};
+
+/* USB A out */
+&usb_host1_xhci {
+	snps,dis_u3_susphy_quirk;
+};
arch/arm/mach-rockchip/rk3588/Kconfig +0 -0
index e751d64e1a1..dc53d559ed9 100644

arch/arm/mach-rockchip/rk3588/Kconfig config TARGET_EVB_RK3588 · line 9

Quoted 4 lines
arch/arm/mach-rockchip/rk3588/Kconfig +1 -0
@@ -6,6 +6,12 @@ config TARGET_EVB_RK3588
 	help
 	  RK3588 EVB is a evaluation board for Rockchp RK3588.
 
+config TARGET_GENBOOK_RK3588

It should be better to use "TARGET_GENBOOK_CM5_RK3588" instead, to leave room for support for any possible future SoMs that might be made available for the GenBook at some point.

arch/arm/mach-rockchip/rk3588/Kconfig config TARGET_EVB_RK3588 · line 13

Quoted 4 lines
arch/arm/mach-rockchip/rk3588/Kconfig +4 -0
+	bool "Cool Pi GenBook"
+	select BOARD_LATE_INIT
+	help
+	  GeenBook is a notebook based on Rockchip RK3588.

It should be mentioned that it actually uses CM5 SoM.

arch/arm/mach-rockchip/rk3588/Kconfig source "board/rockchip/evb_rk3588/Kconfig" · line 332

Quoted 9 lines
arch/arm/mach-rockchip/rk3588/Kconfig +2 -0
+
 config TARGET_JAGUAR_RK3588
 	bool "Theobroma Systems SBC-RK3588-AMR (Jaguar)"
 	select BOARD_LATE_INIT
@@ -323,5 +329,6 @@ source "board/rockchip/evb_rk3588/Kconfig"
 source "board/rockchip/toybrick_rk3588/Kconfig"
 source "board/theobroma-systems/jaguar_rk3588/Kconfig"
 source "board/theobroma-systems/tiger_rk3588/Kconfig"
+source "board/coolpi/genbook/Kconfig"

It should be better to use "genbook_cm5_rk3588" as the directory name, for the same reasons as in my previous comment, and to include the SoC name in it as well.

Quoted 8 lines
arch/arm/mach-rockchip/rk3588/Kconfig +0 -0
 endif
board/coolpi/genbook/Kconfig new file +0 -0
new file mode 100644
index 00000000000..48a340d79c5

board/coolpi/genbook/Kconfig line 10

Quoted 10 lines
board/coolpi/genbook/Kconfig new file +10 -0
@@ -0,0 +1,12 @@
+if TARGET_GENBOOK_RK3588
+
+config SYS_BOARD
+	default "genbook"
+
+config SYS_VENDOR
+	default "coolpi"
+
+config SYS_CONFIG_NAME
+	default "genbook-rk3588"

It should be better to use "genboook-cm5-rk3588" instead, for the same reasons as in my other comments above.

board/coolpi/genbook/README

Quoted 20 lines
board/coolpi/genbook/Kconfig new file +2 -0
+
+endif
board/coolpi/genbook/MAINTAINERS new file +7 -0
new file mode 100644
index 00000000000..45c2ddc5fa1
@@ -0,0 +1,7 @@
+GENBOOK-RK3588
+M:	andyshrk <[email protected]>
+S:	Maintained
+F:	board/coolpi/genbook
+F:	include/configs/genbook-rk3588.h
+F:	configs/coolpi-genbook-rk3588_defconfig
+F:	arch/arm/dts/rk3588-coolpi-cm5-genbook-u-boot.dtsi
board/coolpi/genbook/README new file +0 -0
new file mode 100644
index 00000000000..ba165953154

My earlier comment on "genbook_cm5_rk3588" as the directory name applies here as well, obviously.

configs/coolpi-genbook-rk3588_defconfig

Quoted 29 lines
board/coolpi/genbook/README new file +5 -0
@@ -0,0 +1,23 @@
+Compile the U-Boot
+==================
+
+  > cd u-boot
+  > export

ROCKCHIP_TPL=../rkbin/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.17.bin

board/coolpi/genbook/README new file +5 -0
+  > export BL31=../rkbin/bin/rk35/rk3588_bl31_v1.46.elf
+  > make coolpi-genbook-rk3588_defconfig
+  > make CROSS_COMPILE=aarch64-linux-gnu-
+
+  Get u-boot-rockchip.bin for eMMC and u-boot-rockchip-spi.bin for SPI 

Nor.

board/coolpi/genbook/README new file +3 -0
+
+
+Write u-boot to eMMC or SPI Nor if you have a bootable linux system

on the computer:

board/coolpi/genbook/README new file +10 -0
+
+Flash the image to eMMC
+==========================
+  > dd if=u-boot-rockchip.bin of=/dev/mmcblk0 bs=512 seek=64
+
+Flash the image to SPI Nor
+==========================
+ > dd if=u-boot-rockchip-spi.bin of=/dev/mtdblock0
+
+Note: The boot priority of SPI Nor is higher than that of eMMC
configs/coolpi-genbook-rk3588_defconfig +0 -0

It should be "coolpi-genbook-cm5-rk3588_defconfig" instead, as already described why above.

configs/coolpi-genbook-rk3588_defconfig

Quoted 4 lines

new file mode 100644
index 00000000000..ae6c6c296cc

configs/coolpi-genbook-rk3588_defconfig new file +0 -0

It should be better to use "coolpi-genbook-cm5-rk3588_defconfig" instead, as already described above.

dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts

Quoted 113 lines
configs/coolpi-genbook-rk3588_defconfig new file +49 -0
@@ -0,0 +1,104 @@
+CONFIG_ARM=y
+CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_SF_DEFAULT_SPEED=24000000
+CONFIG_SF_DEFAULT_MODE=0x2000
+CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588-coolpi-cm5-genbook"
+CONFIG_ROCKCHIP_RK3588=y
+CONFIG_ROCKCHIP_SPI_IMAGE=y
+CONFIG_SPL_SERIAL=y
+CONFIG_TARGET_GENBOOK_RK3588=y
+CONFIG_DEBUG_UART_BASE=0xFEB50000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI=y
+CONFIG_SYS_LOAD_ADDR=0xc00800
+CONFIG_PCI=y
+CONFIG_DEBUG_UART=y
+CONFIG_AHCI=y
+# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_SPL_FIT_SIGNATURE=y
+CONFIG_SPL_LOAD_FIT=y
+CONFIG_LEGACY_IMAGE_FORMAT=y
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-coolpi-cm5-genbook.dtb"
+# CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_SPL_MAX_SIZE=0x40000
+CONFIG_SPL_PAD_TO=0x7f8000
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+CONFIG_SPL_SPI_LOAD=y
+CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000
+CONFIG_SPL_ATF=y
+# CONFIG_CMD_BIND is not set
+# CONFIG_CMD_FASTBOOT is not set
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_PCI=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_REGULATOR=y
+# CONFIG_SPL_DOS_PARTITION is not set
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_OF_LIVE=y
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent

assigned-clocks assigned-clock-rates assigned-clock-parents"

configs/coolpi-genbook-rk3588_defconfig new file +55 -0
+CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SPL_REGMAP=y
+CONFIG_SPL_SYSCON=y
+CONFIG_AHCI_PCI=y
+CONFIG_DWC_AHCI=y
+CONFIG_SPL_CLK=y
+CONFIG_FASTBOOT_BUF_ADDR=0x800800
+CONFIG_ROCKCHIP_GPIO=y
+CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_MMC_IO_VOLTAGE=y
+CONFIG_SPL_MMC_IO_VOLTAGE=y
+CONFIG_MMC_UHS_SUPPORT=y
+CONFIG_SPL_MMC_UHS_SUPPORT=y
+CONFIG_MMC_HS400_ES_SUPPORT=y
+CONFIG_SPL_MMC_HS400_ES_SUPPORT=y
+CONFIG_MMC_HS400_SUPPORT=y
+CONFIG_SPL_MMC_HS400_SUPPORT=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_SDMA=y
+CONFIG_MMC_SDHCI_ROCKCHIP=y
+CONFIG_SF_DEFAULT_BUS=5
+CONFIG_SPI_FLASH_SFDP_SUPPORT=y
+CONFIG_SPI_FLASH_XMC=y
+CONFIG_SPI_FLASH_XTX=y
+CONFIG_PHY_MOTORCOMM=y
+CONFIG_DWC_ETH_QOS=y
+CONFIG_DWC_ETH_QOS_ROCKCHIP=y
+CONFIG_NVME_PCI=y
+CONFIG_PCIE_DW_ROCKCHIP=y
+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
+CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
+CONFIG_PHY_ROCKCHIP_USBDP=y
+CONFIG_SPL_PINCTRL=y
+CONFIG_PWM_ROCKCHIP=y
+CONFIG_SPL_RAM=y
+CONFIG_SCSI=y
+CONFIG_BAUDRATE=1500000
+CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
+CONFIG_ROCKCHIP_SFC=y
+CONFIG_SYSRESET=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_GENERIC=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_GENERIC=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GENERIC=y
+CONFIG_USB_GADGET=y
+CONFIG_ERRNO_STR=y

diff --git a/dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts b/dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts new file mode 100644
index 00000000000..6418286efe4

dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts new file +0 -0

I believe this should be turned into a separate commit, as a cherry-pick of an upstream DT commit.

include/configs/genbook-rk3588.h

Quoted 353 lines
dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts new file +14 -0
@@ -0,0 +1,349 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2024 Rockchip Electronics Co., Ltd.
+ *
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/leds/common.h>
+#include "rk3588-coolpi-cm5.dtsi"
+
+/ {
+	model = "CoolPi CM5 GenBook";
+	compatible = "coolpi,pi-cm5-genbook", "coolpi,pi-cm5", 

"rockchip,rk3588";

dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts new file +174 -0
+
+	backlight: backlight {
+		compatible = "pwm-backlight";
+		enable-gpios = <&gpio4 RK_PA3 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&bl_en>;
+		power-supply = <&vcc12v_dcin>;
+		pwms = <&pwm6 0 25000 0>;
+	};
+
+	battery: battery {
+		compatible = "simple-battery";
+		charge-full-design-microamp-hours = <9800000>;
+		voltage-max-design-microvolt = <4350000>;
+		voltage-min-design-microvolt = <3000000>;
+	};
+
+	charger: dc-charger {
+		compatible = "gpio-charger";
+		charger-type = "mains";
+		gpios = <&gpio1 RK_PC0 GPIO_ACTIVE_LOW>;
+	};
+
+	leds: leds {
+		compatible = "gpio-leds";
+
+		heartbeat_led: led-0 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_STATUS;
+			gpios = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "heartbeat";
+		};
+
+		wlan_led: led-1 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_WLAN;
+			gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
+		};
+
+		charging_red: led-2 {
+			function = LED_FUNCTION_CHARGING;
+			color = <LED_COLOR_ID_RED>;
+			gpios = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>;
+		};
+	};
+
+	vcc12v_dcin: vcc12v-dcin-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc12v_dcin";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <12000000>;
+		regulator-max-microvolt = <12000000>;
+	};
+
+	vcc_sys: vcc-sys-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc_sys";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <7000000>;
+		regulator-max-microvolt = <7000000>;
+		vin-supply = <&vcc12v_dcin>;
+	};
+
+	vcc5v0_sys: vcc5v0-sys-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc5v0_sys";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <7000000>;
+		regulator-max-microvolt = <7000000>;
+		vin-supply = <&vcc_sys>;
+	};
+
+	vcc3v3_sys: vcc3v3-sys-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc3v3_sys";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		vin-supply = <&vcc5v0_sys>;
+	};
+
+	vcc3v3_lcd: vcc3v3-lcd-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc3v3_lcd";
+		enable-active-high;
+		gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&lcdpwr_en>;
+		vin-supply = <&vcc3v3_sys>;
+	};
+
+	vcc5v0_usb: vcc5v0-usb-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc5v0_usb";
+		regulator-boot-on;
+		regulator-always-on;
+		enable-active-high;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&usb_pwren>;
+		vin-supply = <&vcc_sys>;
+	};
+
+	vcc5v0_usb_host0: vcc5v0_usb30_host: vcc5v0-usb-host-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc5v0_host";
+		regulator-boot-on;
+		regulator-always-on;
+		enable-active-high;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		gpio = <&gpio1 RK_PA7 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&usb_host_pwren>;
+		vin-supply = <&vcc5v0_usb>;
+	};
+};
+
+&i2c4 {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c4m3_xfer>;
+
+	cw2015@62 {
+		compatible = "cellwise,cw2015";
+		reg = <0x62>;
+
+		cellwise,battery-profile = /bits/ 8 <
+			0x17 0x67 0x69 0x63 0x63 0x62 0x62 0x5F
+			0x52 0x73 0x4C 0x5A 0x5B 0x4B 0x42 0x3A
+			0x33 0x2D 0x29 0x28 0x2E 0x31 0x3C 0x49
+			0x2C 0x2C 0x0C 0xCD 0x30 0x51 0x50 0x66
+			0x74 0x74 0x75 0x78 0x41 0x1B 0x84 0x5F
+			0x0B 0x34 0x1C 0x45 0x89 0x92 0xA0 0x13
+			0x2C 0x55 0xAB 0xCB 0x80 0x5E 0x7B 0xCB
+			0x2F 0x00 0x64 0xA5 0xB5 0x10 0x18 0x21
+			>;
+
+		cellwise,monitor-interval-ms = <3000>;
+		monitored-battery = <&battery>;
+		power-supplies = <&charger>;
+	};
+};
+
+&i2c5 {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c5m3_xfer>;
+
+	touchpad: touchpad@2c {
+		compatible = "hid-over-i2c";
+		reg = <0x2c>;
+		interrupt-parent = <&gpio1>;
+		interrupts = <RK_PD6 IRQ_TYPE_LEVEL_LOW>;
+		hid-descr-addr = <0x0020>;
+	};
+};
+
+&gmac0 {
+	status = "disabled";
+};
+
+/* M.2 E-Key */
+&pcie2x1l0 {
+	reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
+	vpcie3v3-supply = <&vcc3v3_sys>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pcie_clkreq &pcie_wake &pcie_rst &wifi_pwron 

&bt_pwron>;

dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts new file +161 -0
+	status = "okay";
+};
+
+&pcie2x1l2 {
+	status = "disabled";
+};
+
+&pcie30phy {
+	status = "okay";
+};
+
+/* M.2 M-Key ssd */
+&pcie3x4 {
+	reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
+	vpcie3v3-supply = <&vcc3v3_sys>;
+	status = "okay";
+};
+
+&pinctrl {
+	lcd {
+		lcdpwr_en: lcdpwr-en {
+			rockchip,pins = <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_down>;
+		};
+
+		bl_en: bl-en {
+			rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	usb {
+		usb_pwren: usb-pwren {
+			rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
+		usb_otg_pwren: usb-otg-pwren {
+			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
+		usb_host_pwren: usb-host-pwren {
+			rockchip,pins = <1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
+	wifi {
+		bt_pwron: bt-pwron {
+			rockchip,pins = <3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
+		pcie_clkreq: pcie-clkreq {
+			rockchip,pins = <4 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
+		pcie_rst: pcie-rst {
+			rockchip,pins = <4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
+		wifi_pwron: wifi-pwron {
+			rockchip,pins = <3 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
+		pcie_wake: pcie-wake {
+			rockchip,pins = <4 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+};
+
+&pwm6 {
+	pinctrl-0 = <&pwm6m1_pins>;
+	status = "okay";
+};
+
+&sdmmc {
+	status = "disabled";
+};
+
+&sfc {
+	pinctrl-names = "default";
+	pinctrl-0 = <&fspim2_pins>;
+	status = "okay";
+
+	flash@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0x0>;
+		spi-max-frequency = <100000000>;
+		spi-rx-bus-width = <4>;
+		spi-tx-bus-width = <1>;
+	};
+};
+
+&u2phy0 {
+	status = "okay";
+};
+
+&u2phy0_otg {
+	status = "okay";
+};
+
+&usbdp_phy0 {
+	status = "okay";
+};
+
+&u2phy1 {
+	status = "okay";
+};
+
+&u2phy1_otg {
+	status = "okay";
+};
+
+&u2phy2 {
+	status = "okay";
+};
+
+&u2phy3 {
+	status = "okay";
+};
+
+&u2phy2_host {
+	phy-supply = <&vcc5v0_usb_host0>;
+	status = "okay";
+};
+
+&u2phy3_host {
+	phy-supply = <&vcc5v0_usb>;
+	status = "okay";
+};
+
+&usbdp_phy1 {
+	status = "okay";
+};
+
+/* For Keypad */
+&usb_host0_ehci {
+	status = "okay";
+};
+
+&usb_host0_ohci {
+	status = "okay";
+};
+
+/* Type C port */
+&usb_host0_xhci {
+	dr_mode = "peripheral";
+	maximum-speed = "high-speed";
+	status = "okay";
+};
+
+/* connected to a HUB for camera and BT */
+&usb_host1_ehci {
+	status = "okay";
+};
+
+&usb_host1_ohci {
+	status = "okay";
+};
+
+/* USB A out */
+&usb_host1_xhci {
+	dr_mode = "host";
+	status = "okay";
+};
include/configs/genbook-rk3588.h +0 -0

As already described why above, it should be better to use "genbook-cm5-rk3588.h" instead.

include/configs/genbook-rk3588.h line 6

Quoted 11 lines

new file mode 100644
index 00000000000..5c5957b8bf5

include/configs/genbook-rk3588.h new file +6 -0
@@ -0,0 +1,28 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ */
+
+#ifndef __ROCK5B_RK3588_H
+#define __ROCK5B_RK3588_H

Obviously, it should be "__GENBOOK_CM5_RK3588_H" instead.

Quoted 12 lines
include/configs/genbook-rk3588.h new file +12 -0
+
+#define ROCKCHIP_DEVICE_SETTINGS \
+		"stdout=serial,vidconsole\0" \
+		"stderr=serial,vidconsole\0"
+
+#include <configs/rk3588_common.h>
+
+#undef CFG_EXTRA_ENV_SETTINGS
+
+/*
+ * As a laptop, there is no sdmmc, and we
+ * want to set usb the highest boot priority

include/configs/genbook-rk3588.h line 28

Quoted 10 lines
include/configs/genbook-rk3588.h new file +10 -0
+ * for third-part os installation.
+ */
+#define CFG_EXTRA_ENV_SETTINGS \
+	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
+	"partitions=" PARTS_DEFAULT		\
+	ENV_MEM_LAYOUT_SETTINGS			\
+	ROCKCHIP_DEVICE_SETTINGS \
+	"boot_targets=" "usb mmc0" "\0"
+
+#endif /* __GENBOOK_RK3588_H */

Pleas see the comment above.

author
#3 lore raw

Re:Re: [PATCH 1/1] board: rockchip: Add support for rk3588 GenBook

Hello Dragan,

Quoted 18 lines · Dragan Simic

Hello Andy,

Please see a few comments below.

Quoted 12 lines · Andy Yan

Add support for Cool Pi GenBook.

Specification:
- Rockchip RK3588
- LPDDR5X 8/32 GB
- eMMC 64 GB
- HDMI Type A out x 1
- USB 3.0 Host x 1
- USB-C 3.0 with DisplayPort AltMode
- PCIE M.2 E Key for RTL8852BE Wireless connection
- PCIE M.2 M Key for NVME connection
- eDP panel with 1920x1080

Quoted 1 line

It should be mentioned that it actually uses CM5 SoM.

Okay,will do in v2

Quoted 112 lines
Quoted 112 lines

Test by a Armbian boot on USB disk.

---

 .../dts/rk3588-coolpi-cm5-genbook-u-boot.dtsi |  70 ++++
 arch/arm/mach-rockchip/rk3588/Kconfig         |   7 +
 board/coolpi/genbook/Kconfig                  |  12 +
 board/coolpi/genbook/MAINTAINERS              |   7 +
 board/coolpi/genbook/README                   |  23 ++
 configs/coolpi-genbook-rk3588_defconfig       | 104 ++++++
 .../rockchip/rk3588-coolpi-cm5-genbook.dts    | 349 ++++++++++++++++++
 include/configs/genbook-rk3588.h              |  28 ++
 8 files changed, 600 insertions(+)
 create mode 100644 arch/arm/dts/rk3588-coolpi-cm5-genbook-u-boot.dtsi
 create mode 100644 board/coolpi/genbook/Kconfig
 create mode 100644 board/coolpi/genbook/MAINTAINERS
 create mode 100644 board/coolpi/genbook/README
 create mode 100644 configs/coolpi-genbook-rk3588_defconfig
 create mode 100644
dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts
 create mode 100644 include/configs/genbook-rk3588.h
arch/arm/dts/rk3588-coolpi-cm5-genbook-u-boot.dtsi new file +70 -0
new file mode 100644
index 00000000000..5835bd4352b
@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+#include "rk3588-u-boot.dtsi"
+
+&fspim2_pins {
+	bootph-pre-ram;
+	bootph-some-ram;
+};
+
+&sdhci {
+	cap-mmc-highspeed;
+	mmc-hs200-1_8v;
+};
+
+&sfc {
+	pinctrl-names = "default";
+	pinctrl-0 = <&fspim2_pins>;
+	status = "okay";
+
+	flash@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		bootph-pre-ram;
+		bootph-some-ram;
+		spi-max-frequency = <24000000>;
+		spi-rx-bus-width = <4>;
+		spi-tx-bus-width = <1>;
+	};
+};
+
+&u2phy0 {
+	status = "okay";
+};
+
+&u2phy0_otg {
+	status = "okay";
+};
+
+&usbdp_phy0 {
+	status = "okay";
+};
+
+/* For Keypad */
+&usb_host0_ehci {
+	status = "disabled";
+};
+
+&usb_host0_ohci {
+	status = "disabled";
+};
+
+&usb_host0_xhci {
+	dr_mode = "peripheral";
+	maximum-speed = "high-speed";
+	status = "okay";
+};
+
+/* connected to a HUB for camera and BT */
+&usb_host1_ehci {
+	status = "disabled";
+};
+
+&usb_host1_ohci {
+	status = "disabled";
+};
+
+/* USB A out */
+&usb_host1_xhci {
+	snps,dis_u3_susphy_quirk;
+};
arch/arm/mach-rockchip/rk3588/Kconfig +0 -0
index e751d64e1a1..dc53d559ed9 100644
@@ -6,6 +6,12 @@ config TARGET_EVB_RK3588
 	help
 	  RK3588 EVB is a evaluation board for Rockchp RK3588.
 
Quoted 3 lines

arch/arm/mach-rockchip/rk3588/Kconfig config TARGET_EVB_RK3588 · line 9

Quoted 1 line
arch/arm/mach-rockchip/rk3588/Kconfig +1 -0
+config TARGET_GENBOOK_RK3588

It should be better to use "TARGET_GENBOOK_CM5_RK3588" instead,

Considering the name of dts is rk3588-coolpi-cm5-genbook.dts , should we use TARGET_CM5_GENBOOK_RK3588 instead of TARGET_GENBOOK_CM5_RK3588 here ?

Quoted 3 lines

to leave room for support for any possible future SoMs that might be made available for the GenBook at some point.

#4 lore raw

Re: [PATCH 1/1] board: rockchip: Add support for rk3588 GenBook

Quoted 19 lines · Andy Yan
Quoted 18 lines · Dragan Simic

Hello Andy,

Please see a few comments below.

Quoted 12 lines · Andy Yan

Add support for Cool Pi GenBook.

Specification:
- Rockchip RK3588
- LPDDR5X 8/32 GB
- eMMC 64 GB
- HDMI Type A out x 1
- USB 3.0 Host x 1
- USB-C 3.0 with DisplayPort AltMode
- PCIE M.2 E Key for RTL8852BE Wireless connection
- PCIE M.2 M Key for NVME connection
- eDP panel with 1920x1080

Quoted 3 lines
Quoted 1 line

It should be mentioned that it actually uses CM5 SoM.

Okay,will do in v2

Great, thanks.

[snip]

Quoted 15 lines
Quoted 9 lines
Quoted 9 lines
arch/arm/mach-rockchip/rk3588/Kconfig +0 -0
index e751d64e1a1..dc53d559ed9 100644
@@ -6,6 +6,12 @@ config TARGET_EVB_RK3588
 	help
 	  RK3588 EVB is a evaluation board for Rockchp RK3588.
 
Quoted 5 lines

arch/arm/mach-rockchip/rk3588/Kconfig config TARGET_EVB_RK3588 · line 9

Quoted 1 line
arch/arm/mach-rockchip/rk3588/Kconfig +1 -0
+config TARGET_GENBOOK_RK3588

It should be better to use "TARGET_GENBOOK_CM5_RK3588" instead, to leave room for support for any possible future SoMs that might be made available for the GenBook at some point.

Quoted 3 lines

Considering the name of dts is rk3588-coolpi-cm5-genbook.dts , should we use TARGET_CM5_GENBOOK_RK3588 instead of TARGET_GENBOOK_CM5_RK3588 here ?

That's a good question, and I already asked myself the same, before sending over my comments. It's all about the way U-Boot names the things internally, i.e. we've got it like "<carrier_board>-<SoM>-<SoC>" this time, meaning that the "dependency graph" seemingly gets usually represented that way in U-Boot.

#5 lore raw

Re: [PATCH 1/1] board: rockchip: Add support for rk3588 GenBook

In reply to Dragan Simic

Hi Andy,

Quoted 6 lines
Quoted 5 lines
(quoted diff) +0 -0
@@ -323,5 +329,6 @@ source "board/rockchip/evb_rk3588/Kconfig"

 source "board/rockchip/toybrick_rk3588/Kconfig" source "board/theobroma-systems/jaguar_rk3588/Kconfig" source "board/theobroma-systems/tiger_rk3588/Kconfig" +source "board/coolpi/genbook/Kconfig"

Order alphabetically here.

Quoted 6 lines

board/coolpi/genbook/README

Quoted 5 lines
board/coolpi/genbook/README new file +0 -0
new file mode 100644
index 00000000000..ba165953154

We've moved the READMEs to doc/board/ so please do this as well.

You may only want to add your board to doc/board/rockchip/rockchip.rst if the instructions in that file are good enough for you. Consider extending the content if it doesn't, and if it's too much work, then creating your own readme in doc/board/ similar to how Theobroma Systems boards are documented would do just fine.

Note that those are in reStructuredText format (rST/Sphinx).

Quoted 11 lines

dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts

Quoted 7 lines

diff --git a/dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts b/dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts new file mode 100644
index 00000000000..6418286efe4

dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts new file +0 -0

I believe this should be turned into a separate commit, as a cherry-pick of an upstream DT commit.

Yes, as a hint, you should be using tools/update-subtree.sh pick dts <commit> as documented here: https://docs.u-boot.org/en/latest/develop/devicetree/control.html#resyncing-with-devicetree-rebasing

You may need to pick more than one commit, that is fine.

The commit id comes from https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git/.

Cheers,
Quentin

author
#6 lore raw

Re:Re: [PATCH 1/1] board: rockchip: Add support for rk3588 GenBook

Hi Quetin,

Quoted 40 lines · 在 2024-08-12 16:23:06,"Quentin Schulz" <[email protected]> 写道:

Hi Andy,

Quoted 6 lines
Quoted 5 lines
(quoted diff) +0 -0
@@ -323,5 +329,6 @@ source "board/rockchip/evb_rk3588/Kconfig"

 source "board/rockchip/toybrick_rk3588/Kconfig" source "board/theobroma-systems/jaguar_rk3588/Kconfig" source "board/theobroma-systems/tiger_rk3588/Kconfig" +source "board/coolpi/genbook/Kconfig"

Order alphabetically here.

Quoted 6 lines

board/coolpi/genbook/README

Quoted 5 lines
board/coolpi/genbook/README new file +0 -0
new file mode 100644
index 00000000000..ba165953154

We've moved the READMEs to doc/board/ so please do this as well.

You may only want to add your board to doc/board/rockchip/rockchip.rst if the instructions in that file are good enough for you. Consider extending the content if it doesn't, and if it's too much work, then creating your own readme in doc/board/ similar to how Theobroma Systems boards are documented would do just fine.

Note that those are in reStructuredText format (rST/Sphinx).

Quoted 11 lines

dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts

Quoted 7 lines

diff --git a/dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts b/dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts new file mode 100644
index 00000000000..6418286efe4

dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts new file +0 -0

I believe this should be turned into a separate commit, as a cherry-pick of an upstream DT commit.

Quoted 8 lines

Yes, as a hint, you should be using tools/update-subtree.sh pick dts <commit> as documented here:
https://docs.u-boot.org/en/latest/develop/devicetree/control.html#resyncing-with-devicetree-rebasing

You may need to pick more than one commit, that is fine.

The commit id comes from
https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git/.

The dts just landing linux-rockchip a few days agao,so it's not in the devicetree-rebasing repo, Does that mean I should wait before it landing devicetree-rebasing repo ?

Quoted 4 lines

Cheers,
Quentin

#7 lore raw

Re: [PATCH 1/1] board: rockchip: Add support for rk3588 GenBook

Hi Andy,

Quoted 48 lines · Andy Yan

Hi Quetin,

Quoted 44 lines · 在 2024-08-12 16:23:06,"Quentin Schulz" <[email protected]> 写道:

Hi Andy,

Quoted 6 lines

arch/arm/mach-rockchip/rk3588/Kconfig source "board/rockchip/evb_rk3588/Kconfig" · line 332

Quoted 5 lines
arch/arm/mach-rockchip/rk3588/Kconfig +1 -0
@@ -323,5 +329,6 @@ source "board/rockchip/evb_rk3588/Kconfig"
  source "board/rockchip/toybrick_rk3588/Kconfig"
  source "board/theobroma-systems/jaguar_rk3588/Kconfig"
  source "board/theobroma-systems/tiger_rk3588/Kconfig"
+source "board/coolpi/genbook/Kconfig"

Order alphabetically here.

Quoted 6 lines

board/coolpi/genbook/README

Quoted 5 lines
board/coolpi/genbook/README new file +0 -0
new file mode 100644
index 00000000000..ba165953154

We've moved the READMEs to doc/board/ so please do this as well.

You may only want to add your board to doc/board/rockchip/rockchip.rst if the instructions in that file are good enough for you. Consider extending the content if it doesn't, and if it's too much work, then creating your own readme in doc/board/ similar to how Theobroma Systems boards are documented would do just fine.

Note that those are in reStructuredText format (rST/Sphinx).

Quoted 11 lines

dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts

Quoted 7 lines

diff --git a/dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts b/dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts new file mode 100644
index 00000000000..6418286efe4

dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts new file +0 -0

I believe this should be turned into a separate commit, as a cherry-pick of an upstream DT commit.

Yes, as a hint, you should be using tools/update-subtree.sh pick dts <commit> as documented here:
https://docs.u-boot.org/en/latest/develop/devicetree/control.html#resyncing-with-devicetree-rebasing

Quoted 8 lines
Quoted 4 lines

You may need to pick more than one commit, that is fine.

The commit id comes from
https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git/.

The dts just landing linux-rockchip a few days agao,so it's not in the devicetree-rebasing repo, Does that mean I should wait before it landing devicetree-rebasing repo ?

Unfortunately, I believe this is the policy we have right now yes. For sure we do not allow to manually modify anything in dts/ directory, so the other option would be to have it temporarily in arch/arm/dts/ instead until it's available in that repo. It depends on Kever for that (if he agrees to have this temporarily) and also if you're really "in a hurry" to get this board supported.

Cheers,
Quentin