110 lines
3.5 KiB
Diff
110 lines
3.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Ricardo Pardini <ricardo@pardini.net>
|
|
Date: Thu, 2 Sep 2021 20:44:19 +0200
|
|
Subject: G12: SPI-NOR flash enable via extra DTBs (ODROID N2(+), Khadas
|
|
VIM3/VIM3L)
|
|
|
|
Kernel DTS patch to add SPI-flash-enabled DTBs (slower eMMC), produces -spi .dtbs
|
|
@TODO: this should be an overlay. I refuse to do overlays until the "great rework plan" for
|
|
overlays is done.
|
|
|
|
Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
|
|
---
|
|
arch/arm64/boot/dts/amlogic/meson-g12-enable-spinor.dtsi | 13 ++++++++++
|
|
arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3-spinor.dts | 11 ++++++++
|
|
arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus-spinor.dts | 11 ++++++++
|
|
arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-spinor.dts | 11 ++++++++
|
|
arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l-spinor.dts | 11 ++++++++
|
|
5 files changed, 57 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-enable-spinor.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-enable-spinor.dtsi
|
|
new file mode 100644
|
|
index 000000000000..a6f11e8cdfbe
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-enable-spinor.dtsi
|
|
@@ -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";
|
|
+};
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3-spinor.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3-spinor.dts
|
|
new file mode 100644
|
|
index 000000000000..e21dd8fd3e00
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3-spinor.dts
|
|
@@ -0,0 +1,11 @@
|
|
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
+
|
|
+/dts-v1/;
|
|
+
|
|
+#include "meson-g12b-a311d-khadas-vim3.dts"
|
|
+
|
|
+/ {
|
|
+ model = "Khadas VIM3 with SPI NOR flash";
|
|
+};
|
|
+
|
|
+#include "meson-g12-enable-spinor.dtsi"
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus-spinor.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus-spinor.dts
|
|
new file mode 100644
|
|
index 000000000000..0677d7725b01
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus-spinor.dts
|
|
@@ -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 NOR flash";
|
|
+};
|
|
+
|
|
+#include "meson-g12-enable-spinor.dtsi"
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-spinor.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-spinor.dts
|
|
new file mode 100644
|
|
index 000000000000..521498d9f6fa
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-spinor.dts
|
|
@@ -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 NOR flash";
|
|
+};
|
|
+
|
|
+#include "meson-g12-enable-spinor.dtsi"
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l-spinor.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l-spinor.dts
|
|
new file mode 100644
|
|
index 000000000000..f0d547e0c9a6
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l-spinor.dts
|
|
@@ -0,0 +1,11 @@
|
|
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
+
|
|
+/dts-v1/;
|
|
+
|
|
+#include "meson-sm1-khadas-vim3l.dts"
|
|
+
|
|
+/ {
|
|
+ model = "Khadas VIM3L with SPI NOR flash";
|
|
+};
|
|
+
|
|
+#include "meson-g12-enable-spinor.dtsi"
|
|
--
|
|
Armbian
|
|
|