Skip to content

Update devicetree-rebasing to v7.2-dts and rework the mainline device trees #285

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

Merged
mariobalanica merged 5 commits into from
Sep 18, 2026
Merged

Update devicetree-rebasing to v7.2-dts and rework the mainline device trees #285

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d10a30a
Update devicetree-rebasing to v7.2-dts
C-Prime90 Aug 13, 2026
a9c7464
Mainline: Build straight from upstream where the fixup adds nothing
C-Prime90 Sep 9, 2026
cf1c4f8
PowerStation 6: Rework the mainline device tree for v7.2
C-Prime90 Sep 10, 2026
92280d9
NanoPi R6C / R6S: Run the eMMC at HS400
C-Prime90 Sep 13, 2026
748cb9e
Mainline: Restore the ROCK 5 ITX fixup
C-Prime90 Sep 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
437 changes: 282 additions & 155 deletions devicetree/mainline/rk3588-buzztv-p6.dts
View file
Open in desktop

Large diffs are not rendered by default.

19 changes: 0 additions & 19 deletions devicetree/mainline/rk3588-nanopc-t6-fixup.dts
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions devicetree/mainline/rk3588-rock-5-itx-fixup.dts
View file
Open in desktop
Comment thread
mariobalanica marked this conversation as resolved.

This file was deleted.

11 changes: 0 additions & 11 deletions devicetree/mainline/rk3588s-indiedroid-nova-fixup.dts
View file
Open in desktop

This file was deleted.

16 changes: 10 additions & 6 deletions devicetree/mainline/rk3588s-nanopi-r6c-fixup.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@

#include "rk3588s-nanopi-r6c.dts"

&hdmi0_sound {
status = "okay";
};

&i2s5_8ch {
status = "okay";
/*
* The R6C, the R6S and the NanoPC-T6 are all the same nanopi6 carrier design
* with the same eMMC part, and FriendlyELEC runs the whole family at HS400 with
* enhanced strobe. Upstream stops at HS200 on the R6 boards alone -- about half
* the bandwidth -- while the T6 already runs HS400 upstream.
*/
&sdhci {
max-frequency = <200000000>;
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
};
16 changes: 10 additions & 6 deletions devicetree/mainline/rk3588s-nanopi-r6s-fixup.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@

#include "rk3588s-nanopi-r6s.dts"

&hdmi0_sound {
status = "okay";
};

&i2s5_8ch {
status = "okay";
/*
* The R6C, the R6S and the NanoPC-T6 are all the same nanopi6 carrier design
* with the same eMMC part, and FriendlyELEC runs the whole family at HS400 with
* enhanced strobe. Upstream stops at HS200 on the R6 boards alone -- about half
* the bandwidth -- while the T6 already runs HS400 upstream.
*/
&sdhci {
max-frequency = <200000000>;
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
};
4 changes: 2 additions & 2 deletions devicetree/mainline/rk3588s-rock-5a-fixup.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
#include "rk3588s-rock-5a.dts"

&hdmi0_sound {
status = "okay";
status = "okay";
};

&i2s5_8ch {
status = "okay";
status = "okay";
};
2 changes: 1 addition & 1 deletion devicetree/mainline/upstream
Open in desktop
Submodule upstream updated from 0449e8 to 1826bb
2 changes: 1 addition & 1 deletion edk2-rockchip/Platform/Ameridroid/IndiedroidNova/DeviceTree/Mainline.inf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
VERSION_STRING = 1.0

[Sources]
devicetree/mainline/rk3588s-indiedroid-nova-fixup.dts
devicetree/mainline/upstream/src/arm64/rockchip/rk3588s-indiedroid-nova.dts

[Packages]
MdePkg/MdePkg.dec
Expand Down
2 changes: 1 addition & 1 deletion edk2-rockchip/Platform/FriendlyElec/NanoPC-T6/DeviceTree/Mainline.inf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
VERSION_STRING = 1.0

[Sources]
devicetree/mainline/rk3588-nanopc-t6-fixup.dts
devicetree/mainline/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts

[Packages]
MdePkg/MdePkg.dec
Expand Down
2 changes: 1 addition & 1 deletion edk2-rockchip/Platform/Radxa/ROCK5ITX/DeviceTree/Mainline.inf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
VERSION_STRING = 1.0

[Sources]
devicetree/mainline/rk3588-rock-5-itx-fixup.dts
devicetree/mainline/upstream/src/arm64/rockchip/rk3588-rock-5-itx.dts

[Packages]
MdePkg/MdePkg.dec
Expand Down
Loading