From cd6f7087cfab02c9cfb7253f972dca847a4596eb Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Mon, 24 Mar 2025 23:06:33 -0300 Subject: [PATCH] meson64-6.14: rewrite/rebase patches against 6.14 (final) --- .../archive/meson64-6.14/board-odroid-sm1-reset.patch | 8 ++++---- ...2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch | 2 +- .../meson64-6.14/board-t95z-add-rc-remote-keymap.patch | 2 +- .../general-fix-Kodi-sysinfo-CPU-information.patch | 2 +- .../general-input-touchscreen-Add-D-WAV-Multitouch.patch | 4 ++-- ...neral-media-cec-silence-CEC-timeout-message-HACK.patch | 2 +- .../meson64-6.14/general-memory-marked-nomap.patch | 2 +- .../general-spi-nor-add-support-for-XT25F128B.patch | 4 ++-- ...-usb-core-improve-handling-of-hubs-with-no-ports.patch | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/patch/kernel/archive/meson64-6.14/board-odroid-sm1-reset.patch b/patch/kernel/archive/meson64-6.14/board-odroid-sm1-reset.patch index 30a16a6aa..6d388392e 100644 --- a/patch/kernel/archive/meson64-6.14/board-odroid-sm1-reset.patch +++ b/patch/kernel/archive/meson64-6.14/board-odroid-sm1-reset.patch @@ -1,7 +1,7 @@ -From c32d87bcbabb6a22624964c3dce7aabf0467de92 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Sun, 2 Mar 2025 09:02:09 -0500 -Subject: [PATCH] board odroid sm1 reset +Subject: board odroid sm1 reset Add reset and power down support for both ODROID SM1 units. @@ -12,7 +12,7 @@ Signed-off-by: Patrick Yavitz 1 file changed, 10 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi -index 7b0e9817a615..104389b4874e 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi @@ -23,6 +23,16 @@ memory@0 { @@ -33,5 +33,5 @@ index 7b0e9817a615..104389b4874e 100644 compatible = "mmc-pwrseq-emmc"; reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; -- -2.39.5 +Armbian diff --git a/patch/kernel/archive/meson64-6.14/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch b/patch/kernel/archive/meson64-6.14/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch index c6517fd6f..d249e170c 100644 --- a/patch/kernel/archive/meson64-6.14/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch +++ b/patch/kernel/archive/meson64-6.14/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch @@ -19,7 +19,7 @@ diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 111111111111..222222222222 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5967,7 +5967,7 @@ static const struct usb_device_id hub_id_table[] = { +@@ -5977,7 +5977,7 @@ static const struct usb_device_id hub_id_table[] = { | USB_DEVICE_ID_MATCH_INT_CLASS, .idVendor = USB_VENDOR_GENESYS_LOGIC, .bInterfaceClass = USB_CLASS_HUB, diff --git a/patch/kernel/archive/meson64-6.14/board-t95z-add-rc-remote-keymap.patch b/patch/kernel/archive/meson64-6.14/board-t95z-add-rc-remote-keymap.patch index 86ed1796a..873e7917e 100644 --- a/patch/kernel/archive/meson64-6.14/board-t95z-add-rc-remote-keymap.patch +++ b/patch/kernel/archive/meson64-6.14/board-t95z-add-rc-remote-keymap.patch @@ -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 -@@ -1453,6 +1453,8 @@ patternProperties: +@@ -1461,6 +1461,8 @@ patternProperties: description: Sundance DSP Inc. "^sunplus,.*": description: Sunplus Technology Co., Ltd. diff --git a/patch/kernel/archive/meson64-6.14/general-fix-Kodi-sysinfo-CPU-information.patch b/patch/kernel/archive/meson64-6.14/general-fix-Kodi-sysinfo-CPU-information.patch index 927063d9b..91ac9f336 100644 --- a/patch/kernel/archive/meson64-6.14/general-fix-Kodi-sysinfo-CPU-information.patch +++ b/patch/kernel/archive/meson64-6.14/general-fix-Kodi-sysinfo-CPU-information.patch @@ -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 -@@ -207,8 +207,7 @@ static int c_show(struct seq_file *m, void *v) +@@ -222,8 +222,7 @@ static int c_show(struct seq_file *m, void *v) * "processor". Give glibc what it expects. */ seq_printf(m, "processor\t: %d\n", i); diff --git a/patch/kernel/archive/meson64-6.14/general-input-touchscreen-Add-D-WAV-Multitouch.patch b/patch/kernel/archive/meson64-6.14/general-input-touchscreen-Add-D-WAV-Multitouch.patch index 1db64cc4e..d24db3cbb 100644 --- a/patch/kernel/archive/meson64-6.14/general-input-touchscreen-Add-D-WAV-Multitouch.patch +++ b/patch/kernel/archive/meson64-6.14/general-input-touchscreen-Add-D-WAV-Multitouch.patch @@ -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 -@@ -1479,4 +1479,10 @@ +@@ -1483,4 +1483,10 @@ #define USB_VENDOR_ID_SIGNOTEC 0x2133 #define USB_DEVICE_ID_SIGNOTEC_VIEWSONIC_PD1011 0x0018 @@ -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 -@@ -891,6 +891,9 @@ static const struct hid_device_id hid_ignore_list[] = { +@@ -892,6 +892,9 @@ static const struct hid_device_id hid_ignore_list[] = { #endif { 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) }, diff --git a/patch/kernel/archive/meson64-6.14/general-media-cec-silence-CEC-timeout-message-HACK.patch b/patch/kernel/archive/meson64-6.14/general-media-cec-silence-CEC-timeout-message-HACK.patch index 4905e2e4f..2d95dfb3d 100644 --- a/patch/kernel/archive/meson64-6.14/general-media-cec-silence-CEC-timeout-message-HACK.patch +++ b/patch/kernel/archive/meson64-6.14/general-media-cec-silence-CEC-timeout-message-HACK.patch @@ -22,7 +22,7 @@ diff --git a/drivers/media/cec/core/cec-adap.c b/drivers/media/cec/core/cec-adap index 111111111111..222222222222 100644 --- a/drivers/media/cec/core/cec-adap.c +++ b/drivers/media/cec/core/cec-adap.c -@@ -510,9 +510,9 @@ int cec_thread_func(void *_adap) +@@ -511,9 +511,9 @@ int cec_thread_func(void *_adap) * default). */ if (adap->transmitting) { diff --git a/patch/kernel/archive/meson64-6.14/general-memory-marked-nomap.patch b/patch/kernel/archive/meson64-6.14/general-memory-marked-nomap.patch index 99cd4b88c..f6cfcf633 100644 --- a/patch/kernel/archive/meson64-6.14/general-memory-marked-nomap.patch +++ b/patch/kernel/archive/meson64-6.14/general-memory-marked-nomap.patch @@ -17,7 +17,7 @@ diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 111111111111..222222222222 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c -@@ -131,15 +131,6 @@ static int __init early_init_dt_reserve_memory(phys_addr_t base, +@@ -132,15 +132,6 @@ static int __init early_init_dt_reserve_memory(phys_addr_t base, phys_addr_t size, bool nomap) { if (nomap) { diff --git a/patch/kernel/archive/meson64-6.14/general-spi-nor-add-support-for-XT25F128B.patch b/patch/kernel/archive/meson64-6.14/general-spi-nor-add-support-for-XT25F128B.patch index f07637e26..b4c4e24ce 100644 --- a/patch/kernel/archive/meson64-6.14/general-spi-nor-add-support-for-XT25F128B.patch +++ b/patch/kernel/archive/meson64-6.14/general-spi-nor-add-support-for-XT25F128B.patch @@ -46,7 +46,7 @@ diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c index 111111111111..222222222222 100644 --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c -@@ -1980,6 +1980,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = { +@@ -1981,6 +1981,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = { &spi_nor_sst, &spi_nor_winbond, &spi_nor_xmc, @@ -58,7 +58,7 @@ diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h index 111111111111..222222222222 100644 --- a/drivers/mtd/spi-nor/core.h +++ b/drivers/mtd/spi-nor/core.h -@@ -594,6 +594,7 @@ extern const struct spi_nor_manufacturer spi_nor_spansion; +@@ -598,6 +598,7 @@ extern const struct spi_nor_manufacturer spi_nor_spansion; extern const struct spi_nor_manufacturer spi_nor_sst; extern const struct spi_nor_manufacturer spi_nor_winbond; extern const struct spi_nor_manufacturer spi_nor_xmc; diff --git a/patch/kernel/archive/meson64-6.14/general-usb-core-improve-handling-of-hubs-with-no-ports.patch b/patch/kernel/archive/meson64-6.14/general-usb-core-improve-handling-of-hubs-with-no-ports.patch index 9b12a4079..42397c3a3 100644 --- a/patch/kernel/archive/meson64-6.14/general-usb-core-improve-handling-of-hubs-with-no-ports.patch +++ b/patch/kernel/archive/meson64-6.14/general-usb-core-improve-handling-of-hubs-with-no-ports.patch @@ -36,7 +36,7 @@ diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 111111111111..222222222222 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -1475,9 +1475,8 @@ static int hub_configure(struct usb_hub *hub, +@@ -1476,9 +1476,8 @@ static int hub_configure(struct usb_hub *hub, ret = -ENODEV; goto fail; } else if (hub->descriptor->bNbrPorts == 0) {