mirror of
https://github.com/armbian/build.git
synced 2025-08-09 12:46:58 +02:00
73691a9e24
* meson64-edge/5.19: use `tag:v5.19-rc2`, meson64 kernel config and kernel patches, by @adeepv * meson64-edge/5.19: we don't need `CONFIG_ARCH_ROCKCHIP=y` for meson64, right? * meson64-edge/5.19: remove `meson_drv_shutdown` revert patch, instead `CONFIG_DRM_MESON=y` and its dependencies in .config - this allows other meson64's to shutdown properly, while allowing the N2(+) to reboot without kernel-side hangs * meson64-edge/5.19: odroidn2(+): remove SD UHS modes patch for ODROID N2(+) - it works when cold-booted - but changes voltage to enable - when rebooted, voltage persists and uboot can't read the SD anymore - adding the "odroid,reboot" driver+dt that is supposed to fix this, doesn't - so for now remove it * meson64-edge/5.19: odroidn2(+): add dumb gpio fan at 30 celsius - backport from rework in 5.10 * meson64-edge/5.19: odroidhc4: bring back `fan1_input` by adding fan details to DT - yeah, I know; the cooling map is right there too, so empty, poor thing. for later. * meson64-edge/5.19: bump to 5.19-rc3 * meson64-edge/5.19: radxa-zero: add patch to remove UHS mode so `wifi` works - sent by @pyavitz: https://raw.githubusercontent.com/pyavitz/debian-image-builder/feature/patches/amlogic/radxazero/wifi/001-arm64-dts-amlogic-radxa-zero-sdio-card-speed.patch - tested by @lanefu * meson64-edge/5.19: bump to 5.19-rc4 * meson64-edge/5.19: bump to 5.19-rc5 * meson64-edge/5.19: bump to 5.19-rc7 * meson64-edge/5.19: bump to 5.19.y branch, which is 5.19.0 right now * Add kernel config - tested on Odroid N2+ Co-authored-by: Vyacheslav Bocharov <adeep@lexina.in> Co-authored-by: Igor Pecovnik <igor.pecovnik@gmail.com>
85 lines
3.3 KiB
Diff
85 lines
3.3 KiB
Diff
Index: arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-spi.dts
|
|
IDEA additional info:
|
|
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
|
<+>UTF-8
|
|
===================================================================
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-spi.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-spi.dts
|
|
new file mode 100644
|
|
--- /dev/null (date 1630421486471)
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-spi.dts (date 1630421486471)
|
|
@@ -0,0 +1,11 @@
|
|
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
+
|
|
+/dts-v1/;
|
|
+
|
|
+#include "meson-g12b-odroid-n2.dts"
|
|
+
|
|
+/ {
|
|
+ model = "Hardkernel ODROID-N2 with SPI";
|
|
+};
|
|
+
|
|
+#include "meson-g12b-odroid-n2-enable-spi.dtsi"
|
|
Index: arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus-spi.dts
|
|
IDEA additional info:
|
|
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
|
<+>UTF-8
|
|
===================================================================
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus-spi.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus-spi.dts
|
|
new file mode 100644
|
|
--- /dev/null (date 1630421477913)
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus-spi.dts (date 1630421477913)
|
|
@@ -0,0 +1,11 @@
|
|
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
+
|
|
+/dts-v1/;
|
|
+
|
|
+#include "meson-g12b-odroid-n2-plus.dts"
|
|
+
|
|
+/ {
|
|
+ model = "Hardkernel ODROID-N2Plus with SPI";
|
|
+};
|
|
+
|
|
+#include "meson-g12b-odroid-n2-enable-spi.dtsi"
|
|
Index: arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-enable-spi.dtsi
|
|
IDEA additional info:
|
|
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
|
<+>UTF-8
|
|
===================================================================
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-enable-spi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-enable-spi.dtsi
|
|
new file mode 100644
|
|
--- /dev/null (date 1630421525557)
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-enable-spi.dtsi (date 1630421525557)
|
|
@@ -0,0 +1,13 @@
|
|
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
+
|
|
+/*
|
|
+ * Replace emmc_data_8b_pins to emmc_data_4b_pins from sd_emmc_c pinctrl-0, and change bus-width to 4 then spifc can be enabled.
|
|
+ */
|
|
+&sd_emmc_c {
|
|
+ pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_4b_pins>, <&emmc_ds_pins>;
|
|
+ bus-width = <4>;
|
|
+};
|
|
+
|
|
+&spifc {
|
|
+ status = "okay";
|
|
+};
|
|
Index: arch/arm64/boot/dts/amlogic/Makefile
|
|
IDEA additional info:
|
|
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
|
<+>UTF-8
|
|
===================================================================
|
|
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
|
|
index f231280cd808..da3225d31e38 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/Makefile
|
|
+++ b/arch/arm64/boot/dts/amlogic/Makefile
|
|
@@ -10,7 +10,9 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gsking-x.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb
|
|
+dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-spi.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb
|
|
+dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus-spi.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb
|