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

meson64-6.17: rewrite/rebase against v6.17.1, no changes

Browse Source
This commit is contained in:
Ricardo Pardini 2025-10-09 21:07:25 +02:00 committed by Igor
parent 06675ca040
commit cd6c09b07a
10 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patch/kernel/archive/meson64-6.17/board-t95z-add-rc-remote-keymap.patch
View File

@ -34,7 +34,7 @@ diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentat
index 111111111111..222222222222 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@ -1483,6 +1483,8 @@ patternProperties:
@@ -1504,6 +1504,8 @@ patternProperties:
description: Sundance DSP Inc.
"^sunplus,.*":
description: Sunplus Technology Co., Ltd.

6
patch/kernel/archive/meson64-6.17/driver-power-meson64-reset.patch
View File

@ -13,7 +13,7 @@ diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
index 111111111111..222222222222 100644
--- a/drivers/power/reset/Kconfig
+++ b/drivers/power/reset/Kconfig
@@ -159,6 +159,13 @@ config POWER_RESET_ODROID_GO_ULTRA_POWEROFF
@@ -168,6 +168,13 @@ config POWER_RESET_ODROID_GO_ULTRA_POWEROFF
help
This driver supports Power off for Odroid Go Ultra device.
@ -31,8 +31,8 @@ diff --git a/drivers/power/reset/Makefile b/drivers/power/reset/Makefile
index 111111111111..222222222222 100644
--- a/drivers/power/reset/Makefile
+++ b/drivers/power/reset/Makefile
@@ -15,6 +15,7 @@ obj-$(CONFIG_POWER_RESET_HISI) += hisi-reboot.o
obj-$(CONFIG_POWER_RESET_LINKSTATION) += linkstation-poweroff.o
@@ -16,6 +16,7 @@ obj-$(CONFIG_POWER_RESET_LINKSTATION) += linkstation-poweroff.o
obj-$(CONFIG_POWER_RESET_MACSMC) += macsmc-reboot.o
obj-$(CONFIG_POWER_RESET_MSM) += msm-poweroff.o
obj-$(CONFIG_POWER_RESET_MT6323) += mt6323-poweroff.o
+obj-$(CONFIG_POWER_RESET_MESON64) += meson64-reboot.o

2
patch/kernel/archive/meson64-6.17/drv-spi-spidev-remove-warnings.patch
View File

@ -9,7 +9,7 @@ Signed-off-by: John Doe <john.doe@somewhere.on.planet>
1 file changed, 2 insertions(+)
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index 5300c942a2a4..67e802d5419d 100644
index 111111111111..222222222222 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -703,6 +703,7 @@ static const struct class spidev_class = {

2
patch/kernel/archive/meson64-6.17/general-drm-dw-hdmi-call-hdmi_set_cts_n-after-clock.patch
View File

@ -13,7 +13,7 @@ diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -765,6 +765,11 @@ static void hdmi_enable_audio_clk(struct dw_hdmi *hdmi, bool enable)
@@ -766,6 +766,11 @@ static void hdmi_enable_audio_clk(struct dw_hdmi *hdmi, bool enable)
else
hdmi->mc_clkdis |= HDMI_MC_CLKDIS_AUDCLK_DISABLE;
hdmi_writeb(hdmi, hdmi->mc_clkdis, HDMI_MC_CLKDIS);

2
patch/kernel/archive/meson64-6.17/general-fix-Kodi-sysinfo-CPU-information.patch
View File

@ -16,7 +16,7 @@ diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
index 111111111111..222222222222 100644
--- a/arch/arm64/kernel/cpuinfo.c
+++ b/arch/arm64/kernel/cpuinfo.c
@@ -221,9 +221,8 @@ static int c_show(struct seq_file *m, void *v)
@@ -223,9 +223,8 @@ static int c_show(struct seq_file *m, void *v)
* "processor". Give glibc what it expects.
*/
seq_printf(m, "processor\t: %d\n", cpu);

4
patch/kernel/archive/meson64-6.17/general-input-touchscreen-Add-D-WAV-Multitouch.patch
View File

@ -16,7 +16,7 @@ diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 111111111111..222222222222 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -1536,4 +1536,10 @@
@@ -1540,4 +1540,10 @@
#define USB_VENDOR_ID_SMARTLINKTECHNOLOGY 0x4c4a
#define USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155 0x4155
@ -31,7 +31,7 @@ diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index 111111111111..222222222222 100644
--- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@ -911,6 +911,8 @@ static const struct hid_device_id hid_ignore_list[] = {
@@ -912,6 +912,8 @@ static const struct hid_device_id hid_ignore_list[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_HP_5MP_CAMERA_5473) },
{ HID_USB_DEVICE(USB_VENDOR_ID_SMARTLINKTECHNOLOGY, USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155) },

10
patch/kernel/archive/meson64-6.17/hwmon-emc2305-fixups-for-driver.patch
View File

@ -1,7 +1,7 @@
From 0d77bfb43c27fd94f58f4d6981839aee290dd694 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.com>
Date: Sat, 16 Aug 2025 20:34:59 -0400
Subject: [PATCH] hwmon: emc2305: fixups for driver submitted to mailing lists
Subject: hwmon: emc2305: fixups for driver submitted to mailing lists
The driver had a number of issues, checkpatch warnings/errors,
and other limitations, so fix these up to make it usable.
@ -33,11 +33,11 @@ As this is all downstream only, revert to u8 to match 5.15.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
---
drivers/hwmon/emc2305.c | 111 ++++++++++++++++++++++++++++++++++++++--
drivers/hwmon/emc2305.c | 111 +++++++++-
1 file changed, 107 insertions(+), 4 deletions(-)
diff --git a/drivers/hwmon/emc2305.c b/drivers/hwmon/emc2305.c
index 60809289f816..66ba8800970c 100644
index 111111111111..222222222222 100644
--- a/drivers/hwmon/emc2305.c
+++ b/drivers/hwmon/emc2305.c
@@ -15,12 +15,13 @@
@ -260,5 +260,5 @@ index 60809289f816..66ba8800970c 100644
};
--
2.43.0
Armbian

8
patch/kernel/archive/meson64-6.17/jethome-0001-Fix-meson64-add-gpio-irq-patch-from-https-lkml.org-l.patch
View File

@ -9,12 +9,12 @@ Subject: Fix: meson64: add gpio irq (patch from
Signed-off-by: retro98boy <retro98boy@qq.com>
Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
---
drivers/pinctrl/meson/pinctrl-meson.c | 41 +++++++++++++++++++++++++++
drivers/pinctrl/meson/pinctrl-meson.c | 41 ++++++++++
drivers/pinctrl/meson/pinctrl-meson.h | 1 +
2 files changed, 42 insertions(+)
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
index 277e9c40490d7..7876332aedf70 100644
index 111111111111..222222222222 100644
--- a/drivers/pinctrl/meson/pinctrl-meson.c
+++ b/drivers/pinctrl/meson/pinctrl-meson.c
@@ -51,6 +51,7 @@
@ -87,7 +87,7 @@ index 277e9c40490d7..7876332aedf70 100644
if (IS_ERR_OR_NULL(pc->reg_mux)) {
dev_err(pc->dev, "mux registers not found\n");
diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h
index 7883ea31a001a..049377342649c 100644
index 111111111111..222222222222 100644
--- a/drivers/pinctrl/meson/pinctrl-meson.h
+++ b/drivers/pinctrl/meson/pinctrl-meson.h
@@ -134,6 +134,7 @@ struct meson_pinctrl {
@ -99,5 +99,5 @@ index 7883ea31a001a..049377342649c 100644
#define FUNCTION(fn) \
--
2.51.0
Armbian

6
patch/kernel/archive/meson64-6.17/meson-g12a-pinctrl-add-missing-ir-options.patch
View File

@ -59,7 +59,7 @@ index 111111111111..222222222222 100644
/* uart_a */
static const unsigned int uart_a_tx_pins[] = { GPIOX_12 };
static const unsigned int uart_a_rx_pins[] = { GPIOX_13 };
@@ -737,6 +740,7 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = {
@@ -753,6 +756,7 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = {
/* bank GPIOA */
GROUP(i2c3_sda_a, 2),
GROUP(i2c3_sck_a, 2),
@ -67,7 +67,7 @@ index 111111111111..222222222222 100644
GROUP(pdm_din0_a, 1),
GROUP(pdm_din1_a, 1),
GROUP(pdm_din2_a, 1),
@@ -1022,6 +1026,10 @@ static const char * const i2c3_groups[] = {
@@ -1038,6 +1042,10 @@ static const char * const i2c3_groups[] = {
"i2c3_sda_a", "i2c3_sck_a",
};
@ -78,7 +78,7 @@ index 111111111111..222222222222 100644
static const char * const uart_a_groups[] = {
"uart_a_tx", "uart_a_rx", "uart_a_cts", "uart_a_rts",
};
@@ -1266,6 +1274,7 @@ static const struct meson_pmx_func meson_g12a_periphs_functions[] = {
@@ -1282,6 +1290,7 @@ static const struct meson_pmx_func meson_g12a_periphs_functions[] = {
FUNCTION(i2c1),
FUNCTION(i2c2),
FUNCTION(i2c3),

12
patch/kernel/archive/meson64-6.17/meson-g12b-dt-Add-missing-pinmux-node-for-pwm.patch
View File

@ -1,16 +1,16 @@
From 3f936558703991a4a820f3efd9b40ca5d586dd21 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: retro98boy <retro98boy@qq.com>
Date: Wed, 8 Oct 2025 19:06:53 +0800
Subject: [PATCH] arm64: dts: amlogic: Add several missing g12b pinmux node for
pwm functions
Subject: arm64: dts: amlogic: Add several missing g12b pinmux node for pwm
functions
Related commits: https://github.com/torvalds/linux/commit/b58ea88d301cd4c0403f298468442dacac4f8c4e
---
arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 42 +++++++++++++++++++++
arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 42 ++++++++++
1 file changed, 42 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
index 86e6ceb31..067820380 100644
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
@@ -149,3 +149,45 @@ &pmu {
@ -60,5 +60,5 @@ index 86e6ceb31..067820380 100644
+ };
+};
--
2.51.0
Armbian