sunxi-6.12: re-extracting armbian patches

This commit is contained in:
The-going
2025-05-28 15:11:13 +03:00
committed by Igor
parent fa6e4bb2d8
commit 0fbc9e4c6b
8 changed files with 90 additions and 88 deletions

View File

@@ -405,69 +405,3 @@ index 000000000000..e9640439e02c
--
2.35.3
From 428ceff436e4c0e85214085a19d4546ac097f36d Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@armbian.com>
Date: Wed, 14 May 2025 06:57:54 -0400
Subject: [PATCH] BananaPi BPI-M4-Zero: Enable GPU and add Audio nodes
Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>
---
.../allwinner/sun50i-h618-bananapi-m4-zero.dts | 5 +++++
.../dts/allwinner/sun50i-h618-bananapi-m4.dtsi | 18 +++++++++++++++++-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts
index 46e07893c653..12cdbdccf133 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts
@@ -34,6 +34,11 @@ led-0 {
};
};
+/* &codec {
+ status = "okay";
+ allwinner,audio-routing = "Hdmi", "HDMI";
+}; */
+
/* Connected to an on-board RTL8821CU USB WiFi chip. */
&ehci1 {
status = "okay";
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi
index e9640439e02c..6e52232105ae 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi
@@ -80,6 +80,22 @@ wifi_pwrseq: wifi-pwrseq {
};
};
+&ahub_dam_plat {
+ status = "okay";
+};
+
+&ahub1_plat {
+ status = "okay";
+};
+
+&ahub1_mach {
+ status = "okay";
+};
+
+/* &ahub_i2s2 {
+ status = "okay";
+}; */
+
&cpu0 {
cpu-supply = <&reg_dcdc2>;
};
@@ -89,7 +105,7 @@ &de {
};
&gpu {
- status = "disabled";
+ status = "okay";
mali-supply = <&reg_dcdc1>;
};
--
2.39.5

View File

@@ -0,0 +1,66 @@
From f59ab5c108596c2fb936e27a2d571dbee9280849 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@armbian.com>
Date: Wed, 14 May 2025 06:57:54 -0400
Subject: BananaPi BPI-M4-Zero: Enable GPU and add Audio nodes
Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>
---
.../allwinner/sun50i-h618-bananapi-m4-zero.dts | 5 +++++
.../dts/allwinner/sun50i-h618-bananapi-m4.dtsi | 18 +++++++++++++++++-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts
index 46e07893c653..4fef48cceedf 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts
@@ -34,6 +34,11 @@ led-0 {
};
};
+/* &codec {
+ status = "okay";
+ allwinner,audio-routing = "Hdmi", "HDMI";
+}; */
+
/* Connected to an on-board RTL8821CU USB WiFi chip. */
&ehci1 {
status = "okay";
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi
index e9640439e02c..6e52232105ae 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi
@@ -80,6 +80,22 @@ wifi_pwrseq: wifi-pwrseq {
};
};
+&ahub_dam_plat {
+ status = "okay";
+};
+
+&ahub1_plat {
+ status = "okay";
+};
+
+&ahub1_mach {
+ status = "okay";
+};
+
+/* &ahub_i2s2 {
+ status = "okay";
+}; */
+
&cpu0 {
cpu-supply = <&reg_dcdc2>;
};
@@ -89,7 +105,7 @@ &de {
};
&gpu {
- status = "disabled";
+ status = "okay";
mali-supply = <&reg_dcdc1>;
};
--
2.35.3

View File

@@ -1,4 +1,4 @@
From a31dcc88741c4defa78423d697cd7ce4a873a53d Mon Sep 17 00:00:00 2001
From c66d2fed3fda3ef390b3419a3fa20d5903e61047 Mon Sep 17 00:00:00 2001
From: chraac <chraac@gmail.com>
Date: Fri, 16 Aug 2024 16:44:41 +0800
Subject: driver: allwinner h618 emac
@@ -27,7 +27,7 @@ Subject: driver: allwinner h618 emac
create mode 100644 include/linux/mfd/ac200.h
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index 880f1efcaca5..b100204c0344 100644
index 626daedb0169..58e3fc68cc21 100644
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -25,21 +25,6 @@
@@ -52,7 +52,7 @@ index 880f1efcaca5..b100204c0344 100644
/**
* of_gpio_named_count() - Count GPIOs for a device
* @np: device node to count GPIOs for
@@ -426,6 +411,20 @@ static struct gpio_desc *of_get_named_gpiod_flags(const struct device_node *np,
@@ -428,6 +413,20 @@ static struct gpio_desc *of_get_named_gpiod_flags(const struct device_node *np,
return desc;
}

View File

@@ -1,17 +1,17 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 0eb3e020a3a31b3429b74715032ab9f51ae302c4 Mon Sep 17 00:00:00 2001
From: The-going <48602507+The-going@users.noreply.github.com>
Date: Wed, 2 Feb 2022 19:34:55 +0300
Subject: drv:gpu:drm: panel-simple Add compability olinuxino lcd
---
drivers/gpu/drm/panel/panel-simple.c | 125 +++++++++-
drivers/gpu/drm/panel/panel-simple.c | 125 ++++++++++++++++++++++++++-
1 file changed, 121 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
index 111111111111..222222222222 100644
index d041ff542a4e..702a39eb07a6 100644
--- a/drivers/gpu/drm/panel/panel-simple.c
+++ b/drivers/gpu/drm/panel/panel-simple.c
@@ -3496,6 +3496,42 @@ static const struct panel_desc okaya_rs800480t_7x0gp = {
@@ -3497,6 +3497,42 @@ static const struct panel_desc okaya_rs800480t_7x0gp = {
.bus_format = MEDIA_BUS_FMT_RGB666_1X18,
};
@@ -54,7 +54,7 @@ index 111111111111..222222222222 100644
static const struct drm_display_mode olimex_lcd_olinuxino_43ts_mode = {
.clock = 9000,
.hdisplay = 480,
@@ -3508,8 +3544,8 @@ static const struct drm_display_mode olimex_lcd_olinuxino_43ts_mode = {
@@ -3509,8 +3545,8 @@ static const struct drm_display_mode olimex_lcd_olinuxino_43ts_mode = {
.vtotal = 272 + 8 + 5 + 3,
};
@@ -65,7 +65,7 @@ index 111111111111..222222222222 100644
.num_modes = 1,
.size = {
.width = 95,
@@ -3551,6 +3587,72 @@ static const struct panel_desc ontat_kd50g21_40nt_a1 = {
@@ -3552,6 +3588,72 @@ static const struct panel_desc ontat_kd50g21_40nt_a1 = {
.connector_type = DRM_MODE_CONNECTOR_DPI,
};
@@ -138,7 +138,7 @@ index 111111111111..222222222222 100644
/*
* 800x480 CVT. The panel appears to be quite accepting, at least as far as
* pixel clocks, but this is the timing that was being used in the Adafruit
@@ -4936,8 +5038,23 @@ static const struct of_device_id platform_of_match[] = {
@@ -4937,8 +5039,23 @@ static const struct of_device_id platform_of_match[] = {
.compatible = "okaya,rs800480t-7x0gp",
.data = &okaya_rs800480t_7x0gp,
}, {
@@ -165,5 +165,5 @@ index 111111111111..222222222222 100644
.compatible = "ontat,kd50g21-40nt-a1",
.data = &ontat_kd50g21_40nt_a1,
--
Armbian
2.35.3

View File

@@ -1,4 +1,4 @@
From 9adef04ccfa99d86e2168232a7bcb1d2f4e91a2d Mon Sep 17 00:00:00 2001
From 7da6a97c082732673a9ef8a723af9a387e7c6bfd Mon Sep 17 00:00:00 2001
From: The-going <48602507+The-going@users.noreply.github.com>
Date: Wed, 2 Feb 2022 20:08:50 +0300
Subject: drv:usb:gadget:composite rename gadget serial console manufacturer
@@ -10,10 +10,10 @@ to the Armbian brand.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 8402a86176f4..e4532a7d66f3 100644
index 301a435b9ee3..82d415025bd3 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -2777,7 +2777,7 @@ EXPORT_SYMBOL_GPL(usb_composite_setup_continue);
@@ -2775,7 +2775,7 @@ EXPORT_SYMBOL_GPL(usb_composite_setup_continue);
static char *composite_default_mfr(struct usb_gadget *gadget)
{

View File

@@ -1,4 +1,4 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 2c3908734d217b36125755d8785138c824558dc9 Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
Date: Sun, 26 Jul 2020 02:38:31 +0200
Subject: net: usb: r8152: add LED configuration from OF
@@ -9,11 +9,11 @@ be determined.
Signed-off-by: David Bauer <mail@david-bauer.net>
---
drivers/net/usb/r8152.c | 23 ++++++++++
drivers/net/usb/r8152.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 111111111111..222222222222 100644
index 96fa3857d8e2..08f353953bbd 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -12,6 +12,7 @@
@@ -24,7 +24,7 @@ index 111111111111..222222222222 100644
#include <linux/crc32.h>
#include <linux/if_vlan.h>
#include <linux/uaccess.h>
@@ -7046,6 +7047,22 @@ static void rtl_tally_reset(struct r8152 *tp)
@@ -7047,6 +7048,22 @@ static void rtl_tally_reset(struct r8152 *tp)
ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data);
}
@@ -47,7 +47,7 @@ index 111111111111..222222222222 100644
static void r8152b_init(struct r8152 *tp)
{
u32 ocp_data;
@@ -7087,6 +7104,8 @@ static void r8152b_init(struct r8152 *tp)
@@ -7088,6 +7105,8 @@ static void r8152b_init(struct r8152 *tp)
ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);
ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
@@ -56,7 +56,7 @@ index 111111111111..222222222222 100644
}
static void r8153_init(struct r8152 *tp)
@@ -7227,6 +7246,8 @@ static void r8153_init(struct r8152 *tp)
@@ -7228,6 +7247,8 @@ static void r8153_init(struct r8152 *tp)
tp->coalesce = COALESCE_SLOW;
break;
}
@@ -65,7 +65,7 @@ index 111111111111..222222222222 100644
}
static void r8153b_init(struct r8152 *tp)
@@ -7309,6 +7330,8 @@ static void r8153b_init(struct r8152 *tp)
@@ -7310,6 +7331,8 @@ static void r8153b_init(struct r8152 *tp)
rtl_tally_reset(tp);
tp->coalesce = 15000; /* 15 us */
@@ -75,5 +75,5 @@ index 111111111111..222222222222 100644
static void r8153c_init(struct r8152 *tp)
--
Armbian
2.35.3

View File

@@ -173,6 +173,7 @@
patches.armbian/ARM64-dts-sun50i-h616-BigTreeTech-CB1-Enable-EMAC1.patch
patches.armbian/arm64-dts-sun50i-h313-x96q-lpddr3.patch
patches.armbian/Add-board-BananaPi-BPI-M4-Zero.patch
patches.armbian/BananaPi-BPI-M4-Zero-Enable-GPU-and-add-Audio-nodes.patch
patches.armbian/Add-BananaPi-BPI-M4-Zero-pinctrl.patch
patches.armbian/Add-BananaPi-BPI-M4-Zero-overlays.patch
patches.armbian/Fix-ghost-touches-on-tsc2007-tft-screen.patch

View File

@@ -469,6 +469,7 @@
patches.armbian/ARM64-dts-sun50i-h616-BigTreeTech-CB1-Enable-EMAC1.patch
patches.armbian/arm64-dts-sun50i-h313-x96q-lpddr3.patch
patches.armbian/Add-board-BananaPi-BPI-M4-Zero.patch
patches.armbian/BananaPi-BPI-M4-Zero-Enable-GPU-and-add-Audio-nodes.patch
patches.armbian/Add-BananaPi-BPI-M4-Zero-pinctrl.patch
patches.armbian/Add-BananaPi-BPI-M4-Zero-overlays.patch
patches.armbian/Fix-ghost-touches-on-tsc2007-tft-screen.patch