Skip to contentSkip to conversation

Add GameForce Ace

PATCH Applied Chris Morgan 3 participants 7 messages Aug 29, 2024 – Sep 4, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v2 cover Add GameForce Ace

From: Chris Morgan <[email protected]>

Add support for the GameForce Ace. The GameForce Ace is an RK3588s based gaming device with a 1080p display, touchscreen, hall effect joysticks and triggers, 128GB of eMMC, 8GB or 12GB of RAM, WiFi 5, and support for a 2242 NVME.

Changes since V1:
- Update eMMC changes to note proper authorship.
- Removed cw2015 changes for dual cell configuration. For the moment it's just cosmetic (aside from voltage_now reading incorrectly, no other issues were observed).
- Removed USB bindings because vbus regulator isn't ready yet.

Alex Zhao (1):
arm64: dts: rockchip: rk3588s fix sdio pins to pull up

Chris Morgan (2):
dt-bindings: arm: rockchip: Add GameForce Ace
arm64: dts: rockchip: Add GameForce Ace

 .../devicetree/bindings/arm/rockchip.yaml     |    5 +
 arch/arm64/boot/dts/rockchip/Makefile         |    1 +
 .../dts/rockchip/rk3588-base-pinctrl.dtsi     |   10 +-
 .../dts/rockchip/rk3588s-gameforce-ace.dts    | 1237 +++++++++++++++++
 4 files changed, 1248 insertions(+), 5 deletions(-)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts
Signature · 1 line
2.34.1
#1 lore raw

PATCH v2 1/3 arm64: dts: rockchip: rk3588s fix sdio pins to pull up

From: Alex Zhao <[email protected]>

The sdio requires the cmd and data pins to pull up by soc.

[adapted to pinctrl filename change]
---
 arch/arm64/boot/dts/rockchip/rk3588-base-pinctrl.dtsi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/rockchip/rk3588-base-pinctrl.dtsi +5 -5
index 30db12c4fc82..d1368418502a 100644
@@ -2449,15 +2449,15 @@ sdiom1_pins: sdiom1-pins {
 				/* sdio_clk_m1 */
 				<3 RK_PA5 2 &pcfg_pull_none>,
 				/* sdio_cmd_m1 */
-				<3 RK_PA4 2 &pcfg_pull_none>,
+				<3 RK_PA4 2 &pcfg_pull_up>,
 				/* sdio_d0_m1 */
-				<3 RK_PA0 2 &pcfg_pull_none>,
+				<3 RK_PA0 2 &pcfg_pull_up>,
 				/* sdio_d1_m1 */
-				<3 RK_PA1 2 &pcfg_pull_none>,
+				<3 RK_PA1 2 &pcfg_pull_up>,
 				/* sdio_d2_m1 */
-				<3 RK_PA2 2 &pcfg_pull_none>,
+				<3 RK_PA2 2 &pcfg_pull_up>,
 				/* sdio_d3_m1 */
-				<3 RK_PA3 2 &pcfg_pull_none>;
+				<3 RK_PA3 2 &pcfg_pull_up>;
 		};
 	};
 
Signature · 1 line
2.34.1
#2 lore raw

PATCH v2 2/3 dt-bindings: arm: rockchip: Add GameForce Ace

In reply to Chris Morgan

From: Chris Morgan <[email protected]>

Add devicetree binding for the GameForce Ace.

---
 Documentation/devicetree/bindings/arm/rockchip.yaml | 5 +++++
 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/arm/rockchip.yaml +5 -0
index 1ef09fbfdfaf..a5a2621404ae 100644
@@ -255,6 +255,11 @@ properties:
           - const: friendlyarm,cm3588
           - const: rockchip,rk3588
 
+      - description: GameForce Ace
+        items:
+          - const: gameforce,ace
+          - const: rockchip,rk3588s
+
       - description: GameForce Chi
         items:
           - const: gameforce,chi
Signature · 1 line
2.34.1
#3 lore raw

PATCH v2 3/3 arm64: dts: rockchip: Add GameForce Ace

In reply to Chris Morgan

From: Chris Morgan <[email protected]>

The GameForce Ace is a portable gaming device based on the Rockchip RK3588s SoC.

The device contains the following hardware that is tested/working:
- 128GB eMMC
- SDMMC card slot
- Ampak SDIO WiFi 5/BT
- NVME 2242 socket
- 8 or 12GB of RAM
- Goodix based touchscreen
- Stereo speakers, internal microphone, and TRRS headphone jack.
- Dual GPIO vibrators (implemented as gpio-pwm because they are quite strong)
- Multiple face buttons, dual analog joysticks, and dual analog triggers
- PWM fan with tach pin.

The device also contains the following hardware that is partially or currently not working:
- 1920x1080 DSI display
- HDMI port
- USB-C port with DP alt-mode
- TI bq25703 charger controller

---
 arch/arm64/boot/dts/rockchip/Makefile         |    1 +
 .../dts/rockchip/rk3588s-gameforce-ace.dts    | 1237 +++++++++++++++++
 2 files changed, 1238 insertions(+)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts
arch/arm64/boot/dts/rockchip/Makefile +1 -0
index fda1b980eb4b..62c3e53d24b4 100644
@@ -139,6 +139,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-tiger-haikou.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-toybrick-x0.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-turing-rk1.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-coolpi-4b.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-gameforce-ace.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-indiedroid-nova.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-khadas-edge2.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-nanopi-r6s.dtb
arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts new file +1237 -0

1,237 lines not on this page · raw message

Signature · 1 line
2.34.1
#4 lore raw
In reply to Chris Morgan
Quoted 28 lines · Chris Morgan

From: Chris Morgan <[email protected]>

Add support for the GameForce Ace. The GameForce Ace is an RK3588s based gaming device with a 1080p display, touchscreen, hall effect joysticks and triggers, 128GB of eMMC, 8GB or 12GB of RAM, WiFi 5, and support for a 2242 NVME.

Changes since V1:
- Update eMMC changes to note proper authorship.
- Removed cw2015 changes for dual cell configuration. For the moment it's just cosmetic (aside from voltage_now reading incorrectly, no other issues were observed).
- Removed USB bindings because vbus regulator isn't ready yet.

Alex Zhao (1):
arm64: dts: rockchip: rk3588s fix sdio pins to pull up

Chris Morgan (2):
dt-bindings: arm: rockchip: Add GameForce Ace
arm64: dts: rockchip: Add GameForce Ace

 .../devicetree/bindings/arm/rockchip.yaml     |    5 +
 arch/arm64/boot/dts/rockchip/Makefile         |    1 +
 .../dts/rockchip/rk3588-base-pinctrl.dtsi     |   10 +-
 .../dts/rockchip/rk3588s-gameforce-ace.dts    | 1237 +++++++++++++++++
 4 files changed, 1248 insertions(+), 5 deletions(-)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts
Quoted 5 lines

--
2.34.1

My bot found new DTB warnings on the .dts files added or changed in this series.

Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings are fixed by another series. Ultimately, it is up to the platform maintainer whether these warnings are acceptable or not. No need to reply unless the platform maintainer has comments.

If you already ran DT checks and didn't see these error(s), then make sure dt-schema is up to date:

  pip3 install dtschema --upgrade

New warnings running 'make CHECK_DTBS=y rockchip/rk3588s-gameforce-ace.dtb' for [email protected]:

arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dtb: video-codec@fdb50000: compatible: 'oneOf' conditional failed, one must be fixed:
['rockchip,rk3588-vpu121', 'rockchip,rk3568-vpu'] is too long
'rockchip,rk3588-vpu121' is not one of ['rockchip,rk3036-vpu', 'rockchip,rk3066-vpu', 'rockchip,rk3288-vpu', 'rockchip,rk3328-vpu', 'rockchip,rk3399-vpu', 'rockchip,px30-vpu', 'rockchip,rk3568-vpu', 'rockchip,rk3588-av1-vpu'] 'rockchip,rk3188-vpu' was expected
'rockchip,rk3228-vpu' was expected
'rockchip,rk3066-vpu' was expected
'rockchip,rk3399-vpu' was expected
from schema $id: http://devicetree.org/schemas/media/rockchip-vpu.yaml#
arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dtb: /video-codec@fdb50000: failed to match any schema with compatible: ['rockchip,rk3588-vpu121', 'rockchip,rk3568-vpu'] arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dtb: /video-codec@fdba0000: failed to match any schema with compatible: ['rockchip,rk3588-vepu121'] arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dtb: /video-codec@fdba4000: failed to match any schema with compatible: ['rockchip,rk3588-vepu121'] arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dtb: /video-codec@fdba8000: failed to match any schema with compatible: ['rockchip,rk3588-vepu121'] arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dtb: /video-codec@fdbac000: failed to match any schema with compatible: ['rockchip,rk3588-vepu121']

maintainer
#5 lore raw

Am Freitag, 30. August 2024, 18:33:50 CEST schrieb Rob Herring (Arm):

Quoted 53 lines · Chris Morgan
Quoted 28 lines

From: Chris Morgan <[email protected]>

Add support for the GameForce Ace. The GameForce Ace is an RK3588s based gaming device with a 1080p display, touchscreen, hall effect joysticks and triggers, 128GB of eMMC, 8GB or 12GB of RAM, WiFi 5, and support for a 2242 NVME.

Changes since V1:
- Update eMMC changes to note proper authorship.
- Removed cw2015 changes for dual cell configuration. For the moment it's just cosmetic (aside from voltage_now reading incorrectly, no other issues were observed).
- Removed USB bindings because vbus regulator isn't ready yet.

Alex Zhao (1):
arm64: dts: rockchip: rk3588s fix sdio pins to pull up

Chris Morgan (2):
dt-bindings: arm: rockchip: Add GameForce Ace
arm64: dts: rockchip: Add GameForce Ace

 .../devicetree/bindings/arm/rockchip.yaml     |    5 +
 arch/arm64/boot/dts/rockchip/Makefile         |    1 +
 .../dts/rockchip/rk3588-base-pinctrl.dtsi     |   10 +-
 .../dts/rockchip/rk3588s-gameforce-ace.dts    | 1237 +++++++++++++++++
 4 files changed, 1248 insertions(+), 5 deletions(-)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts
Quoted 5 lines

--
2.34.1

My bot found new DTB warnings on the .dts files added or changed in this series.

Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings are fixed by another series. Ultimately, it is up to the platform maintainer whether these warnings are acceptable or not. No need to reply unless the platform maintainer has comments.

If you already ran DT checks and didn't see these error(s), then make sure dt-schema is up to date:

  pip3 install dtschema --upgrade

New warnings running 'make CHECK_DTBS=y rockchip/rk3588s-gameforce-ace.dtb' for [email protected]:

Quoted 13 lines

arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dtb: video-codec@fdb50000: compatible: 'oneOf' conditional failed, one must be fixed:
['rockchip,rk3588-vpu121', 'rockchip,rk3568-vpu'] is too long
'rockchip,rk3588-vpu121' is not one of ['rockchip,rk3036-vpu', 'rockchip,rk3066-vpu', 'rockchip,rk3288-vpu', 'rockchip,rk3328-vpu', 'rockchip,rk3399-vpu', 'rockchip,px30-vpu', 'rockchip,rk3568-vpu', 'rockchip,rk3588-av1-vpu'] 'rockchip,rk3188-vpu' was expected
'rockchip,rk3228-vpu' was expected
'rockchip,rk3066-vpu' was expected
'rockchip,rk3399-vpu' was expected
from schema $id: http://devicetree.org/schemas/media/rockchip-vpu.yaml#
arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dtb: /video-codec@fdb50000: failed to match any schema with compatible: ['rockchip,rk3588-vpu121', 'rockchip,rk3568-vpu'] arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dtb: /video-codec@fdba0000: failed to match any schema with compatible: ['rockchip,rk3588-vepu121'] arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dtb: /video-codec@fdba4000: failed to match any schema with compatible: ['rockchip,rk3588-vepu121'] arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dtb: /video-codec@fdba8000: failed to match any schema with compatible: ['rockchip,rk3588-vepu121'] arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dtb: /video-codec@fdbac000: failed to match any schema with compatible: ['rockchip,rk3588-vepu121']

That is not Chris' fault ;-) .
The relevant vpu binding patches have made it to the media-tree [0], but not linux-next yet it seems.

So this should sort itself shortly I hope.

[0]
https://git.linuxtv.org/media_stage.git/commit/?id=1e490a1ea64396b98db8c233360093e264b0c10b
for ['rockchip,rk3588-vpu121', 'rockchip,rk3568-vpu']

https://git.linuxtv.org/media_stage.git/commit/?id=b92346d2dba0048bfce7114225250bef73f83ad2
for ['rockchip,rk3588-vepu121']

maintainer Applied
#6 lore raw
In reply to Chris Morgan
Quoted 8 lines · Chris Morgan

From: Chris Morgan <[email protected]>

Add support for the GameForce Ace. The GameForce Ace is an RK3588s based gaming device with a 1080p display, touchscreen, hall effect joysticks and triggers, 128GB of eMMC, 8GB or 12GB of RAM, WiFi 5, and support for a 2242 NVME.

[...]

Applied, thanks!

[1/3] arm64: dts: rockchip: rk3588s fix sdio pins to pull up

      commit: bd60cae2932cd123d867bf93bdadc4bf545fcdce
[2/3] dt-bindings: arm: rockchip: Add GameForce Ace
      commit: 3e5be1d7e7ef3dc5413e774e580f0c2d14aa6755
[3/3] arm64: dts: rockchip: Add GameForce Ace
      commit: 4e946c447a043c88b5db38501f3af174989dcc94

Best regards,

Signature · 1 line
Heiko Stuebner <[email protected]>