enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

board: bananapim2s: git format-patch remove builder warnings

Browse Source 
Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
This commit is contained in:
Patrick Yavitz 2023-07-21 09:53:28 -04:00 committed by Igor
parent effbb4c900
commit e22fa3aa35
4 changed files with 111 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
patch/kernel/archive/meson64-6.1/add-board-bananapi-m2s.patch
View File

@ -1,12 +1,22 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@gmail.com>
Date: Sun, 9 July 2023 19:42:40 -0400
Subject: [PATCH] Bananapi M2S Linux 6.1.y Support
From e2ff75f6cf2bcabacf6d580b34019291f2100348 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@xxxxx.com>
Date: Fri, 21 Jul 2023 09:19:53 -0400
Subject: [PATCH] arm64: dts: amlogic: Bananapi M2S Support
Bananapi M2S Linux 6.1.y Support
Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
---
.../devicetree/bindings/arm/amlogic.yaml | 1 +
arch/arm64/boot/dts/amlogic/Makefile | 2 +
.../amlogic/meson-g12b-a311d-bananapi-m2s.dts | 41 ++
.../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 530 ++++++++++++++++++
.../amlogic/meson-g12b-s922x-bananapi-m2s.dts | 18 +
5 files changed, 592 insertions(+)
create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts
create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts
diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
index 9fda2436c618..bbd5f6197e4d 100644
--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
@ -38,8 +48,11 @@ diff -Naur a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb
--- /dev/null 2023-07-07 19:42:40.585806232 -0400
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts 2023-07-09 05:53:44.188239967 -0400
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts
new file mode 100644
index 000000000000..dfcec525b001
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
@ -82,8 +95,11 @@ diff -Naur a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/
+//&npu {
+// status = "okay";
+//};
--- /dev/null 2023-07-07 19:42:40.585806232 -0400
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi 2023-07-09 05:53:12.027864793 -0400
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
new file mode 100644
index 000000000000..af102061d1d7
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
@@ -0,0 +1,530 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
@ -615,8 +631,11 @@ diff -Naur a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/
+ phys = <&usb2_phy0>, <&usb2_phy1>;
+ phy-names = "usb2-phy0", "usb2-phy1";
+};
--- /dev/null 2023-07-07 19:42:40.585806232 -0400
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts 2023-07-09 05:54:04.824479978 -0400
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts
new file mode 100644
index 000000000000..3295649664d7
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
@ -636,3 +655,6 @@ diff -Naur a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/
+&reboot {
+ sd-vqen = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>;
+};
--
2.39.2

43
patch/kernel/archive/meson64-6.4/board-bananapi-m2s-meson64-reboot-nodes.patch → patch/kernel/archive/meson64-6.4/board-bananapi-m2s-meson64-reboot-driver.patch
View File

@ -1,16 +1,20 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@gmail.com>
Date: Sun, 9 July 2023 07:12:42 -0400
From 8da8edad3ca3e65f3e2824ac92ee233dc4b1f6a7 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@xxxxx.com>
Date: Fri, 21 Jul 2023 09:35:52 -0400
Subject: [PATCH] Add support for the meson64-reboot driver
Add support for the meson64-reboot driver
Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
---
diff -Naur a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts 2023-07-01 07:12:42.000000000 -0400
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts 2023-07-09 07:07:01.116609978 -0400
@@ -18,6 +18,10 @@
.../boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts | 4 ++++
arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi | 9 +++++++++
.../boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts | 4 ++++
3 files changed, 17 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts
index ac6f7ae1d103..55b691368598 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts
@@ -18,6 +18,10 @@ aliases {
};
};
@ -21,10 +25,11 @@ diff -Naur a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts b/arc
/* Camera (CSI) bus */
&i2c1 {
status = "okay";
diff -Naur a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi 2023-07-01 07:12:42.000000000 -0400
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi 2023-07-09 07:06:35.952527545 -0400
@@ -17,6 +17,15 @@
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
index 83709787eb91..af102061d1d7 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
@@ -17,6 +17,15 @@ aliases {
rtc1 = &vrtc;
};
@ -40,10 +45,11 @@ diff -Naur a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/arm64/b
chosen {
stdout-path = "serial0:115200n8";
};
diff -Naur a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts 2023-07-01 07:12:42.000000000 -0400
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts 2023-07-09 07:07:28.228667931 -0400
@@ -12,3 +12,7 @@
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts
index 7f66f263a2ce..3295649664d7 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts
@@ -12,3 +12,7 @@ / {
compatible = "bananapi,bpi-m2s", "amlogic,s922x", "amlogic,g12b";
model = "BananaPi M2S";
};
@ -51,3 +57,6 @@ diff -Naur a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts b/arc
+&reboot {
+ sd-vqen = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>;
+};
--
2.39.2

53
patch/u-boot/v2023.07.02/board_bananapim2s/0001-U-Boot-v2023.07.02-Bananapi-M2S-Support.patch Normal file
View File

@ -0,0 +1,53 @@
From 39024aa2928b3d5d598573acb10b18b4d9a4e89f Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@xxxxx.com>
Date: Fri, 21 Jul 2023 09:47:00 -0400
Subject: [PATCH] U-Boot v2023.07.02 Bananapi M2S Support
Allow meson-g12b-s922x-bananapi-m2s.dtb to be compiled.
HDMI doesn't come up until handing off to the kernel, at
which point it only displays in green and magenta. Removing
the default *-u-boot.dtsi and adding one specific to each variant
corrects the issue.
Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
---
arch/arm/dts/Makefile | 1 +
...boot.dtsi => meson-g12b-a311d-bananapi-m2s-u-boot.dtsi} | 0
arch/arm/dts/meson-g12b-s922x-bananapi-m2s-u-boot.dtsi | 7 +++++++
3 files changed, 8 insertions(+)
rename arch/arm/dts/{meson-g12b-bananapi-u-boot.dtsi => meson-g12b-a311d-bananapi-m2s-u-boot.dtsi} (100%)
create mode 100644 arch/arm/dts/meson-g12b-s922x-bananapi-m2s-u-boot.dtsi
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 480269fa60..b3095c7b02 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -221,6 +221,7 @@ dtb-$(CONFIG_ARCH_MESON) += \
meson-g12b-odroid-n2l.dtb \
meson-g12b-odroid-n2-plus.dtb \
meson-g12b-radxa-zero2.dtb \
+ meson-g12b-s922x-bananapi-m2s.dtb \
meson-sm1-bananapi-m2-pro.dtb \
meson-sm1-bananapi-m5.dtb \
meson-sm1-khadas-vim3l.dtb \
diff --git a/arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi b/arch/arm/dts/meson-g12b-a311d-bananapi-m2s-u-boot.dtsi
similarity index 100%
rename from arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi
rename to arch/arm/dts/meson-g12b-a311d-bananapi-m2s-u-boot.dtsi
diff --git a/arch/arm/dts/meson-g12b-s922x-bananapi-m2s-u-boot.dtsi b/arch/arm/dts/meson-g12b-s922x-bananapi-m2s-u-boot.dtsi
new file mode 100644
index 0000000000..236f2468dc
--- /dev/null
+++ b/arch/arm/dts/meson-g12b-s922x-bananapi-m2s-u-boot.dtsi
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 BayLibre, SAS.
+ * Author: Neil Armstrong <narmstrong@baylibre.com>
+ */
+
+#include "meson-g12-common-u-boot.dtsi"
--
2.39.2

55
patch/u-boot/v2023.07.02/board_bananapim2s/001-u-boot-v2023.07.02-bananapi-m2s-support.patch
View File

@ -1,55 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@gmail.com>
Date: Thur, 20 July 2023 11:44:24 -0400
Subject: [PATCH] U-Boot v2023.07.02 Bananapi M2S Support
Allow meson-g12b-s922x-bananapi-m2s.dtb to be compiled.
HDMI doesn't come up until handing off to the kernel, at
which point it only displays in green and magenta. Removing
the default *-u-boot.dtsi and adding one specific to each variant
corrects the issue.
Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
---
diff -Naur a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
--- a/arch/arm/dts/Makefile 2023-07-11 11:20:44.000000000 -0400
+++ b/arch/arm/dts/Makefile 2023-07-20 17:54:53.990269166 -0400
@@ -221,6 +221,7 @@
meson-g12b-odroid-n2l.dtb \
meson-g12b-odroid-n2-plus.dtb \
meson-g12b-radxa-zero2.dtb \
+ meson-g12b-s922x-bananapi-m2s.dtb \
meson-sm1-bananapi-m2-pro.dtb \
meson-sm1-bananapi-m5.dtb \
meson-sm1-khadas-vim3l.dtb \
--- b/arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi 2023-07-20 12:53:13.241085241 -0400
+++ /dev/null 2023-07-17 11:44:24.323953311 -0400
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2019 BayLibre, SAS.
- * Author: Neil Armstrong <narmstrong@baylibre.com>
- */
-
-#include "meson-g12-common-u-boot.dtsi"
--- /dev/null 2023-07-17 11:44:24.323953311 -0400
+++ b/arch/arm/dts/meson-g12b-a311d-bananapi-m2s-u-boot.dtsi 2023-07-20 12:47:49.795706226 -0400
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 BayLibre, SAS.
+ * Author: Neil Armstrong <narmstrong@baylibre.com>
+ */
+
+#include "meson-g12-common-u-boot.dtsi"
--- /dev/null 2023-07-17 11:44:24.323953311 -0400
+++ b/arch/arm/dts/meson-g12b-s922x-bananapi-m2s-u-boot.dtsi 2023-07-20 12:49:58.590463960 -0400
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 BayLibre, SAS.
+ * Author: Neil Armstrong <narmstrong@baylibre.com>
+ */
+
+#include "meson-g12-common-u-boot.dtsi"