diff --git a/fleet/ampere.yaml b/fleet/ampere.yaml new file mode 100644 index 0000000..f492c0d --- /dev/null +++ b/fleet/ampere.yaml @@ -0,0 +1,92 @@ +# kernel-agent manifest for ampere (CoolPi GenBook / Rockchip RK3588) +# +# Status: bootstrap. ka-promote / ka-build / ka-install CLI not yet +# implemented; the canonical patch set + baseline below is the input +# for the manual flow that produces linux-ampere-fourier (same shape +# as fresnel's bootstrap reference build). +# +# Asks #2 (VP9 enablement on RK3588 rkvdec) and #3 (AV1 dec integration) +# from kernel-agent issue #6 are NOT addressed in this manifest — +# tracked separately for a follow-up sprint. + +host: ampere +arch: arm64 +soc: rockchip/rk3588 +module: coolpi-cm5 +board: coolpi-cm5-genbook +distro: archlinux-arm + +baseline: + tree: marfrit/linux-rockchip + branch: linux-rk3588-marfrit + ref: f8f3ad934433bd7e1207d9b0b37e817a692b7ee9 # 2026-05-15 tip + upstream_compat: linux-7.0-rc3 # commits sit on top of v7.0-rc3 + 18 RK3588 deltas + base_path: boltzmann:~/src/linux-rockchip # the working tree + +# Scope-tagged patch includes. Resolve to patches//.patch. +# Apply order matters: pwm15 pinctrl (soc) must precede the genbook +# pwm-fan node consumer. +includes: + - soc/rockchip/rk3588/0001-arm64-dts-rockchip-rk3588-Add-pwm15-pinctrl-entries.patch + - board/coolpi-cm5-genbook/0002-arm64-dts-rockchip-rk3588-coolpi-cm5-genbook-Add-pwm-fan.patch + - module/coolpi-cm5/0003-arm64-dts-rockchip-rk3588-coolpi-cm5-Fix-power-off-by-enabling-RK806-as-system-power-controller.patch + - board/coolpi-cm5-genbook/0004-arm64-dts-rockchip-rk3588-coolpi-cm5-genbook-Enable-speaker-output-via-audio-graph-card.patch + - board/coolpi-cm5-genbook/0005-arm64-dts-rockchip-rk3588-coolpi-cm5-genbook-Enable-USB-C-PD-charging-via-FUSB302.patch + - board/coolpi-cm5-genbook/0008-arm64-dts-rockchip-rk3588-coolpi-cm5-genbook-Add-lid-switch-and-USB3-PHY-lane-config.patch + +# Explicitly NOT included this round (tracked for later sprints): +# - VP9 enablement for RK3588 rkvdec (issue #6 ask 2). /dev/video0 only +# advertises S265 + S264 today; vainfo lists 9 profiles, target is +# 10. Requires identifying the VDPU381/383 patch chain + possible +# DTS additions. RFC-stage work, scope unclear until research lands. +# - AV1 decoder integration (issue #6 ask 3). Kernel side is fine +# (/dev/video4 advertises AV1F). Backend libva-v4l2-request-fourier +# needs iter39 for a third fd. Backend work, not kernel. +# - misc_patches/genbook/kernel/0006 (arm64 Kconfig: do not select +# HAVE_GCC_PLUGINS). Local-only build-config; not for upstream and +# possibly redundant with the linux-rk3588-marfrit branch already. +# - misc_patches/genbook/kernel/0009 (Bluetooth btrtl RTL_SEC_PROJ +# non-fatal). Different subsystem; promote under driver/bluetooth/ +# when a campaign demands. +# - misc_patches/genbook/kernel/0010 (multi-driver suspend/wakeup fix). +# Promote under soc/rockchip/rk3588/ or split per affected driver +# once the RockHard campaign decides the upstream-targeting shape. + +config: + source: /proc/config.gz on running ampere kernel (7.0.0-rc3-ARCH+, hand-managed before this bootstrap) + strategy: snapshot, fold to baseline, accept-new with rationale on diff + +package: + name: linux-ampere-fourier + versioning: "${baseline_ref}.kafr${pkgrel}" # 7.0.rc3.kafr1 etc. + install_mode: alongside + conflicts: [] + provides: [] + kernel_suffix: -ampere-fourier # /boot/firmware/Image-7.0.0-rc3-ampere-fourier + bootloader: extlinux + bootloader_path: /boot/firmware/extlinux/extlinux.conf # vfat partition on mmcblk0p1 + boot_path: /boot/firmware/ # vfat, 1.5G, ~1G free + # ampere boots from a separate FAT partition (mmcblk0p1), unlike fresnel which + # uses the root partition's /boot/. The extlinux-add hook needs to write to + # /boot/firmware/extlinux/extlinux.conf, not /boot/extlinux/. + +verify: + bar1_ssh_heartbeat: required + bar2_pkg_version: required + bar3_dtb_match: + - power-off via 'shutdown -h' actually powers down (RK806 system-power-controller wired) + - pwm15 pinctrl exposes group3-pwm15-m0..m3 entries + - audio: speakers driven via ES8316 graph (not just headphone) + bar4_per_patch_probe: opt-in + bar5_burn_in: skip # laptop, runtime not constant + +build_host: + primary: ampere # self-host, 8 cores RK3588, 32 GB RAM, native arch + secondary: boltzmann # also RK3588 32 GB, kbuild-aarch64 container surrogate + fallback: fermi # hertz LXD, ALARM aarch64 + # No distcc for kernel-agent builds — native make on the assigned host only. + # ampere is self-hosting today because boltzmann was busy with userspace + # builds when the bootstrap ran; either host can take the work. + +backup: + pre_install: hertz:/sparfuxdata/kernel-agent-backups/ampere/${replaced_version}/ diff --git a/patches/board/coolpi-cm5-genbook/0002-arm64-dts-rockchip-rk3588-coolpi-cm5-genbook-Add-pwm-fan.patch b/patches/board/coolpi-cm5-genbook/0002-arm64-dts-rockchip-rk3588-coolpi-cm5-genbook-Add-pwm-fan.patch new file mode 100644 index 0000000..390a60a --- /dev/null +++ b/patches/board/coolpi-cm5-genbook/0002-arm64-dts-rockchip-rk3588-coolpi-cm5-genbook-Add-pwm-fan.patch @@ -0,0 +1,70 @@ +From: Markus Fritsche +Subject: [PATCH 2/2] arm64: dts: rockchip: rk3588-coolpi-cm5-genbook: Add pwm-fan with thermal cooling + +The CoolPi CM5 GenBook has a PWM-controlled fan connected to pwm15 +(mux m3, GPIO1_D7). Add a pwm-fan node driven at 20 kHz (50000 ns +period) with six cooling levels, and wire it into the package thermal +zone with two trip points at 55 °C and 65 °C. + +Generated-by: Claude Sonnet 4.6 +Signed-off-by: Markus Fritsche +--- + 1 file changed, 43 insertions(+) + +--- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts +@@ -23,6 +23,13 @@ + pwms = <&pwm6 0 25000 0>; + }; + ++ fan: pwm-fan { ++ compatible = "pwm-fan"; ++ #cooling-cells = <2>; ++ pwms = <&pwm15 0 50000 0>; ++ cooling-levels = <1 50 100 150 200 254>; ++ }; ++ + battery: battery { + compatible = "simple-battery"; + charge-full-design-microamp-hours = <9800000>; +@@ -443,3 +450,39 @@ + remote-endpoint = <&edp1_in_vp2>; + }; + }; ++ ++&package_thermal { ++ polling-delay = <1000>; ++ ++ trips { ++ package_fan0: package-fan0 { ++ temperature = <55000>; ++ hysteresis = <2000>; ++ type = "active"; ++ }; ++ ++ package_fan1: package-fan1 { ++ temperature = <65000>; ++ hysteresis = <2000>; ++ type = "active"; ++ }; ++ }; ++ ++ cooling-maps { ++ map0 { ++ trip = <&package_fan0>; ++ cooling-device = <&fan THERMAL_NO_LIMIT 2>; ++ }; ++ ++ map1 { ++ trip = <&package_fan1>; ++ cooling-device = <&fan 3 THERMAL_NO_LIMIT>; ++ }; ++ }; ++}; ++ ++&pwm15 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pwm15m3_pins>; ++ status = "okay"; ++}; + diff --git a/patches/board/coolpi-cm5-genbook/0004-arm64-dts-rockchip-rk3588-coolpi-cm5-genbook-Enable-speaker-output-via-audio-graph-card.patch b/patches/board/coolpi-cm5-genbook/0004-arm64-dts-rockchip-rk3588-coolpi-cm5-genbook-Enable-speaker-output-via-audio-graph-card.patch new file mode 100644 index 0000000..bccaed8 --- /dev/null +++ b/patches/board/coolpi-cm5-genbook/0004-arm64-dts-rockchip-rk3588-coolpi-cm5-genbook-Enable-speaker-output-via-audio-graph-card.patch @@ -0,0 +1,104 @@ +From: Markus Fritsche +Subject: [PATCH 4/4] arm64: dts: rockchip: rk3588-coolpi-cm5-genbook: enable speaker output + +The GenBook carrier board routes the ES8316 HPOL/HPOR outputs to both a +headphone jack and an external speaker amplifier. The amplifier is +enabled by GPIO1_A6 (active-high) and headphone insertion is detected by +GPIO1_B5 (active-high, pull-up). + +Add a label to the shared analog-sound node in the CM5 DTSI so the +GenBook DTS can extend it, then override the node to: + + - add pa-gpios for the speaker amplifier enable line (GPIO1_A6) + - add hp-det-gpios for headphone jack detection (GPIO1_B5) + - extend widgets/routing to include the Speaker path through the + audio-graph-card built-in "Amplifier" DAPM output-driver widget, + which gates the pa-gpios GPIO on widget power-up/down + - add the hp-det pinctrl group for GPIO1_B5 + +The "Amplifier" DAPM widget (snd_soc_dapm_out_drv) is provided by +audio-graph-card.c and registered at card level. Its event handler +drives pa-gpios high on SND_SOC_DAPM_POST_PMU and low on +SND_SOC_DAPM_PRE_PMD, giving automatic speaker enable/disable in step +with DAPM power management. + +DAPM path for speaker output: + ES8316 AIF1RX (DAI) -> Left/Right DAC -> Left/Right Headphone Mixer + -> Left/Right Headphone Driver -> HPOL/HPOR [codec OUTPUT pins] + -> Amplifier [card OUT_DRV, fires pa-gpios] -> Speaker [SPK terminal] + +The Left/Right Headphone Mixer Left/Right DAC Switch controls, which +gate the DAC-to-mixer connections in the DAPM graph, are set on by the +UCM BootSequence in the rk3588-es8316 ALSA UCM profile and must remain +enabled for the path to be traversable. + +The HPOL/HPOR codec output pins also feed the Headphones HP widget: + + HPOL/HPOR -> Headphones [HP terminal, jack-controlled via hp-det-gpios] + +Both the Speaker and Headphones paths are active whenever a PCM stream +is running. Speaker-muting when headphones are inserted is handled at +the userspace (UCM) level via JackHWMute on the Speaker UCM device: when +PipeWire routes audio away from the Speaker sink on headphone insertion, +the absence of an active PCM consumer causes DAPM to power down the +Amplifier widget and drive GPIO1_A6 low. + +Note: full speaker output also requires a Speaker SectionDevice in the +rk3588-es8316 ALSA UCM HiFi.conf. Without it the HiFi profile's only +playback port is Headphones (jack-controlled), causing the profile to be +reported as "not available" when no headphones are inserted, and +PipeWire falls back to the pro-audio profile with no speaker sub-device. +A separate patch to alsa-ucm-conf adds the missing Speaker device. + +Generated-by: Claude Sonnet 4.6 +Signed-off-by: Markus Fritsche +--- + 2 files changed, 25 insertions(+), 1 deletion(-) + +--- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts +@@ -283,7 +283,31 @@ + status = "okay"; + }; + ++&analog_sound { ++ pa-gpios = <&gpio1 RK_PA6 GPIO_ACTIVE_HIGH>; ++ hp-det-gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&hp_det>; ++ ++ widgets = "Microphone", "Mic Jack", ++ "Headphone", "Headphones", ++ "Speaker", "Speaker"; ++ ++ routing = "MIC2", "Mic Jack", ++ "Headphones", "HPOL", ++ "Headphones", "HPOR", ++ "Amplifier", "HPOL", ++ "Amplifier", "HPOR", ++ "Speaker", "Amplifier"; ++}; ++ + &pinctrl { ++ headphone { ++ hp_det: hp-det { ++ rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>; ++ }; ++ }; ++ + lcd { + lcdpwr_en: lcdpwr-en { + rockchip,pins = <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_down>; + +--- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi +@@ -21,7 +21,7 @@ + serial2 = &uart2; + }; + +- analog-sound { ++ analog_sound: analog-sound { + compatible = "audio-graph-card"; + dais = <&i2s0_8ch_p0>; + label = "rk3588-es8316"; + diff --git a/patches/board/coolpi-cm5-genbook/0005-arm64-dts-rockchip-rk3588-coolpi-cm5-genbook-Enable-USB-C-PD-charging-via-FUSB302.patch b/patches/board/coolpi-cm5-genbook/0005-arm64-dts-rockchip-rk3588-coolpi-cm5-genbook-Enable-USB-C-PD-charging-via-FUSB302.patch new file mode 100644 index 0000000..a5d21aa --- /dev/null +++ b/patches/board/coolpi-cm5-genbook/0005-arm64-dts-rockchip-rk3588-coolpi-cm5-genbook-Enable-USB-C-PD-charging-via-FUSB302.patch @@ -0,0 +1,226 @@ +From: Markus Fritsche +Date: Tue, 24 Mar 2026 00:00:00 +0000 +Subject: [PATCH] arm64: dts: rockchip: rk3588-coolpi-cm5-genbook: add USB-C PD charging + +The GenBook carrier board exposes a USB Type-C port driven by the +RK3588 USB3OTG0 controller (usb_host0_xhci / usbdp_phy0 combo). The +port uses a Fairchild FUSB302 (I²C address 0x22, bus i2c4) for USB +Power Delivery negotiation. Hardware signals: + + GPIO0_PD5 – FUSB302 interrupt (active-low, shared with CC logic) + GPIO0_PA0 – VBUS switch enable (active-high) + +Without these changes the kernel registers usb_host0_xhci in +peripheral-only, high-speed mode, which prevents PD negotiation and +leaves the port unable to charge the battery. + +Changes: + +* Add #include for PDO_FIXED macros. + +* Add vcc5v0_otg regulator: GPIO0_PA0 active-high switch that gates + VBUS; used as vbus-supply for the FUSB302 and connected via the new + typec5v_pwren pinctrl entry. The previously defined but unreferenced + usb_otg_pwren entry (same pin, wrong pull direction) is removed. + +* Add usbc0 (FUSB302) node inside &i2c4: + - compatible "fcs,fusb302", reg 0x22 + - interrupt GPIO0_PD5 (IRQ_TYPE_LEVEL_LOW), pinctrl usbc0_int + - usb-c-connector child with: + data-role / power-role "dual", try-power-role "sink" + pd-revision 2.0 Ver 1.2 (maximum supported by FUSB302) + sink-pdos: 5 V/3 A, 9 V/3 A, 12 V/3 A, 15 V/3 A + source-pdos: 5 V/3 A + DisplayPort alt-mode (SVID 0xff01) declared for orientation + switching; three connector ports linking HS (→ usb_host0_xhci), + SS (→ usbdp_phy0) and SBU (→ usbdp_phy0) endpoints. + +* Expand &usbdp_phy0 to add mode-switch and orientation-switch + capabilities; register endpoint@0 (SS, linked to usbc0_ss) and + endpoint@1 (SBU, linked to usbc0_sbu). + +* Replace the &usb_host0_xhci override: + - remove dr_mode "peripheral" and maximum-speed "high-speed" + (the base DTSI already sets dr_mode "otg") + - add usb-role-switch and the port endpoint linked to usbc0_hs + This allows the TCPM stack to switch the controller between host + and device role as the PD contract dictates. + +* Add pinctrl group usb-typec with: + - usbc0_int: GPIO0_PD5 pull-up (FUSB302 /INT) + - typec5v_pwren: GPIO0_PA0 pull-down (VBUS switch, default off) + +DAPM / power flow: + USB-C charger → FUSB302 CC negotiation → TCPM requests VBUS → + vcc5v0_otg regulator enables GPIO0_PA0 → VBUS present on port → + DWC3 OTG detects VBUS, enters device/host mode per PD data-role. + +Generated-by: Claude Sonnet 4.6 +Signed-off-by: Markus Fritsche +--- + 1 file changed, 106 insertions(+), 6 deletions(-) + +--- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts +@@ -8,6 +8,7 @@ + + #include + #include ++#include + #include "rk3588-coolpi-cm5.dtsi" + + / { +@@ -153,6 +154,18 @@ + pinctrl-0 = <&usb_host_pwren>; + vin-supply = <&vcc5v0_usb>; + }; ++ ++ vcc5v0_otg: regulator-vcc5v0-otg { ++ compatible = "regulator-fixed"; ++ regulator-name = "vcc5v0_otg"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ enable-active-high; ++ gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&typec5v_pwren>; ++ vin-supply = <&vcc5v0_sys>; ++ }; + }; + + &edp1 { +@@ -239,6 +252,65 @@ + monitored-battery = <&battery>; + power-supplies = <&charger>; + }; ++ ++ usbc0: usb-typec@22 { ++ compatible = "fcs,fusb302"; ++ reg = <0x22>; ++ interrupt-parent = <&gpio0>; ++ interrupts = ; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&usbc0_int>; ++ vbus-supply = <&vcc5v0_otg>; ++ ++ usb_con: connector { ++ compatible = "usb-c-connector"; ++ label = "USB-C"; ++ data-role = "dual"; ++ power-role = "dual"; ++ try-power-role = "sink"; ++ op-sink-microwatt = <1000000>; ++ /* FUSB302 supports PD Rev 2.0 Ver 1.2 */ ++ pd-revision = /bits/ 8 <0x2 0x0 0x1 0x2>; ++ sink-pdos = , ++ , ++ , ++ ; ++ source-pdos = ; ++ ++ altmodes { ++ displayport { ++ svid = /bits/ 16 <0xff01>; ++ vdo = <0xffffffff>; ++ }; ++ }; ++ ++ ports { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ port@0 { ++ reg = <0>; ++ usbc0_hs: endpoint { ++ remote-endpoint = <&usb_host0_xhci_to_usbc0>; ++ }; ++ }; ++ ++ port@1 { ++ reg = <1>; ++ usbc0_ss: endpoint { ++ remote-endpoint = <&usbdp_phy0_ss>; ++ }; ++ }; ++ ++ port@2 { ++ reg = <2>; ++ usbc0_sbu: endpoint { ++ remote-endpoint = <&usbdp_phy0_sbu>; ++ }; ++ }; ++ }; ++ }; ++ }; + }; + + &i2c5 { +@@ -323,15 +395,21 @@ + 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>; + }; + }; + ++ usb-typec { ++ usbc0_int: usbc0-int { ++ rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up>; ++ }; ++ ++ typec5v_pwren: typec5v-pwren { ++ rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>; ++ }; ++ }; ++ + wifi { + bt_pwron: bt-pwron { + rockchip,pins = <3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; +@@ -387,7 +465,24 @@ + }; + + &usbdp_phy0 { ++ mode-switch; ++ orientation-switch; + status = "okay"; ++ ++ port { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ usbdp_phy0_ss: endpoint@0 { ++ reg = <0>; ++ remote-endpoint = <&usbc0_ss>; ++ }; ++ ++ usbdp_phy0_sbu: endpoint@1 { ++ reg = <1>; ++ remote-endpoint = <&usbc0_sbu>; ++ }; ++ }; + }; + + &u2phy1 { +@@ -431,9 +526,14 @@ + + /* Type C port */ + &usb_host0_xhci { +- dr_mode = "peripheral"; +- maximum-speed = "high-speed"; ++ usb-role-switch; + status = "okay"; ++ ++ port { ++ usb_host0_xhci_to_usbc0: endpoint { ++ remote-endpoint = <&usbc0_hs>; ++ }; ++ }; + }; + + /* connected to a HUB for camera and BT */ + diff --git a/patches/board/coolpi-cm5-genbook/0008-arm64-dts-rockchip-rk3588-coolpi-cm5-genbook-Add-lid-switch-and-USB3-PHY-lane-config.patch b/patches/board/coolpi-cm5-genbook/0008-arm64-dts-rockchip-rk3588-coolpi-cm5-genbook-Add-lid-switch-and-USB3-PHY-lane-config.patch new file mode 100644 index 0000000..0a253a9 --- /dev/null +++ b/patches/board/coolpi-cm5-genbook/0008-arm64-dts-rockchip-rk3588-coolpi-cm5-genbook-Add-lid-switch-and-USB3-PHY-lane-config.patch @@ -0,0 +1,94 @@ +From: Markus Fritsche +Date: Tue, 24 Mar 2026 00:00:00 +0000 +Subject: [PATCH] arm64: dts: rockchip: rk3588-coolpi-cm5-genbook: add lid switch and USB3 PHY lane config + +The GenBook laptop has two features missing from the mainline DTS: + +1. Lid switch (MH248 hall-effect sensor on GPIO0_PB0) + The lid state is reported via a gpio-keys node using SW_LID / EV_SW. + The GPIO is active-low (low = lid closed) and pulled up. + wakeup-source is set so that opening the lid can wake the system from + suspend. A sensor pinctrl group is added for the GPIO configuration. + +2. usbdp_phy1 lane mux (rockchip,dp-lane-mux = <2 3>) + The RK3588 usbdp_phy1 is a combo USB3 + DisplayPort PHY shared between + the USB3 host1 port (USB-A connector) and the DisplayPort output on the + GenBook board. Lanes 0+1 carry USB3 SuperSpeed to the USB-A socket; + lanes 2+3 are routed to the DP connector. + + Without this property the phy-rockchip-usbdp driver selects + UDPHY_MODE_USB and configures all four lanes as USB3. That conflicts + with the physical routing on this board: lanes 2+3 are not connected to + the USB-A socket, so the 4-lane USB3 training fails silently and the + USB3 host1 DWC3 controller (usb_host1_xhci) cannot enumerate devices. + + Setting rockchip,dp-lane-mux = <2 3> restricts USB3 to lanes 0+1, + matching the physical wiring, and enables correct SuperSpeed operation + on the USB-A port. + + The USB2 EHCI host1 controller (usb_host1_ehci) shares the USB power + domain with usb_host1_xhci. A stalled USB3 DWC3 probe can delay + power-domain activation in a way that prevents the EHCI hub (which + carries the integrated webcam) from being enumerated. With the correct + lane mux both controllers probe cleanly and the webcam is detected. + +Generated-by: Claude Sonnet 4.6 +Signed-off-by: Markus Fritsche +--- + + 1 file changed, 23 insertions(+) + +--- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts +@@ -8,6 +8,7 @@ + + #include + #include ++#include + #include + #include "rk3588-coolpi-cm5.dtsi" + +@@ -166,6 +167,21 @@ + pinctrl-0 = <&typec5v_pwren>; + vin-supply = <&vcc5v0_sys>; + }; ++ ++ gpio-key-lid { ++ compatible = "gpio-keys"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mh248_irq_gpio>; ++ ++ lid { ++ debounce-interval = <20>; ++ gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_LOW>; ++ label = "Lid"; ++ linux,code = ; ++ linux,input-type = ; ++ wakeup-source; ++ }; ++ }; + }; + + &edp1 { +@@ -431,6 +447,12 @@ + rockchip,pins = <4 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; ++ ++ sensor { ++ mh248_irq_gpio: mh248-irq-gpio { ++ rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>; ++ }; ++ }; + }; + + &pwm6 { +@@ -512,6 +534,7 @@ + }; + + &usbdp_phy1 { ++ rockchip,dp-lane-mux = <2 3>; + status = "okay"; + }; + + diff --git a/patches/board/coolpi-cm5-genbook/README.md b/patches/board/coolpi-cm5-genbook/README.md new file mode 100644 index 0000000..634470e --- /dev/null +++ b/patches/board/coolpi-cm5-genbook/README.md @@ -0,0 +1,33 @@ +# board/coolpi-cm5-genbook + +Patches specific to the CoolPi GenBook laptop carrier (RK3588 + +CoolPi-CM5 SoM, ARM laptop form factor). The board adds an +ES8316-routed audio path, FUSB302 USB-C-PD controller, lid switch, +USB3 phy-lane config, and a pwm-controlled fan — none of which are +in mainline upstream because the board ships outside Rockchip's +official reference designs. + +## Patches + +| File | Adds | +|---|---| +| `0002-...Add-pwm-fan.patch` | pwm15-driven thermal cooling fan node (depends on `soc/rockchip/rk3588/0001-...pwm15-pinctrl-entries.patch`) | +| `0004-...Enable-speaker-output-via-audio-graph-card.patch` | rewires the ES8316 sound graph so HPOL/HPOR also drive the laptop speakers | +| `0005-...Enable-USB-C-PD-charging-via-FUSB302.patch` | FUSB302 controller binding for USB-C PD charging | +| `0008-...Add-lid-switch-and-USB3-PHY-lane-config.patch` | lid GPIO + USB3 phy-lane config | + +Numbered 2/4/5/8 to match the upstream-series numbering Markus uses in +`misc_patches/genbook/kernel/` — gap at 0006 (an SoC-wide +`arm64/Kconfig` build-flag patch tracked elsewhere) and 0007 (skipped +in the upstream series). 0009 (Bluetooth btrtl) and 0010 (multi-driver +suspend/wakeup fix) are tracked in other scopes (driver/bluetooth, +soc/rockchip/rk3588) and will be promoted as their respective +campaigns demand. + +## Fleet eligibility + +- **ampere** (CoolPi CM5 GenBook): primary target, all 4 patches + included in `fleet/ampere.yaml`. + +No other current fleet host uses the CoolPi CM5 GenBook carrier, so +no second consumer yet. diff --git a/patches/module/coolpi-cm5/0003-arm64-dts-rockchip-rk3588-coolpi-cm5-Fix-power-off-by-enabling-RK806-as-system-power-controller.patch b/patches/module/coolpi-cm5/0003-arm64-dts-rockchip-rk3588-coolpi-cm5-Fix-power-off-by-enabling-RK806-as-system-power-controller.patch new file mode 100644 index 0000000..22593c5 --- /dev/null +++ b/patches/module/coolpi-cm5/0003-arm64-dts-rockchip-rk3588-coolpi-cm5-Fix-power-off-by-enabling-RK806-as-system-power-controller.patch @@ -0,0 +1,29 @@ +From: Markus Fritsche +Subject: [PATCH 3/3] arm64: dts: rockchip: rk3588-coolpi-cm5: fix power-off by enabling RK806 as system power controller + +Without the system-power-controller property the rk8xx-core driver never +registers its sys_off handler (rk808_power_off), which writes the DEV_OFF +bit to RK806_SYS_CFG3 at shutdown time. As a result the RK806 PMIC does +not cut power and the board remains partially active after "poweroff" — +the heartbeat LED stops but internal activity continues. + +All other mainline RK3588 boards that use the RK806 carry this property +(NanoPC-T6, Rock 5A, OrangePi 5, Jaguar, ...). Add it to the CoolPi CM5 +PMIC node to restore proper power-off behaviour. + +Generated-by: Claude Sonnet 4.6 +Signed-off-by: Markus Fritsche +--- + 1 file changed, 1 insertion(+) + +--- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi +@@ -346,6 +346,7 @@ + interrupts = <7 IRQ_TYPE_LEVEL_LOW>; + gpio-controller; + #gpio-cells = <2>; ++ system-power-controller; + pinctrl-names = "default"; + pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>, + <&rk806_dvs2_null>, <&rk806_dvs3_null>; + diff --git a/patches/module/coolpi-cm5/README.md b/patches/module/coolpi-cm5/README.md new file mode 100644 index 0000000..61581f8 --- /dev/null +++ b/patches/module/coolpi-cm5/README.md @@ -0,0 +1,15 @@ +# module/coolpi-cm5 + +Patches that target the CoolPi CM5 system-on-module (RK3588-based, +sold as a carrier-board-agnostic compute module). They apply to any +carrier board that hosts the CM5 — currently only the GenBook in our +fleet, but the scope tag exists so that a hypothetical second carrier +wouldn't have to clone the patch under `board//`. + +## Patches + +- `0003-arm64-dts-rockchip-rk3588-coolpi-cm5-Fix-power-off-by-enabling-RK806-as-system-power-controller.patch` — + marks the on-module RK806 PMIC as `system-power-controller` so the + rk8xx-core driver registers it for the `pm_power_off` hook. Without + this, `poweroff` reaches `arm_pm_restart` instead and the CM5 reboots + on shutdown. diff --git a/patches/soc/rockchip/rk3588/0001-arm64-dts-rockchip-rk3588-Add-pwm15-pinctrl-entries.patch b/patches/soc/rockchip/rk3588/0001-arm64-dts-rockchip-rk3588-Add-pwm15-pinctrl-entries.patch new file mode 100644 index 0000000..9b25109 --- /dev/null +++ b/patches/soc/rockchip/rk3588/0001-arm64-dts-rockchip-rk3588-Add-pwm15-pinctrl-entries.patch @@ -0,0 +1,52 @@ +From: Markus Fritsche +Subject: [PATCH 1/2] arm64: dts: rockchip: rk3588: Add pwm15 pinctrl entries + +Add pinctrl entries for all four mux options of the RK3588 pwm15 +controller (m0-m3) to rk3588-extra-pinctrl.dtsi, marked with +/omit-if-no-ref/ so they are only compiled in when referenced. + +Generated-by: Claude Sonnet 4.6 +Signed-off-by: Markus Fritsche +--- + 1 file changed, 30 insertions(+) + +--- a/arch/arm64/boot/dts/rockchip/rk3588-extra-pinctrl.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3588-extra-pinctrl.dtsi +@@ -342,6 +342,36 @@ + }; + }; + ++ pwm15 { ++ /omit-if-no-ref/ ++ pwm15m0_pins: pwm15m0-pins { ++ rockchip,pins = ++ /* pwm15_ir_m0 */ ++ <3 RK_PC3 11 &pcfg_pull_none>; ++ }; ++ ++ /omit-if-no-ref/ ++ pwm15m1_pins: pwm15m1-pins { ++ rockchip,pins = ++ /* pwm15_ir_m1 */ ++ <4 RK_PB3 11 &pcfg_pull_none>; ++ }; ++ ++ /omit-if-no-ref/ ++ pwm15m2_pins: pwm15m2-pins { ++ rockchip,pins = ++ /* pwm15_ir_m2 */ ++ <1 RK_PC6 11 &pcfg_pull_none>; ++ }; ++ ++ /omit-if-no-ref/ ++ pwm15m3_pins: pwm15m3-pins { ++ rockchip,pins = ++ /* pwm15_ir_m3 */ ++ <1 RK_PD7 11 &pcfg_pull_none>; ++ }; ++ }; ++ + sdio { + /omit-if-no-ref/ + sdiom0_pins: sdiom0-pins { + diff --git a/patches/soc/rockchip/rk3588/README.md b/patches/soc/rockchip/rk3588/README.md new file mode 100644 index 0000000..a0a399d --- /dev/null +++ b/patches/soc/rockchip/rk3588/README.md @@ -0,0 +1,14 @@ +# soc/rockchip/rk3588 + +SoC-wide RK3588 patches that any board built on this SoC benefits from. +Distinct from `board//` (specific board configuration) and +`module//` (specific SoM configuration that several boards +share). + +## Patches + +- `0001-arm64-dts-rockchip-rk3588-Add-pwm15-pinctrl-entries.patch` — + fills in the four mux options for RK3588's `pwm15`. Cosmetic + upstream-quality fix; required as a *prerequisite* by board patches + that want to wire pwm15 to a real consumer (e.g. CoolPi GenBook's + pwm-fan, see `patches/board/coolpi-cm5-genbook/0002-...`).