From 671270edd9b3b00318f75e2b59b66cccd91217b8 Mon Sep 17 00:00:00 2001 From: EvilOlaf Date: Mon, 22 Dec 2025 12:51:38 +0000 Subject: [PATCH] meson64-6.19: rewrite patches against 6.19-rc2 --- ...sable-autosuspend-for-Genesys-Logic-.patch | 2 +- .../board-t95z-add-rc-remote-keymap.patch | 2 +- .../drv-spi-spidev-remove-warnings.patch | 6 ++--- ...eral-add-overlay-compilation-support.patch | 2 +- ...hdmi-call-hdmi_set_cts_n-after-clock.patch | 2 +- ...put-touchscreen-Add-D-WAV-Multitouch.patch | 2 +- ...aiu-Fix-HDMI-codec-control-selection.patch | 7 +++--- ...n-gx-socinfo-move-common-code-to-hea.patch | 18 ++++++--------- ...amlogic-amlogic-meson-gx-ao-secure-a.patch | 2 +- ...al-spi-nor-add-support-for-XT25F128B.patch | 2 +- ...prove-handling-of-hubs-with-no-ports.patch | 2 +- .../hwmon-emc2305-fixups-for-driver.patch | 4 ++-- ...s-links-to-secure-monitor-for-jethub.patch | 23 +++++++++---------- 13 files changed, 34 insertions(+), 40 deletions(-) diff --git a/patch/kernel/archive/meson64-6.19/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch b/patch/kernel/archive/meson64-6.19/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch index d2c1b43dcc..d1f9521b22 100644 --- a/patch/kernel/archive/meson64-6.19/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch +++ b/patch/kernel/archive/meson64-6.19/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 -@@ -6014,7 +6014,7 @@ static const struct usb_device_id hub_id_table[] = { +@@ -6015,7 +6015,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.19/board-t95z-add-rc-remote-keymap.patch b/patch/kernel/archive/meson64-6.19/board-t95z-add-rc-remote-keymap.patch index 21ddcf9d67..e4e7a2a740 100644 --- a/patch/kernel/archive/meson64-6.19/board-t95z-add-rc-remote-keymap.patch +++ b/patch/kernel/archive/meson64-6.19/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 -@@ -1560,6 +1560,8 @@ patternProperties: +@@ -1580,6 +1580,8 @@ patternProperties: description: Sundance DSP Inc. "^sunplus,.*": description: Sunplus Technology Co., Ltd. diff --git a/patch/kernel/archive/meson64-6.19/drv-spi-spidev-remove-warnings.patch b/patch/kernel/archive/meson64-6.19/drv-spi-spidev-remove-warnings.patch index 32495a9e3f..d5a9eb30ad 100644 --- a/patch/kernel/archive/meson64-6.19/drv-spi-spidev-remove-warnings.patch +++ b/patch/kernel/archive/meson64-6.19/drv-spi-spidev-remove-warnings.patch @@ -18,16 +18,16 @@ index 111111111111..222222222222 100644 static const struct spi_device_id spidev_spi_ids[] = { + { .name = "spi-dev" }, { .name = /* abb */ "spi-sensor" }, + { .name = /* arduino */ "unoq-mcu" }, { .name = /* cisco */ "spi-petra" }, - { .name = /* dh */ "dhcom-board" }, -@@ -736,6 +737,7 @@ static int spidev_of_check(struct device *dev) +@@ -737,6 +738,7 @@ static int spidev_of_check(struct device *dev) } static const struct of_device_id spidev_dt_ids[] = { + { .compatible = "armbian,spi-dev", .data = &spidev_of_check }, { .compatible = "abb,spi-sensor", .data = &spidev_of_check }, + { .compatible = "arduino,unoq-mcu", .data = &spidev_of_check }, { .compatible = "cisco,spi-petra", .data = &spidev_of_check }, - { .compatible = "dh,dhcom-board", .data = &spidev_of_check }, -- Armbian diff --git a/patch/kernel/archive/meson64-6.19/general-add-overlay-compilation-support.patch b/patch/kernel/archive/meson64-6.19/general-add-overlay-compilation-support.patch index 75b5b3dd70..bffc0b1a7b 100644 --- a/patch/kernel/archive/meson64-6.19/general-add-overlay-compilation-support.patch +++ b/patch/kernel/archive/meson64-6.19/general-add-overlay-compilation-support.patch @@ -36,7 +36,7 @@ diff --git a/scripts/Makefile.dtbs b/scripts/Makefile.dtbs index 111111111111..222222222222 100644 --- a/scripts/Makefile.dtbs +++ b/scripts/Makefile.dtbs -@@ -123,17 +123,23 @@ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp) +@@ -132,17 +132,23 @@ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp) quiet_cmd_dtc = DTC $(quiet_dtb_check_tag) $@ cmd_dtc = \ $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ diff --git a/patch/kernel/archive/meson64-6.19/general-drm-dw-hdmi-call-hdmi_set_cts_n-after-clock.patch b/patch/kernel/archive/meson64-6.19/general-drm-dw-hdmi-call-hdmi_set_cts_n-after-clock.patch index ca56032ff3..9f44feada9 100644 --- a/patch/kernel/archive/meson64-6.19/general-drm-dw-hdmi-call-hdmi_set_cts_n-after-clock.patch +++ b/patch/kernel/archive/meson64-6.19/general-drm-dw-hdmi-call-hdmi_set_cts_n-after-clock.patch @@ -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 -@@ -766,6 +766,11 @@ static void hdmi_enable_audio_clk(struct dw_hdmi *hdmi, bool enable) +@@ -781,6 +781,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); diff --git a/patch/kernel/archive/meson64-6.19/general-input-touchscreen-Add-D-WAV-Multitouch.patch b/patch/kernel/archive/meson64-6.19/general-input-touchscreen-Add-D-WAV-Multitouch.patch index f7d94fcc1c..2ad97cef63 100644 --- a/patch/kernel/archive/meson64-6.19/general-input-touchscreen-Add-D-WAV-Multitouch.patch +++ b/patch/kernel/archive/meson64-6.19/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 -@@ -1548,4 +1548,10 @@ +@@ -1553,4 +1553,10 @@ #define USB_VENDOR_ID_JIELI_SDK_DEFAULT 0x4c4a #define USB_DEVICE_ID_JIELI_SDK_4155 0x4155 diff --git a/patch/kernel/archive/meson64-6.19/general-meson-aiu-Fix-HDMI-codec-control-selection.patch b/patch/kernel/archive/meson64-6.19/general-meson-aiu-Fix-HDMI-codec-control-selection.patch index 70d874407f..4eb413ba64 100644 --- a/patch/kernel/archive/meson64-6.19/general-meson-aiu-Fix-HDMI-codec-control-selection.patch +++ b/patch/kernel/archive/meson64-6.19/general-meson-aiu-Fix-HDMI-codec-control-selection.patch @@ -62,7 +62,7 @@ diff --git a/sound/soc/meson/aiu-codec-ctrl.c b/sound/soc/meson/aiu-codec-ctrl.c index 111111111111..222222222222 100644 --- a/sound/soc/meson/aiu-codec-ctrl.c +++ b/sound/soc/meson/aiu-codec-ctrl.c -@@ -12,14 +12,60 @@ +@@ -12,59 +12,111 @@ #include "aiu.h" #include "meson-codec-glue.h" @@ -129,9 +129,8 @@ index 111111111111..222222222222 100644 static int aiu_codec_ctrl_mux_put_enum(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { -@@ -28,45 +74,51 @@ static int aiu_codec_ctrl_mux_put_enum(struct snd_kcontrol *kcontrol, - struct snd_soc_dapm_context *dapm = - snd_soc_dapm_kcontrol_dapm(kcontrol); + struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol); + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol); struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; - unsigned int mux, changed; + unsigned int mux, ctrl, more; diff --git a/patch/kernel/archive/meson64-6.19/general-soc-0001-soc-amlogic-meson-gx-socinfo-move-common-code-to-hea.patch b/patch/kernel/archive/meson64-6.19/general-soc-0001-soc-amlogic-meson-gx-socinfo-move-common-code-to-hea.patch index 1d5669baba..5c818baf7a 100644 --- a/patch/kernel/archive/meson64-6.19/general-soc-0001-soc-amlogic-meson-gx-socinfo-move-common-code-to-hea.patch +++ b/patch/kernel/archive/meson64-6.19/general-soc-0001-soc-amlogic-meson-gx-socinfo-move-common-code-to-hea.patch @@ -9,8 +9,8 @@ to header file. Create new structures for store meson64 cpu_id and chip_id. Signed-off-by: Viacheslav Bocharov --- drivers/soc/amlogic/meson-gx-socinfo-internal.h | 132 ++++++++ - drivers/soc/amlogic/meson-gx-socinfo.c | 150 +--------- - 2 files changed, 147 insertions(+), 135 deletions(-) + drivers/soc/amlogic/meson-gx-socinfo.c | 156 +--------- + 2 files changed, 147 insertions(+), 141 deletions(-) diff --git a/drivers/soc/amlogic/meson-gx-socinfo-internal.h b/drivers/soc/amlogic/meson-gx-socinfo-internal.h new file mode 100644 @@ -164,9 +164,7 @@ index 111111111111..222222222222 100644 */ #include -@@ -13,137 +13,11 @@ - #include - #include +@@ -15,133 +15,7 @@ #include #include #include @@ -301,9 +299,7 @@ index 111111111111..222222222222 100644 static int __init meson_gx_socinfo_init(void) { - struct soc_device_attribute *soc_dev_attr; - struct soc_device *soc_dev; -@@ -143,7 +23,7 @@ static int __init meson_gx_socinfo_init(void) +@@ -149,7 +23,7 @@ static int __init meson_gx_socinfo_init(void) struct soc_device *soc_dev; struct device_node *np; struct regmap *regmap; @@ -312,7 +308,7 @@ index 111111111111..222222222222 100644 struct device *dev; int ret; -@@ -172,11 +52,11 @@ static int __init meson_gx_socinfo_init(void) +@@ -178,11 +52,11 @@ static int __init meson_gx_socinfo_init(void) return -ENODEV; } @@ -326,7 +322,7 @@ index 111111111111..222222222222 100644 pr_err("%s: invalid chipid value\n", __func__); return -EINVAL; } -@@ -187,13 +67,13 @@ static int __init meson_gx_socinfo_init(void) +@@ -193,13 +67,13 @@ static int __init meson_gx_socinfo_init(void) soc_dev_attr->family = "Amlogic Meson"; soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%x:%x - %x:%x", @@ -346,7 +342,7 @@ index 111111111111..222222222222 100644 soc_dev = soc_device_register(soc_dev_attr); if (IS_ERR(soc_dev)) { -@@ -206,10 +86,10 @@ static int __init meson_gx_socinfo_init(void) +@@ -212,10 +86,10 @@ static int __init meson_gx_socinfo_init(void) dev_info(dev, "Amlogic Meson %s Revision %x:%x (%x:%x) Detected\n", soc_dev_attr->soc_id, diff --git a/patch/kernel/archive/meson64-6.19/general-soc-0003-dt-bindings-arm-amlogic-amlogic-meson-gx-ao-secure-a.patch b/patch/kernel/archive/meson64-6.19/general-soc-0003-dt-bindings-arm-amlogic-amlogic-meson-gx-ao-secure-a.patch index 71f842c1df..adbcde2d9c 100644 --- a/patch/kernel/archive/meson64-6.19/general-soc-0003-dt-bindings-arm-amlogic-amlogic-meson-gx-ao-secure-a.patch +++ b/patch/kernel/archive/meson64-6.19/general-soc-0003-dt-bindings-arm-amlogic-amlogic-meson-gx-ao-secure-a.patch @@ -15,7 +15,7 @@ diff --git a/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-s index 111111111111..222222222222 100644 --- a/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml -@@ -40,6 +40,10 @@ properties: +@@ -43,6 +43,10 @@ properties: reg: maxItems: 1 diff --git a/patch/kernel/archive/meson64-6.19/general-spi-nor-add-support-for-XT25F128B.patch b/patch/kernel/archive/meson64-6.19/general-spi-nor-add-support-for-XT25F128B.patch index f7f370f3d1..7fff423ac3 100644 --- a/patch/kernel/archive/meson64-6.19/general-spi-nor-add-support-for-XT25F128B.patch +++ b/patch/kernel/archive/meson64-6.19/general-spi-nor-add-support-for-XT25F128B.patch @@ -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 -@@ -598,6 +598,7 @@ extern const struct spi_nor_manufacturer spi_nor_spansion; +@@ -604,6 +604,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.19/general-usb-core-improve-handling-of-hubs-with-no-ports.patch b/patch/kernel/archive/meson64-6.19/general-usb-core-improve-handling-of-hubs-with-no-ports.patch index e0892d4986..c31a64e1dc 100644 --- a/patch/kernel/archive/meson64-6.19/general-usb-core-improve-handling-of-hubs-with-no-ports.patch +++ b/patch/kernel/archive/meson64-6.19/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 -@@ -1503,9 +1503,8 @@ static int hub_configure(struct usb_hub *hub, +@@ -1499,9 +1499,8 @@ static int hub_configure(struct usb_hub *hub, ret = -ENODEV; goto fail; } else if (hub->descriptor->bNbrPorts == 0) { diff --git a/patch/kernel/archive/meson64-6.19/hwmon-emc2305-fixups-for-driver.patch b/patch/kernel/archive/meson64-6.19/hwmon-emc2305-fixups-for-driver.patch index ff4092faa7..5a35a037c2 100644 --- a/patch/kernel/archive/meson64-6.19/hwmon-emc2305-fixups-for-driver.patch +++ b/patch/kernel/archive/meson64-6.19/hwmon-emc2305-fixups-for-driver.patch @@ -185,7 +185,7 @@ index 111111111111..222222222222 100644 } static umode_t -@@ -657,6 +728,7 @@ static int emc2305_probe(struct i2c_client *client) +@@ -655,6 +726,7 @@ static int emc2305_probe(struct i2c_client *client) data->pwm_min[i] = pdata->pwm_min[i]; data->pwm_freq[i] = pdata->pwm_freq[i]; } @@ -193,7 +193,7 @@ index 111111111111..222222222222 100644 } else { data->max_state = EMC2305_FAN_MAX_STATE; data->pwm_separate = false; -@@ -666,12 +738,24 @@ static int emc2305_probe(struct i2c_client *client) +@@ -664,12 +736,24 @@ static int emc2305_probe(struct i2c_client *client) data->pwm_min[i] = EMC2305_FAN_MIN; data->pwm_freq[i] = base_freq_table[3]; } diff --git a/patch/kernel/archive/meson64-6.19/jethome-0003-arm64-dts-meson-add-dts-links-to-secure-monitor-for-jethub.patch b/patch/kernel/archive/meson64-6.19/jethome-0003-arm64-dts-meson-add-dts-links-to-secure-monitor-for-jethub.patch index a05a9a4e05..ff81336623 100644 --- a/patch/kernel/archive/meson64-6.19/jethome-0003-arm64-dts-meson-add-dts-links-to-secure-monitor-for-jethub.patch +++ b/patch/kernel/archive/meson64-6.19/jethome-0003-arm64-dts-meson-add-dts-links-to-secure-monitor-for-jethub.patch @@ -1,32 +1,31 @@ -From 728157ef8e377f74289dc7397c2de4b3b6416ccc Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Viacheslav Bocharov Date: Thu, 22 Feb 2024 12:02:20 +0300 -Subject: [PATCH 5/5] arm64: dts: meson: add dts links to secure-monitor for - JetHub devices +Subject: arm64: dts: meson: add dts links to secure-monitor for JetHub devices Signed-off-by: Viacheslav Bocharov --- - .../arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi | 4 ++++ - .../boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi -index db605f3a22b4..f3e679030788 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi -@@ -348,3 +348,7 @@ &cpu2 { - &cpu3 { - #cooling-cells = <2>; +@@ -332,3 +332,7 @@ &gpio { + "", "", "", "", "", // 80 - 84 + "", ""; // 85-86 }; + +&sec_AO { + secure-monitor = <&sm>; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts -index a18d6d241a5a..d75ba28d5e62 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts -@@ -245,3 +245,7 @@ pcf8563: rtc@51 { +@@ -243,3 +243,7 @@ pcf8563: rtc@51 { status = "okay"; }; }; @@ -35,5 +34,5 @@ index a18d6d241a5a..d75ba28d5e62 100644 + secure-monitor = <&sm>; +}; -- -2.43.2 +Armbian