Skip to content

Commit b6071b4

Browse files
committed
meson64-6.17: rewrite/rebase against v6.17.1, no changes
1 parent 5502625 commit b6071b4

10 files changed

+28
-28
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentat
3434
index 111111111111..222222222222 100644
3535
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
3636
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
37-
@@ -1483,6 +1483,8 @@ patternProperties:
37+
@@ -1504,6 +1504,8 @@ patternProperties:
3838
description: Sundance DSP Inc.
3939
"^sunplus,.*":
4040
description: Sunplus Technology Co., Ltd.

patch/kernel/archive/meson64-6.17/driver-power-meson64-reset.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
1313
index 111111111111..222222222222 100644
1414
--- a/drivers/power/reset/Kconfig
1515
+++ b/drivers/power/reset/Kconfig
16-
@@ -159,6 +159,13 @@ config POWER_RESET_ODROID_GO_ULTRA_POWEROFF
16+
@@ -168,6 +168,13 @@ config POWER_RESET_ODROID_GO_ULTRA_POWEROFF
1717
help
1818
This driver supports Power off for Odroid Go Ultra device.
1919

@@ -31,8 +31,8 @@ diff --git a/drivers/power/reset/Makefile b/drivers/power/reset/Makefile
3131
index 111111111111..222222222222 100644
3232
--- a/drivers/power/reset/Makefile
3333
+++ b/drivers/power/reset/Makefile
34-
@@ -15,6 +15,7 @@ obj-$(CONFIG_POWER_RESET_HISI) += hisi-reboot.o
35-
obj-$(CONFIG_POWER_RESET_LINKSTATION) += linkstation-poweroff.o
34+
@@ -16,6 +16,7 @@ obj-$(CONFIG_POWER_RESET_LINKSTATION) += linkstation-poweroff.o
35+
obj-$(CONFIG_POWER_RESET_MACSMC) += macsmc-reboot.o
3636
obj-$(CONFIG_POWER_RESET_MSM) += msm-poweroff.o
3737
obj-$(CONFIG_POWER_RESET_MT6323) += mt6323-poweroff.o
3838
+obj-$(CONFIG_POWER_RESET_MESON64) += meson64-reboot.o

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Signed-off-by: John Doe <john.doe@somewhere.on.planet>
99
1 file changed, 2 insertions(+)
1010

1111
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
12-
index 5300c942a2a4..67e802d5419d 100644
12+
index 111111111111..222222222222 100644
1313
--- a/drivers/spi/spidev.c
1414
+++ b/drivers/spi/spidev.c
1515
@@ -703,6 +703,7 @@ static const struct class spidev_class = {
@@ -22,7 +22,7 @@ index 5300c942a2a4..67e802d5419d 100644
2222
{ .name = /* dh */ "dhcom-board" },
2323
@@ -736,6 +737,7 @@ static int spidev_of_check(struct device *dev)
2424
}
25-
25+
2626
static const struct of_device_id spidev_dt_ids[] = {
2727
+ { .compatible = "armbian,spi-dev", .data = &spidev_of_check },
2828
{ .compatible = "abb,spi-sensor", .data = &spidev_of_check },

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/
1313
index 111111111111..222222222222 100644
1414
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
1515
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
16-
@@ -765,6 +765,11 @@ static void hdmi_enable_audio_clk(struct dw_hdmi *hdmi, bool enable)
16+
@@ -766,6 +766,11 @@ static void hdmi_enable_audio_clk(struct dw_hdmi *hdmi, bool enable)
1717
else
1818
hdmi->mc_clkdis |= HDMI_MC_CLKDIS_AUDCLK_DISABLE;
1919
hdmi_writeb(hdmi, hdmi->mc_clkdis, HDMI_MC_CLKDIS);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
1616
index 111111111111..222222222222 100644
1717
--- a/arch/arm64/kernel/cpuinfo.c
1818
+++ b/arch/arm64/kernel/cpuinfo.c
19-
@@ -221,9 +221,8 @@ static int c_show(struct seq_file *m, void *v)
19+
@@ -223,9 +223,8 @@ static int c_show(struct seq_file *m, void *v)
2020
* "processor". Give glibc what it expects.
2121
*/
2222
seq_printf(m, "processor\t: %d\n", cpu);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
1616
index 111111111111..222222222222 100644
1717
--- a/drivers/hid/hid-ids.h
1818
+++ b/drivers/hid/hid-ids.h
19-
@@ -1536,4 +1536,10 @@
19+
@@ -1540,4 +1540,10 @@
2020
#define USB_VENDOR_ID_SMARTLINKTECHNOLOGY 0x4c4a
2121
#define USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155 0x4155
2222

@@ -31,7 +31,7 @@ diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
3131
index 111111111111..222222222222 100644
3232
--- a/drivers/hid/hid-quirks.c
3333
+++ b/drivers/hid/hid-quirks.c
34-
@@ -911,6 +911,8 @@ static const struct hid_device_id hid_ignore_list[] = {
34+
@@ -912,6 +912,8 @@ static const struct hid_device_id hid_ignore_list[] = {
3535
{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
3636
{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_HP_5MP_CAMERA_5473) },
3737
{ HID_USB_DEVICE(USB_VENDOR_ID_SMARTLINKTECHNOLOGY, USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155) },

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 0d77bfb43c27fd94f58f4d6981839aee290dd694 Mon Sep 17 00:00:00 2001
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Phil Elwell <phil@raspberrypi.com>
33
Date: Sat, 16 Aug 2025 20:34:59 -0400
4-
Subject: [PATCH] hwmon: emc2305: fixups for driver submitted to mailing lists
4+
Subject: hwmon: emc2305: fixups for driver submitted to mailing lists
55

66
The driver had a number of issues, checkpatch warnings/errors,
77
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.
3333

3434
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
3535
---
36-
drivers/hwmon/emc2305.c | 111 ++++++++++++++++++++++++++++++++++++++--
36+
drivers/hwmon/emc2305.c | 111 +++++++++-
3737
1 file changed, 107 insertions(+), 4 deletions(-)
3838

3939
diff --git a/drivers/hwmon/emc2305.c b/drivers/hwmon/emc2305.c
40-
index 60809289f816..66ba8800970c 100644
40+
index 111111111111..222222222222 100644
4141
--- a/drivers/hwmon/emc2305.c
4242
+++ b/drivers/hwmon/emc2305.c
4343
@@ -15,12 +15,13 @@
@@ -260,5 +260,5 @@ index 60809289f816..66ba8800970c 100644
260260
};
261261

262262
--
263-
2.43.0
263+
Armbian
264264

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ Subject: Fix: meson64: add gpio irq (patch from
99
Signed-off-by: retro98boy <retro98boy@qq.com>
1010
Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
1111
---
12-
drivers/pinctrl/meson/pinctrl-meson.c | 41 +++++++++++++++++++++++++++
12+
drivers/pinctrl/meson/pinctrl-meson.c | 41 ++++++++++
1313
drivers/pinctrl/meson/pinctrl-meson.h | 1 +
1414
2 files changed, 42 insertions(+)
1515

1616
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
17-
index 277e9c40490d7..7876332aedf70 100644
17+
index 111111111111..222222222222 100644
1818
--- a/drivers/pinctrl/meson/pinctrl-meson.c
1919
+++ b/drivers/pinctrl/meson/pinctrl-meson.c
2020
@@ -51,6 +51,7 @@
@@ -87,7 +87,7 @@ index 277e9c40490d7..7876332aedf70 100644
8787
if (IS_ERR_OR_NULL(pc->reg_mux)) {
8888
dev_err(pc->dev, "mux registers not found\n");
8989
diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h
90-
index 7883ea31a001a..049377342649c 100644
90+
index 111111111111..222222222222 100644
9191
--- a/drivers/pinctrl/meson/pinctrl-meson.h
9292
+++ b/drivers/pinctrl/meson/pinctrl-meson.h
9393
@@ -134,6 +134,7 @@ struct meson_pinctrl {
@@ -99,5 +99,5 @@ index 7883ea31a001a..049377342649c 100644
9999

100100
#define FUNCTION(fn) \
101101
--
102-
2.51.0
102+
Armbian
103103

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ index 111111111111..222222222222 100644
5959
/* uart_a */
6060
static const unsigned int uart_a_tx_pins[] = { GPIOX_12 };
6161
static const unsigned int uart_a_rx_pins[] = { GPIOX_13 };
62-
@@ -737,6 +740,7 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = {
62+
@@ -753,6 +756,7 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = {
6363
/* bank GPIOA */
6464
GROUP(i2c3_sda_a, 2),
6565
GROUP(i2c3_sck_a, 2),
6666
+ GROUP(remote_input, 1),
6767
GROUP(pdm_din0_a, 1),
6868
GROUP(pdm_din1_a, 1),
6969
GROUP(pdm_din2_a, 1),
70-
@@ -1022,6 +1026,10 @@ static const char * const i2c3_groups[] = {
70+
@@ -1038,6 +1042,10 @@ static const char * const i2c3_groups[] = {
7171
"i2c3_sda_a", "i2c3_sck_a",
7272
};
7373

@@ -78,7 +78,7 @@ index 111111111111..222222222222 100644
7878
static const char * const uart_a_groups[] = {
7979
"uart_a_tx", "uart_a_rx", "uart_a_cts", "uart_a_rts",
8080
};
81-
@@ -1266,6 +1274,7 @@ static const struct meson_pmx_func meson_g12a_periphs_functions[] = {
81+
@@ -1282,6 +1290,7 @@ static const struct meson_pmx_func meson_g12a_periphs_functions[] = {
8282
FUNCTION(i2c1),
8383
FUNCTION(i2c2),
8484
FUNCTION(i2c3),

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
From 3f936558703991a4a820f3efd9b40ca5d586dd21 Mon Sep 17 00:00:00 2001
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: retro98boy <retro98boy@qq.com>
33
Date: Wed, 8 Oct 2025 19:06:53 +0800
4-
Subject: [PATCH] arm64: dts: amlogic: Add several missing g12b pinmux node for
5-
pwm functions
4+
Subject: arm64: dts: amlogic: Add several missing g12b pinmux node for pwm
5+
functions
66

77
Related commits: https://github.com/torvalds/linux/commit/b58ea88d301cd4c0403f298468442dacac4f8c4e
88
---
9-
arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 42 +++++++++++++++++++++
9+
arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 42 ++++++++++
1010
1 file changed, 42 insertions(+)
1111

1212
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
13-
index 86e6ceb31..067820380 100644
13+
index 111111111111..222222222222 100644
1414
--- a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
1515
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
1616
@@ -149,3 +149,45 @@ &pmu {
@@ -60,5 +60,5 @@ index 86e6ceb31..067820380 100644
6060
+ };
6161
+};
6262
--
63-
2.51.0
63+
Armbian
6464

0 commit comments

Comments
 (0)