Skip to content

Commit

Permalink
Truncate the initial bigtreetech cb1 patch
Browse files Browse the repository at this point in the history
  • Loading branch information
@JohnTheCoolingFan
JohnTheCoolingFan committed Aug 27, 2024
1 parent 8775f35 commit a20c297
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 144 deletions.
144 changes: 2 additions & 142 deletions ...sun50i-h616-bigtreetech-cb1-sd-emmc.patch → ...m64-dts-sun50i-h616-bigtreetech-cb1.patch
View file
Original file line number Diff line number Diff line change
@@ -1,152 +1,12 @@
From 8e5a8ae9a921ebd0ffe11ddedf88b605df303eb3 Mon Sep 17 00:00:00 2001
From: Alan <Alan>
Date: Tue, 30 May 2023 17:36:29 +0800
Subject: arm64: dts: sun50i-h616-bigtreetech-cb1(sd, emmc)
Subject: arm64: dts: sun50i-h616-bigtreetech-cb1

> X-Git-Archeology: > recovered message: > Signed-off-by: Alan.Ma from BigTreeTech [email protected]
> X-Git-Archeology: - Revision 9d69bb1da699f5729dc5c1dcc2d8d5f4590152fd: https://github.com/armbian/build/commit/9d69bb1da699f5729dc5c1dcc2d8d5f4590152fd
> X-Git-Archeology: Date: Tue, 30 May 2023 17:36:29 +0800
> X-Git-Archeology: From: Alan <Alan>
> X-Git-Archeology: Subject: Patches: add current(6.1) & edge(6.2) patch for BigTreeTech CB1
> X-Git-Archeology:
> X-Git-Archeology: - Revision 8562428877003ddd46045cb3429d7fdc9df4acee: https://github.com/armbian/build/commit/8562428877003ddd46045cb3429d7fdc9df4acee
> X-Git-Archeology: Date: Sat, 02 Sep 2023 03:34:28 +0518
> X-Git-Archeology: From: Gunjan Gupta <[email protected]>
> X-Git-Archeology: Subject: Allwinner: Kernel patches for 6.5-rc7 kernel
> X-Git-Archeology:
> X-Git-Archeology: - Revision bb78fac2fadb40a43a9ccb36266dbd21746c2eb6: https://github.com/armbian/build/commit/bb78fac2fadb40a43a9ccb36266dbd21746c2eb6
> X-Git-Archeology: Date: Fri, 29 Sep 2023 08:46:52 +0200
> X-Git-Archeology: From: Ricardo Pardini <[email protected]>
> X-Git-Archeology: Subject: `sunxi`/`sunxi64` `edge` 6.5.y: rebase/rewrite all patches for v6.5.5; fix UTF-8 "From:" encoding
> X-Git-Archeology:
> X-Git-Archeology: - Revision d1186b8a0e3d44d5b285e94772ebe2c17a014193: https://github.com/armbian/build/commit/d1186b8a0e3d44d5b285e94772ebe2c17a014193
> X-Git-Archeology: Date: Mon, 30 Oct 2023 22:46:11 +0518
> X-Git-Archeology: From: Gunjan Gupta <[email protected]>
> X-Git-Archeology: Subject: kernel: sunxi: Add patches for 6.6 kernel
> X-Git-Archeology:
> X-Git-Archeology: - Revision a269c9a1c5784bd89630df1652923f0d76278b61: https://github.com/armbian/build/commit/a269c9a1c5784bd89630df1652923f0d76278b61
> X-Git-Archeology: Date: Sun, 24 Dec 2023 09:13:08 +0100
> X-Git-Archeology: From: Gunjan Gupta <[email protected]>
> X-Git-Archeology: Subject: Refreshed patches using rewrite-kernel-patches command
> X-Git-Archeology:
> X-Git-Archeology: - Revision 30ef1a3e149f96200bffaf1c3138a4467b6f0aa7: https://github.com/armbian/build/commit/30ef1a3e149f96200bffaf1c3138a4467b6f0aa7
> X-Git-Archeology: Date: Sun, 24 Dec 2023 09:13:08 +0100
> X-Git-Archeology: From: Gunjan Gupta <[email protected]>
> X-Git-Archeology: Subject: Allwinner: Add kernel patches for 6.7 kernel
> X-Git-Archeology:
---
arch/arm64/boot/dts/allwinner/Makefile | 2 +
.../sun50i-h616-bigtreetech-cb1-emmc.dts | 44 ++++
.../sun50i-h616-bigtreetech-cb1-sd.dts | 35 +++
.../sun50i-h616-bigtreetech-cb1.dtsi | 223 ++++++++++++++++--
4 files changed, 287 insertions(+), 17 deletions(-)
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1-emmc.dts
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1-sd.dts
1 files changed, 208 insertions(+), 17 deletions(-)

diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
index 337a1502378f..341a2bd0f87c 100644
--- a/arch/arm64/boot/dts/allwinner/Makefile
+++ b/arch/arm64/boot/dts/allwinner/Makefile
@@ -52,6 +52,8 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-tanix-tx6.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-tanix-tx6-mini.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h313-tanix-tx1.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-bigtreetech-cb1-manta.dtb
+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-bigtreetech-cb1-sd.dtb
+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-bigtreetech-cb1-emmc.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-bigtreetech-pi.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-orangepi-zero2.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-x96-mate.dtb
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1-emmc.dts b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1-emmc.dts
new file mode 100644
index 000000000000..f878c23f1d90
--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1-emmc.dts
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+/*
+ * Copyright (C) 2023 Alan.Ma <[email protected]>.
+ */
+
+/dts-v1/;
+
+#include "sun50i-h616-bigtreetech-cb1.dtsi"
+
+&mmc2 {
+ vmmc-supply = <&reg_dldo1>;
+
+ no-1-8-v;
+ bus-width = <8>;
+ non-removable;
+ status = "okay";
+};
+
+&ws2812 {
+ gpios = <&pio 8 15 GPIO_ACTIVE_LOW>; /* PI15 */
+};
+
+&i2c_gpio {
+ gpios = <&pio 8 6 GPIO_ACTIVE_HIGH>, /* SDA PI6 */
+ <&pio 8 4 GPIO_ACTIVE_HIGH>; /* SCL PI4 */
+};
+
+&can0_pin_irq {
+ pins = "PI3";
+};
+
+&can {
+ interrupts = <8 3 0x08>; /* PI3 IRQ_TYPE_LEVEL_LOW */
+};
+
+&tft_35 {
+ dc-gpios = <&pio 8 15 GPIO_ACTIVE_HIGH>; /* PI15 */
+};
+
+&spi1 {
+ cs-gpios = <&pio 8 5 GPIO_ACTIVE_HIGH>, /* PI5 */
+ <&pio 8 14 GPIO_ACTIVE_HIGH>, /* PI14 */
+ <&pio 8 7 GPIO_ACTIVE_HIGH>; /* PI7 */
+};
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1-sd.dts b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1-sd.dts
new file mode 100644
index 000000000000..e18dd854d74b
--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1-sd.dts
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+/*
+ * Copyright (C) 2023 Alan.Ma <[email protected]>.
+ */
+
+/dts-v1/;
+
+#include "sun50i-h616-bigtreetech-cb1.dtsi"
+
+&ws2812 {
+ gpios = <&pio 2 14 GPIO_ACTIVE_LOW>; /* PC14 */
+};
+
+&i2c_gpio {
+ gpios = <&pio 2 12 GPIO_ACTIVE_HIGH>, /* SDA PC12 */
+ <&pio 2 10 GPIO_ACTIVE_HIGH>; /* SCL PC10 */
+};
+
+&can0_pin_irq {
+ pins = "PC9";
+};
+
+&can {
+ interrupts = <2 9 0x08>; /* PC9 IRQ_TYPE_LEVEL_LOW */
+};
+
+&tft_35 {
+ dc-gpios = <&pio 2 14 GPIO_ACTIVE_HIGH>; /* PC14 */
+};
+
+&spi1 {
+ cs-gpios = <&pio 2 11 GPIO_ACTIVE_HIGH>, /* PC11 */
+ <&pio 2 7 GPIO_ACTIVE_HIGH>, /* PC7 */
+ <&pio 2 13 GPIO_ACTIVE_HIGH>; /* PC13 */
+};
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi
index d12b01c5f41b..0da8f2e6e3d4 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi
Expand Down
2 changes: 1 addition & 1 deletion patch/kernel/archive/sunxi-6.10/series.armbian
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
patches.armbian/arm64-dts-sun50i-h5-nanopi-r1s-h5-add-rtl8153-support.patch
patches.armbian/net-usb-r8152-add-LED-configuration-from-OF.patch
patches.armbian/arm64-dts-sun50i-h6-orangepi.dtsi-Rollback-r_rsb-to-r_i2c.patch
patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-sd-emmc.patch
patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch
patches.armbian/arch-arm64-dts-allwinner-sun50i-h618-bananapi-m4-zero.patch
patches.armbian/ARM-dts-sun8i-nanopiduo2-Use-key-0-as-power-button.patch
patches.armbian/ARM-dts-sun8i-nanopiduo2-enable-ethernet.patch
Expand Down
2 changes: 1 addition & 1 deletion patch/kernel/archive/sunxi-6.10/series.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@
patches.armbian/arm64-dts-sun50i-h5-nanopi-r1s-h5-add-rtl8153-support.patch
patches.armbian/net-usb-r8152-add-LED-configuration-from-OF.patch
patches.armbian/arm64-dts-sun50i-h6-orangepi.dtsi-Rollback-r_rsb-to-r_i2c.patch
patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-sd-emmc.patch
patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch
patches.armbian/arch-arm64-dts-allwinner-sun50i-h618-bananapi-m4-zero.patch
patches.armbian/ARM-dts-sun8i-nanopiduo2-Use-key-0-as-power-button.patch
patches.armbian/ARM-dts-sun8i-nanopiduo2-enable-ethernet.patch
Expand Down

0 comments on commit a20c297

Please sign in to comment.