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.

Sign up for GitHub

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

Jump to bottom

Update Rk 6.1 to rkr4.1 #289

Merged
merged 350 commits into from
Nov 24, 2024
Merged

Update Rk 6.1 to rkr4.1 #289

merged 350 commits into from
Nov 24, 2024

Conversation

amazingfate
Copy link
Collaborator

@amazingfate amazingfate commented Nov 13, 2024 •
edited
Loading

Dropped commits:

commit drop reason
672dacb This commit is reverted by following 1b4ed98
1b4ed98
8dd683a This commit is reverted by following 5bfb5b9
5bfb5b9
443f54c I have merged this commit inside amazingfate@04b4eb0
81d767d Rockchip has bumped MALI DDK to g24p0, mali firmware is inside kernel, so no need to deal with different version of mali firmwares, and panfork works. lets see if it will break panfork
672dacb This commit is reverted by following 1b4ed98
1b4ed98
16a7adc Already in rkr4.1

Joshua-Riek and others added 30 commits November 13, 2024 11:28
@Joshua-Riek @amazingfate
arm64: dts: nanopir6: use proper mmc aliases
4f863d0
@amazingfate
workflow: don't upload kernel in pr
3208c06
@rpardini @amazingfate
mixtile: Blade 3: enable i2s5_8ch & i2s7_8ch for hdmi audio
40869af
@Joshua-Riek @amazingfate
arm64: dts: blade3: use rockchip,hdmi as hdmirx audio driver
19b72cb
@Joshua-Riek @amazingfate
arm64: dts: blade3: enable dp0 and dp1 audio
d7b6e37
@Joshua-Riek @amazingfate
arm64: dts: blade3: fix hdmirx detection
7d1416b
@Joshua-Riek @amazingfate
arm64: dts: blade3: swap cursor and display plane
1bf5aae
@Joshua-Riek @amazingfate
arm64: dts: add pwm fan node for radxa cm5 io
3635ce2
@Ken-Vamrs @amazingfate
arm64: dts: cm5: add at24c16
8eedc2d 
Signed-off-by: Ken Wang <[email protected]>
@Ken-Vamrs @amazingfate
arm64: dts: cm5 io: add user led
f984b2d 
Signed-off-by: Ken Wang <[email protected]>
@Ken-Vamrs @amazingfate
arm64: dts: cm5 io: change i2c7m0 to i2c8m2 for es8316
24a68ae 
Signed-off-by: Ken Wang <[email protected]>
@Joshua-Riek @amazingfate
arm64: dts: cm5 io: use mmclkout_i2s0 for es8316
9a81e22
@Joshua-Riek @amazingfate
arm64: dts: cm5: swap sdhci and sdmmc aliases
ffbbd15
@lanefu @amazingfate
fix indiedroid wifi DTS by removing WIFI,poweren_gpio
a1207d5
@Joshua-Riek @amazingfate
arm64: dts: blade3: add sata2 overlay for mini pcie port
f858264
@efectn @amazingfate
arm64: dts: make usbdrd_dwc3_0 -> dr_mode host for nanopi-r6-common
c0561da
@amazingfate
arm64: dts: h88k: enable pcie2x1l2
c23bceb
@mahdichi @amazingfate
add fxblox-rk1 board dts
122e1c8
@Joshua-Riek @amazingfate
arm64: dts: add overlays for radxa cm5 io
eb57325
@Joshua-Riek @amazingfate
arm64: dts: nanopct6: add sfc node
1cc9b7f
@Joshua-Riek @amazingfate
arm64: dts: nanopct6: remove fspim1 pin definitions
7d24b44
@amazingfate
arm64:dts:hinlink-h88k: update emmc, sd card aliases
83c684a
@Joshua-Riek @amazingfate
Revert "net: wireless: rockchip_wlan: bcmdhd: Enable CONFIG_BCMDHD_RE…
1f3e0ff 
…QUEST_FW"

This reverts commit 1659a56.
@Joshua-Riek @amazingfate
arm64: dts: 9tripod: fix usb-c display port
cbe2e1a
@amazingfate
arm64: dts: Add device tree for ArmSoM-w3
03bf5ff
@amazingfate
arm64: dts: Add Makefile rk3588-armsom-w3.dtb for ArmSoM-w3
19888e9
@rpardini @amazingfate
arm64: dts: odroid-m1: add ODROID-M1 dt from 4.19 vendor sources
421bca9 
- taken from https://github.com/hardkernel/linux/tree/odroidm1-4.19.y sha1 89b88ec44cb98ec17b8460cc3c0127fcb1f7b159
- added the infamous delete chosen
- moved stuff HK did to common rk3568-linux.dtsi to their own dtsi
- change `RK_GPIO0` -> `0`
@rpardini @amazingfate
arm64: dts: odroid-m1: add vp0 and gpu props for panfrost
3618575 
- suggested by amazingfate
- from way back in February; armbian/build#4794 (comment)
@rpardini @amazingfate
arm64: dts: odroid-m1: add dt to Makefile
27a1906
@Joshua-Riek @amazingfate
arm64: dts: 9tripod: add dp0 sound node
69fec4e
itlhd and others added 12 commits November 13, 2024 11:30
@itlhd @amazingfate
Add the reuse pin function used on 3576
6230cb3
@itlhd @amazingfate
add overlay config:armsom-cm5-rpi-cm4-io-camera
21ce900
@chainsx @amazingfate
fix: fix rk3588-cyber-aib hdmi out
4389a08
@ginkage @amazingfate
RetrOLED CM5: Add missing Makefile entry
89b08f0
@amazingfate
arch: arm64: dts: delete ufs nodes from armsom cm5-io
f06b6fe
@amazingfate
PCI: rockchip: use conditions from mainline for rk_pcie_link_up
956fd6f
@amazingfate
PCI: rockchip: add devicetree property rockchip,default-link-up
c342117
@amazingfate
arch: arm64: dts: add rockchip,default-link-up to pcie2 ethernet node…
ecfa4c0 
…s of opi5plus
@as-jackson @amazingfate
change armsom-w3 screen and camera loading method to overlay (armbian…
cf6af88 
…#285)

* add overlay:armsom-w3-camera-ov13850-csi

* fix : armsom-w3 screen and camera loading method

* add armsom-w3 overlay/Makefile

* fix: add armsom-w3 overlay/makefile

---------

Co-authored-by: [email protected] <yidiantongxin>
@mahdichi @amazingfate
dts: fxblox remove sd pwr gpio and correct bt wake gpio
f9b000e
@AaronDewes @amazingfate
fix: export memblock_free
94f7cd6 
This is required for drivers/gpu/drm/rockchip/rockchip_drm_logo.c to compile properly as a module.

Without this patch, build including rockchip-drm fail for me with

ERROR: modpost: "memblock_free" undefined!

cherry-picked from https://android.googlesource.com/kernel/common/+/cd5f5cb9fe677466551e44039b31198e7b0dc812%5E%21/
@amazingfate
arch: arm64: dts: drm_mipi_dsi: Add _NO_ to MIPI_DSI_* flags disablin…
2890037 
…g features

Follow sdk commit:
"dt-bindings: display: drm_mipi_dsi: Add _NO_ to MIPI_DSI_* flags disabling features"
@amazingfate
Copy link
Collaborator Author

Tested jammy with panfork driver, although DDK is bumped to g25p0, panfork can still use mali firmware from g15p0.

@ginkage
Copy link
Collaborator

ginkage commented Nov 13, 2024

On that note, do keep in mind that there's a new flag MALI_CSF_INCLUDE_FW (default "yes"), so that g15 firmware may not actually have been used, as the relevant firmware g25 is now embedded into kernel by default.

@amazingfate
Copy link
Collaborator Author

On that note, do keep in mind that there's a new flag MALI_CSF_INCLUDE_FW (default "yes"), so that g15 firmware may not actually have been used, as the relevant firmware g25 is now embedded into kernel by default.

That is far better than the old way!

@HeyMeco
Copy link
Contributor

HeyMeco commented Nov 14, 2024

although DDK is bumped to g25p0

@JeffyCN can you update the libmali mirror with the g25p0 userspace driver?

@ginkage
Copy link
Collaborator

ginkage commented Nov 14, 2024

AFAIK there is no g25 userspace driver available...
There is g24 though, and that indeed would be nice to have released.

@JeffyCN
Copy link
Contributor

JeffyCN commented Nov 15, 2024

although DDK is bumped to g25p0

@JeffyCN can you update the libmali mirror with the g25p0 userspace driver?

updated to the newest version :)

@AaronDewes
Copy link
Contributor

I've been experiencing a kernel panic on boot on an Radxa CM5 with this branch. I'm using a custom kernel config though, as well as a custom carrier board. The custom config fully worked on 6.1-rkr3.

I'll check if I can reproduce the issue with the official carrier board soon, just wanted to let you know that there could be an issue with this branch.

@ginkage
Copy link
Collaborator

ginkage commented Nov 16, 2024 •
edited
Loading

FWIW, this kernel boots perfectly fine on my CM5 with the Radxa I/O board.

@amazingfate
Copy link
Collaborator Author

I've been experiencing a kernel panic on boot on an Radxa CM5 with this branch. I'm using a custom kernel config though, as well as a custom carrier board. The custom config fully worked on 6.1-rkr3.

I'll check if I can reproduce the issue with the official carrier board soon, just wanted to let you know that there could be an issue with this branch.

what kind if kernel panic, are there logs of it?

@AaronDewes
Copy link
Contributor

Just checked again: It was related to undervoltage 😅

Using a different power supply fixed it, apparently mine was faulty.

@amazingfate
Copy link
Collaborator Author

Tested with:

  • armsom sige1(rk3528)
  • armsom sige3(rk3568)
  • armsom cm5-io(rk3576)
  • armsom sige7(rk3588)
  • rock5b(rk3588)

@amazingfate amazingfate merged commit 31f9143 into armbian:rk-6.1-rkr4.1 Nov 24, 2024
1 check passed
@HeyMeco
Copy link
Contributor

HeyMeco commented Nov 24, 2024 •
edited
Loading

Gonna test on these later

  • Rock5B+
  • Rock5B (doesn’t hurt testing twice)

Both confirmed working with rkr4.1

@amazingfate amazingfate mentioned this pull request Nov 30, 2024
Merged
12 tasks
@igorpecovnik igorpecovnik mentioned this pull request Dec 3, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.