rockchip64: fix rocks0 patch breaking current compilation

[paolosabatino]

Description

A patch that reworks rocks0 board has been reworked as well to compile on kernel 6.12.13.
@brentr I just did a quick rework of the patch, but cannot test if it is resulting in a working device or not. Perhaps it would be better, in the future, to rewrite the patch to fit the changes on top of the mainline kernel device tree?

How Has This Been Tested?

• Compiled rockchip64 current kernel without errors

Checklist:

• I have performed a self-review of my own code
• My changes generate no new warnings

[Kwiboo]

Yes, this patch really shreds the upstream device tree apart. You should probably only keep the audio related acodec-sound, sound, pcm5102a, codec, i2s_8ch_0, i2s_8ch_2, thermal tsadc and board-antenna nodes in your downstream patch.

Also look like you should drop rk3308-0003-pinctrl-io-voltage-domains.patch since the io-domain driver exists upstream and also rk3308-add-gmac-alias.patch as the ethernet-aliases should be defined at board level not soc-level.

[brentr]

@paolosabatino
I verified that this patch doesn't break anything major.
Still boots, WiFi works.
However, after merging it with upstream/main, the result would not compile due to DTC errors.

[brentr]

I've nothing against reorganizing the .dts files.
I am very much a neophyte in the wacky ways of device trees.
Please revise this patch to work with the current mainline.
Be sure to @brentr in your comment so I see it. I'll test try to test it that evening, hopefully before it gets stale.

[igorpecovnik]

This ready?

[brentr]

No. It no longer applies atop the current head.
I will change this PR to a "draft" if I can, until @paolosabatino weighs in.

I just verified that the current head builds a working image.
WiFi, Ethernet, 1.3ghz all work.
@igorpecovnik
Strangely, the apt update said a new kernel was available,
but, when I upgraded, it downgraded 6.12.12 OVER the running 6.12.13
Everything still works. Still, I suspect something's not right with the package dependencies.

[brentr]

Also verified that RockPI-S image works when build from the main branch.
However, the PI-S has the same the same issue where apt upgrade reverts kernel to 6.12.12

[igorpecovnik]

Still, I suspect something's not right with the package dependencies.

Oh, that was manual intervention of some other problem and i forgot to bump version of the package. If released image has package v1.0 and repository has package version v1.0, it will reinstall. But package version on the repo could have older kernel ... this anomaly will be fixed asap.

Ignore this upgrade - if build works, lets merge, versioning is unrelated problem.

[paolosabatino]

@brentr @igorpecovnik I tried to compile on my local branch and it correctly applies on top of current (kernel 6.12.14):

and the kernel builds fine too. I rebased my local branch to the latest main branch and now the patch does not apply anymore, with some hunks failing.

It clashes with this other rk3308 patch: https://github.com/armbian/build/blob/main/patch/kernel/archive/rockchip64-6.12/board-rocks0-0001-Revert-arm64-dts-rockchip-Fix-sdmmc-access-on-rk3308.patch

This evening I can fix the clashing, if the timing is ok for you @igorpecovnik. Nonetheless, the patch in this branch requires a major overhaul to correctly integrate the mainline dts, and not tearing it apart like now. I could lend a hand to do it after the 25.02 release.

[igorpecovnik]

Timing is OK, we are still in the 2025/2 release window.

[paolosabatino]

@igorpecovnik ok, this should be good enough to go for 25.02

changes have been accomodated to build against latest mainline sources

[paolosabatino]

@brentr I "dismissed" the change request from your part since it was blocking the PR from merge and we're a bit tight with timing. Nothing personal, it's just I made the changes and now everything compiles fine against mainline kernel. Please write here if you got any other issue.

[brentr]

@paolosabatino @igorpecovnik
Verified that Rock-S0 builds and boots with this patch.
(Both current and edge kernels)