diff --git a/patch/kernel/archive/meson64-6.15/general-gpu-drm-add-new-display-resolution-2560x1440.patch b/patch/kernel/archive/meson64-6.15/general-gpu-drm-add-new-display-resolution-2560x1440.patch index 58d2d16889..3db849138f 100644 --- a/patch/kernel/archive/meson64-6.15/general-gpu-drm-add-new-display-resolution-2560x1440.patch +++ b/patch/kernel/archive/meson64-6.15/general-gpu-drm-add-new-display-resolution-2560x1440.patch @@ -15,7 +15,7 @@ diff --git a/drivers/gpu/drm/meson/meson_vclk.c b/drivers/gpu/drm/meson/meson_vc index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/meson/meson_vclk.c +++ b/drivers/gpu/drm/meson/meson_vclk.c -@@ -357,6 +357,8 @@ enum { +@@ -360,6 +360,8 @@ enum { MESON_VCLK_HDMI_594000, /* 2970 /1 /1 /1 /5 /1 => /1 /2 */ MESON_VCLK_HDMI_594000_YUV420, @@ -24,7 +24,7 @@ index 111111111111..222222222222 100644 }; struct meson_vclk_params { -@@ -467,6 +469,18 @@ struct meson_vclk_params { +@@ -470,6 +472,18 @@ struct meson_vclk_params { .vid_pll_div = VID_PLL_DIV_5, .vclk_div = 1, }, @@ -43,7 +43,7 @@ index 111111111111..222222222222 100644 { /* sentinel */ }, }; -@@ -873,6 +887,10 @@ static void meson_vclk_set(struct meson_drm *priv, unsigned int pll_base_freq, +@@ -879,6 +893,10 @@ static void meson_vclk_set(struct meson_drm *priv, m = 0xf7; frac = vic_alternate_clock ? 0x8148 : 0x10000; break; diff --git a/patch/kernel/archive/meson64-6.15/general-input-touchscreen-Add-D-WAV-Multitouch.patch b/patch/kernel/archive/meson64-6.15/general-input-touchscreen-Add-D-WAV-Multitouch.patch index d5443b7aa8..e34b5ea7e9 100644 --- a/patch/kernel/archive/meson64-6.15/general-input-touchscreen-Add-D-WAV-Multitouch.patch +++ b/patch/kernel/archive/meson64-6.15/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 -@@ -1520,4 +1520,10 @@ +@@ -1524,4 +1524,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 -@@ -902,6 +902,9 @@ static const struct hid_device_id hid_ignore_list[] = { +@@ -904,6 +904,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) },