744ea89a58
* Bumping EDGE kernel to 5.14.y Meson64: - removing Odroid reboot shutdown patch since its probably not needed anymore Rockchip64: - removing Rockpi S. No interest to maintain this any further - removing PBP suspend. Doesn’t align. Need inspection if some other way was mainstreamed - temporally removing Orangepi R1 * Re-adding rockpis, pbp suspend, HFLPS170 wifi and cleanup * Removing deprecated patch, fixing ap6256 wifi * Re-enable Opi R1 plus, untest * Add and fix Radxa Zero
21 lines
593 B
Diff
21 lines
593 B
Diff
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
|
|
index 714616618..b1fb824f3 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
|
|
@@ -15,6 +15,7 @@
|
|
compatible = "pine64,rockpro64", "rockchip,rk3399";
|
|
|
|
chosen {
|
|
+ bootargs = "mmc_cmdqueue=0 earlycon=uart8250,mmio32,0xff1a0000";
|
|
stdout-path = "serial2:1500000n8";
|
|
};
|
|
|
|
@@ -635,6 +636,7 @@
|
|
|
|
&sdhci {
|
|
bus-width = <8>;
|
|
+ keep-power-in-suspend;
|
|
mmc-hs200-1_8v;
|
|
non-removable;
|
|
status = "okay";
|