Skip to content

Commit

Permalink
sunxi-6.6: re-export armbian patches for v6.6.65
Browse files Browse the repository at this point in the history
  • Loading branch information
The-going authored and igorpecovnik committed Dec 18, 2024
1 parent 9f3d078 commit 6101719
Show file tree
Hide file tree
Showing 11 changed files with 130 additions and 131 deletions.
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
From ab2682af1cf693ce7043b397c6c9157fe8f9859b Mon Sep 17 00:00:00 2001
From 4d117355aa136c467962a60a35c14c13c8ccf352 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <[email protected]>
Date: Wed, 11 Dec 2024 12:23:10 -0500
Subject: [PATCH] Add BananaPi BPI-M4-Zero overlays
Subject: Add BananaPi BPI-M4-Zero overlays

Signed-off-by: Patrick Yavitz <[email protected]>
---
.../arm64/boot/dts/allwinner/overlay/Makefile | 11 +++++++
...sun50i-h616-bananapi-m4-pg-15-16-i2c4.dtso | 13 ++++++++
...sun50i-h616-bananapi-m4-pg-17-18-i2c3.dtso | 13 ++++++++
.../sun50i-h616-bananapi-m4-ph-2-3-uart5.dtso | 13 ++++++++
...un50i-h616-bananapi-m4-pi-13-14-uart4.dtso | 13 ++++++++
...16-bananapi-m4-pi-15-16-rts-cts-uart4.dtso | 16 ++++++++++
.../sun50i-h616-bananapi-m4-pi-5-6-i2c0.dtso | 13 ++++++++
.../sun50i-h616-bananapi-m4-pi-7-8-i2c1.dtso | 13 ++++++++
.../sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso | 29 +++++++++++++++++
...i-h616-bananapi-m4-pg-15-16-i2c4.dtso | 13 ++++++++
...i-h616-bananapi-m4-pg-17-18-i2c3.dtso | 13 ++++++++
...0i-h616-bananapi-m4-ph-2-3-uart5.dtso | 13 ++++++++
...-h616-bananapi-m4-pi-13-14-uart4.dtso | 13 ++++++++
...nanapi-m4-pi-15-16-rts-cts-uart4.dtso | 16 ++++++++++
...50i-h616-bananapi-m4-pi-5-6-i2c0.dtso | 13 ++++++++
...50i-h616-bananapi-m4-pi-7-8-i2c1.dtso | 13 ++++++++
...-bananapi-m4-spi1-cs0-cs1-spidev.dtso | 32 +++++++++++++++++++
...h616-bananapi-m4-spi1-cs0-spidev.dtso | 24 ++++++++++++++
...h616-bananapi-m4-spi1-cs1-spidev.dtso | 13 ++++++++
...-h616-bananapi-m4-spi1-cs0-cs1-spidev.dtso | 32 +++++++++++++++++++
...n50i-h616-bananapi-m4-spi1-cs0-spidev.dtso | 24 ++++++++++++++
...n50i-h616-bananapi-m4-spi1-cs1-spidev.dtso | 13 ++++++++
12 files changed, 203 insertions(+)
create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso
create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-15-16-i2c4.dtso
create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-17-18-i2c3.dtso
create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-ph-2-3-uart5.dtso
create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-13-14-uart4.dtso
create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-15-16-rts-cts-uart4.dtso
create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-5-6-i2c0.dtso
create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-7-8-i2c1.dtso
create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso
create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-cs1-spidev.dtso
create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-spidev.dtso
create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs1-spidev.dtso

diff --git a/arch/arm64/boot/dts/allwinner/overlay/Makefile b/arch/arm64/boot/dts/allwinner/overlay/Makefile
index 76a4952e3ecc..1e76bbcb67af 100644
index 24383cb63770..da0e99784b8c 100644
--- a/arch/arm64/boot/dts/allwinner/overlay/Makefile
+++ b/arch/arm64/boot/dts/allwinner/overlay/Makefile
@@ -48,6 +48,17 @@ dtb-$(CONFIG_ARCH_SUNXI) += \
@@ -49,6 +49,17 @@ dtb-$(CONFIG_ARCH_SUNXI) += \
sun50i-h6-uart2.dtbo \
sun50i-h6-uart3.dtbo \
sun50i-h6-w1-gpio.dtbo \
Expand All @@ -52,41 +52,6 @@ index 76a4952e3ecc..1e76bbcb67af 100644
sun50i-h616-i2c2-ph.dtbo \
sun50i-h616-i2c3-ph.dtbo \
sun50i-h616-i2c4-ph.dtbo \
diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso
new file mode 100644
index 000000000000..b672807fab66
--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso
@@ -0,0 +1,29 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+ compatible = "sinovoip,bpi-m4-zero", "allwinner,sun50i-h616", "allwinner,sun50i-h618";
+
+ fragment@0 {
+ target-path = "/";
+ __overlay__ {
+ model = "BananaPi BPI-M4-Zero v2";
+ };
+ };
+
+ /* SDIO WIFI */
+ fragment@1 {
+ target = <&mmc1>;
+ __overlay__ {
+ status = "okay";
+ };
+ };
+
+ /* BLUETOOTH */
+ fragment@2 {
+ target = <&uart1>;
+ __overlay__ {
+ status = "okay";
+ };
+ };
+};
diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-15-16-i2c4.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-15-16-i2c4.dtso
new file mode 100644
index 000000000000..4e78aa8f1f27
Expand Down Expand Up @@ -223,6 +188,41 @@ index 000000000000..99c7e2b8c5f6
+ };
+ };
+};
diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso
new file mode 100644
index 000000000000..b672807fab66
--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso
@@ -0,0 +1,29 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+ compatible = "sinovoip,bpi-m4-zero", "allwinner,sun50i-h616", "allwinner,sun50i-h618";
+
+ fragment@0 {
+ target-path = "/";
+ __overlay__ {
+ model = "BananaPi BPI-M4-Zero v2";
+ };
+ };
+
+ /* SDIO WIFI */
+ fragment@1 {
+ target = <&mmc1>;
+ __overlay__ {
+ status = "okay";
+ };
+ };
+
+ /* BLUETOOTH */
+ fragment@2 {
+ target = <&uart1>;
+ __overlay__ {
+ status = "okay";
+ };
+ };
+};
diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-cs1-spidev.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-cs1-spidev.dtso
new file mode 100644
index 000000000000..7fa3b94bcc8d
Expand Down Expand Up @@ -311,5 +311,5 @@ index 000000000000..840357f2e9e0
+ };
+};
--
2.39.5
2.35.3

Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
From 6f8e2ef1d8ba018353552278658462cab285fa6f Mon Sep 17 00:00:00 2001
From 4ca92dbeb0a089f61a831ce9d3dd6cbf20e291b5 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <[email protected]>
Date: Thu, 12 Dec 2024 03:49:35 -0500
Subject: [PATCH] Add BananaPi BPI-M4-Zero pinctrl
Subject: Add BananaPi BPI-M4-Zero pinctrl

Signed-off-by: Patrick Yavitz <[email protected]>
---
.../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 54 +++++++++++++++++++
1 file changed, 54 insertions(+)
.../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 56 ++++++++++++++++++-
1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
index 8cb3ae91909f..fa4d0ef27b44 100644
index 8cb3ae91909f..4c1b61b3c64f 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
@@ -391,6 +391,30 @@ i2c0_pins: i2c0-pins {
@@ -387,10 +387,34 @@ ext_rgmii_pins: rgmii-pins {
};

i2c0_pins: i2c0-pins {
- pins = "PI6", "PI7";
+ pins = "PI5", "PI6";
function = "i2c0";
};

Expand Down Expand Up @@ -81,31 +86,5 @@ index 8cb3ae91909f..fa4d0ef27b44 100644
pins = "PH0", "PH1";
function = "uart0";
--
2.39.5

From cadd958178c9854df5db40f26dd69e506faf30c0 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <[email protected]>
Date: Thu, 12 Dec 2024 05:49:56 -0500
Subject: [PATCH] Fixup i2c0 pins

Signed-off-by: Patrick Yavitz <[email protected]>
---
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
index fa4d0ef27b44..4c1b61b3c64f 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
@@ -387,7 +387,7 @@ ext_rgmii_pins: rgmii-pins {
};

i2c0_pins: i2c0-pins {
- pins = "PI6", "PI7";
+ pins = "PI5", "PI6";
function = "i2c0";
};

--
2.39.5
2.35.3

Original file line number Diff line number Diff line change
@@ -1,4 +1,34 @@
--- a/arch/arm64/boot/dts/allwinner/sun50i-h618-longan-module-3h.dtsi
From e1a4c46389ce01b2a3c080f6f4b607893571b86d Mon Sep 17 00:00:00 2001
From: The-going <[email protected]>
Date: Sun, 15 Dec 2024 13:22:18 +0300
Subject: [PATCH] Add board LonganPi 3H

Author: chainsx <[email protected]>
Signed-off-by: The-going <[email protected]>
---
arch/arm64/boot/dts/allwinner/Makefile | 1 +
.../sun50i-h618-longan-module-3h.dtsi | 87 +++++++++
.../dts/allwinner/sun50i-h618-longanpi-3h.dts | 168 ++++++++++++++++++
3 files changed, 256 insertions(+)
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h618-longan-module-3h.dtsi
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h618-longanpi-3h.dts

diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
index 812685d6740f..cab747308db9 100644
--- a/arch/arm64/boot/dts/allwinner/Makefile
+++ b/arch/arm64/boot/dts/allwinner/Makefile
@@ -56,6 +56,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-x96-mate.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-h618-bananapi-m4-zero.dtb
+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-longanpi-3h.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-orangepi-zero3.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-orangepi-zero2w.dtb

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-longan-module-3h.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h618-longan-module-3h.dtsi
new file mode 100644
index 000000000000..45cb11275a23
--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-longan-module-3h.dtsi
@@ -0,0 +1,87 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
Expand Down Expand Up @@ -88,8 +118,10 @@
+ vcc-ph-supply = <&reg_dldo1>;
+ vcc-pi-supply = <&reg_dldo1>;
+};

--- a/arch/arm64/boot/dts/allwinner/sun50i-h618-longanpi-3h.dts
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-longanpi-3h.dts b/arch/arm64/boot/dts/allwinner/sun50i-h618-longanpi-3h.dts
new file mode 100644
index 000000000000..f4e8391efffe
--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-longanpi-3h.dts
@@ -0,0 +1,168 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
Expand Down Expand Up @@ -260,13 +292,6 @@
+ usb1_vbus-supply = <&reg_vcc5v>;
+ status = "okay";
+};
--
2.35.3

--- a/arch/arm64/boot/dts/allwinner/Makefile
+++ b/arch/arm64/boot/dts/allwinner/Makefile
@@ -57,6 +57,7 @@
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-h618-bananapi-m4-zero.dtb
+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-longanpi-3h.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-orangepi-zero3.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-orangepi-zero2w.dtb
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From c7b64a9dff925e5887e37230ffe0e194a4d59f38 Mon Sep 17 00:00:00 2001
From: Ryzer58 <[email protected]>
Date: Thu, 25 Apr 2024 22:18:22 +0100
Subject: Correct perf interrupt source number as referenced in the Allwinner A10 User manual
Subject: Correct perf interrupt source number as referenced in the Allwinner
A10 User manual

to resolve conflict with UART2.

Signed-off-by: Ryzer58 <[email protected]>
Expand All @@ -13,9 +15,7 @@ diff --git a/arch/arm/boot/dts/allwinner/sun4i-a10.dtsi b/arch/arm/boot/dts/allw
index 51a6464aab9a..cabf619c2e21 100644
--- a/arch/arm/boot/dts/allwinner/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/allwinner/sun4i-a10.dtsi
@@ -183,11 +183,11 @@ de: display-engine {
status = "disabled";
};
@@ -185,7 +185,7 @@ de: display-engine {

pmu {
compatible = "arm,cortex-a8-pmu";
Expand All @@ -24,8 +24,6 @@ index 51a6464aab9a..cabf619c2e21 100644
};

reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
--
Created with Armbian build tools https://github.com/armbian/build
2.35.3

Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From df8af1fccb4c20529f7efd46ed4ef5b64e333c9e Mon Sep 17 00:00:00 2001
From: Ryzer58 <[email protected]>
Date: Sun, 4 Aug 2024 23:45:50 +0100
Subject: Enable DMA support for the Allwinner A10 EMAC, which already exist in the sun4i-emac driver
Subject: Enable DMA support for the Allwinner A10 EMAC, which already exist in
the sun4i-emac driver

Signed-off-by: Ryzer58 <[email protected]>
---
Expand All @@ -12,9 +13,7 @@ diff --git a/arch/arm/boot/dts/allwinner/sun4i-a10.dtsi b/arch/arm/boot/dts/allw
index cabf619c2e21..08a8433b595e 100644
--- a/arch/arm/boot/dts/allwinner/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/allwinner/sun4i-a10.dtsi
@@ -313,10 +313,12 @@ emac: ethernet@1c0b000 {
compatible = "allwinner,sun4i-a10-emac";
reg = <0x01c0b000 0x1000>;
@@ -315,6 +315,8 @@ emac: ethernet@1c0b000 {
interrupts = <55>;
clocks = <&ccu CLK_AHB_EMAC>;
allwinner,sram = <&emac_sram 1>;
Expand All @@ -23,8 +22,6 @@ index cabf619c2e21..08a8433b595e 100644
pinctrl-names = "default";
pinctrl-0 = <&emac_pins>;
status = "disabled";
};

--
Created with Armbian build tools https://github.com/armbian/build
2.35.3

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6e527d62e8e118474abae0058e7df10e98afb4ce Mon Sep 17 00:00:00 2001
From 860fc70719192613893ed1a1b9872fa99ead7714 Mon Sep 17 00:00:00 2001
From: Stephen Graf <[email protected]>
Date: Thu, 9 May 2024 20:59:34 -0700
Subject: Sound for H616, H618 Allwinner SOCs
Expand Down Expand Up @@ -76,7 +76,7 @@ index ce3dc6d9cd66..23553f2249c2 100644
status = "okay";
};
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
index b7c9d4b02751..f4ff1833e5fe 100644
index ccaca20eb10b..8cb3ae91909f 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
@@ -182,6 +182,78 @@ dma: dma-controller@3002000 {
Expand Down Expand Up @@ -158,7 +158,7 @@ index b7c9d4b02751..f4ff1833e5fe 100644
gpu: gpu@1800000 {
compatible = "allwinner,sun50i-h616-mali",
"arm,mali-bifrost";
@@ -475,6 +547,17 @@ gic: interrupt-controller@3021000 {
@@ -439,6 +511,17 @@ gic: interrupt-controller@3021000 {
#interrupt-cells = <3>;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
index e9370c736497..9c86bd19a95d 100644
--- a/drivers/mmc/host/sunxi-mmc.c
+++ b/drivers/mmc/host/sunxi-mmc.c
@@ -1214,6 +1214,13 @@ static const struct sunxi_mmc_cfg sun50i_a100_emmc_cfg = {
@@ -1213,6 +1213,13 @@ static const struct sunxi_mmc_cfg sun50i_a100_emmc_cfg = {
.needs_new_timings = true,
};

Expand All @@ -25,14 +25,14 @@ index e9370c736497..9c86bd19a95d 100644
static const struct of_device_id sunxi_mmc_of_match[] = {
{ .compatible = "allwinner,sun4i-a10-mmc", .data = &sun4i_a10_cfg },
{ .compatible = "allwinner,sun5i-a13-mmc", .data = &sun5i_a13_cfg },
@@ -1225,6 +1232,7 @@ static const struct of_device_id sunxi_mmc_of_match[] = {
@@ -1224,6 +1231,7 @@ static const struct of_device_id sunxi_mmc_of_match[] = {
{ .compatible = "allwinner,sun50i-a64-emmc", .data = &sun50i_a64_emmc_cfg },
{ .compatible = "allwinner,sun50i-a100-mmc", .data = &sun50i_a100_cfg },
{ .compatible = "allwinner,sun50i-a100-mmc", .data = &sun20i_d1_cfg },
{ .compatible = "allwinner,sun50i-a100-emmc", .data = &sun50i_a100_emmc_cfg },
+ { .compatible = "allwinner,sun50i-h5-emmc", .data = &sun50i_h5_emmc_cfg },
{ .compatible = "allwinner,sun50i-h616-mmc", .data = &sun50i_h616_cfg },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, sunxi_mmc_of_match);
--
Armbian

Loading

0 comments on commit 6101719

Please sign in to comment.