mirror of
https://github.com/armbian/build.git
synced 2025-08-14 15:16:58 +02:00
1b12209ded
* Bump meson64 edge to 6.0.y * meson64: drop `pwm-gpio` unused patch from 5.19 * meson64: drop `pwm-gpio` unused patch from 6.0 Co-authored-by: Ricardo Pardini <ricardo@pardini.net>
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
|