* 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
23 lines
652 B
Diff
23 lines
652 B
Diff
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
|
|
index 80c87e0bb..340559727 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
|
|
@@ -382,7 +382,7 @@
|
|
|
|
/* eMMC */
|
|
&sd_emmc_c {
|
|
- status = "disabled";
|
|
+ status = "okay";
|
|
pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
|
|
pinctrl-1 = <&emmc_clk_gate_pins>;
|
|
pinctrl-names = "default", "clk-gate";
|
|
@@ -392,8 +392,6 @@
|
|
non-removable;
|
|
disable-wp;
|
|
cap-mmc-highspeed;
|
|
- mmc-ddr-1_8v;
|
|
- mmc-hs200-1_8v;
|
|
|
|
mmc-pwrseq = <&emmc_pwrseq>;
|
|
vmmc-supply = <&vcc3v3>;
|