Remove Rockchip gpio patch, already applied upstream#9368
Conversation
📝 WalkthroughWalkthroughThis change removes pinctrl direction calls from the Rockchip GPIO driver's direction path, drops the gpiochip Changes
Sequence Diagram(s)sequenceDiagram
participant User as Caller (gpiolib / driver)
participant GPIO as rockchip_gpio (drivers/gpio)
participant PCTL as pinctrl_gpio_* helpers
participant PMX as rockchip pinctrl (pinctrl-rockchip)
rect rgba(200,200,255,0.5)
note right of GPIO: OLD FLOW
User->>GPIO: gpio_direction_*()
GPIO->>PCTL: pinctrl_gpio_direction_input/output()
PCTL->>PMX: gpio_set_direction(range, offset)
PMX-->>PCTL: set mux/state for direction
PCTL-->>GPIO: return
end
rect rgba(200,255,200,0.5)
note right of GPIO: NEW FLOW
User->>GPIO: gpio_request()/gpio_direction_*()
GPIO-->>PCTL: (no pinctrl direction call)
User->>PMX: pinctrl request path triggers
PMX->>PMX: gpio_request_enable(range, offset)
PMX-->>User: pinctrl config applied at request time
GPIO-->>User: DDR updated under lock (no sleep path)
end
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Possibly related PRs
Suggested reviewers
Poem
🚥 Pre-merge checks | ✅ 3✅ Passed checks (3 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
Look that the 32 bit rockchip patchset has a series.conf file. You need to remove the patch reference from there too, thanks! |
Good catch. I've updated the PR, and tested that patches appear to apply cleanly for the Tinkerboard (Rockchip 32 bit) build. |
|
I'm unable to build on Edit: Compiled and boot tested on NanoPi R3S-LTS |
|
✅ This PR has been reviewed and approved — all set for merge! |
schwar3kat
left a comment
There was a problem hiding this comment.
#9366 requires this merge for compile.
Tested on compile for radxa-e52c
|
Merged, thanks @tparys ! |
Description
Removes the Rockchip patch "general-gpio-driver-no-sleep" from rockchip 32 and 64 bit families, as it appears to already be applied at https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git on branch 6.18.y.
Documentation summary for feature / change
N/A
How Has This Been Tested?
Checklist:
N/A
Summary by CodeRabbit
Bug Fixes
Chores