Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rebase from 5.10 to rockchip 6.1 #154

Closed
amazingfate opened this issue Mar 3, 2024 · 3 comments
Closed

rebase from 5.10 to rockchip 6.1 #154

amazingfate opened this issue Mar 3, 2024 · 3 comments

Comments

@amazingfate
Copy link
Collaborator

amazingfate commented Mar 3, 2024

@Joshua-Riek has done some rebase: https://github.com/Joshua-Riek/linux-rockchip/tree/rk-6.1-rkr1
I also did a rebase without building.
Here is the list of dropped patches:

code module commit name drop reason
rtl8852be wifi 81c2a4c already supported by rtw89
rtl8852bu wifi 4699501
rtl8852be/u wifi a86585f
AX210 bt d425ee1 already supported in 6.1
rtl8821cs be5f289
rtl8821cs 5df5230
rtl8821cs c7596ba
rtl8821cs bt 69ac97c
iwlwifi pnvm 1211e70 no need in 6.1
stmmac VLAN dc87545 already merged in 6.1
rtl8852be bt 0d05f8c already supported in 6.1
khadas sound soc c608f28
revert khadas sound soc af7c346
khadas mcu 5d5bab7
khadas mcu d5f71e7
khadas thermal 4579d44
khadas bt 2b1cb9d
build *.dtbo 7c622d0 no need in 6.1
update dtc f0fb255 no need in 6.1
fix modpost 3e29804 no need in 6.1
usb gadget 94d4102 not necessary anymore
dma-buf for panfork 4e4095c already merged in mainline 6.1
dma-buf for panfork edb2457 already merged in mainline 6.1
dma-buf for panfork afbe8bc already merged in mainline 6.1
drm for panfork 04efbc6 no need in 6.1
gt9xx touchscreen 1e0050d already supported
r8125 2944e15 use mainline r8169 instead, discussion: awesometic/realtek-r8125-dkms#48
r8125 e28680f
realtek pgtool 2e74661 mainline already has it
uwe5622 wifi 99e4151 since this is 6.1, we can use patches from armbian
spreadtrum bt for uwe5622 e05a708 already in armbian's uwe5622 patch
aic8800 19c7c0d reworked, add new driver from https://github.com/radxa-pkg/aic8800
aic8800 c194463 already included in above patch
aic8800 fa00435 already included in above patch
@Joshua-Riek
Copy link
Collaborator

Hey! For panfork and wayland to work you need the below commits:

Joshua-Riek@6ee34db
Joshua-Riek@32fc581
Joshua-Riek@9e1e2c5

Btw do you have your 6.1 branch pushed?

@amazingfate
Copy link
Collaborator Author

My rebased code has not passed building. I will push it after it's built successfully and tested.

@amazingfate
Copy link
Collaborator Author

closed as pr is created: #155

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants