This commit is contained in:
Aditya Garg
2025-03-24 22:20:12 +05:30
parent 0f05d04f72
commit 60a2912ad2
4 changed files with 13 additions and 13 deletions
@@ -69,8 +69,8 @@ index 0fa7c5728..bce57e844 100644
+F: drivers/gpu/drm/tiny/appletbdrm.c
+
DRM DRIVER FOR ARM PL111 CLCD
S: Orphan
T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
M: Linus Walleij <linus.walleij@linaro.org>
S: Maintained
diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig
index 94cbdb133..54c84c980 100644
--- a/drivers/gpu/drm/tiny/Kconfig
@@ -103,7 +103,7 @@ index 4aaf56f87..d9add9c3e 100644
+obj-$(CONFIG_DRM_APPLETBDRM) += appletbdrm.o
obj-$(CONFIG_DRM_ARCPGU) += arcpgu.o
obj-$(CONFIG_DRM_BOCHS) += bochs.o
obj-$(CONFIG_DRM_CIRRUS_QEMU) += cirrus.o
obj-$(CONFIG_DRM_CIRRUS_QEMU) += cirrus-qemu.o
diff --git a/drivers/gpu/drm/tiny/appletbdrm.c b/drivers/gpu/drm/tiny/appletbdrm.c
new file mode 100644
index 000000000..4370ba22d
+1 -1
View File
@@ -25,7 +25,7 @@ index 49b5cc01c..1435f49f2 100644
if (dig_port->base.port != PORT_A)
@@ -4693,6 +4694,9 @@ static bool intel_ddi_a_force_4_lanes(struct intel_digital_port *dig_port)
if (dig_port->saved_port_bits & DDI_A_4_LANES)
if (dig_port->ddi_a_4_lanes)
return false;
+ if (intel_has_quirk(display, QUIRK_DDI_A_FORCE_4_LANES))
+8 -8
View File
@@ -936,9 +936,9 @@ diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 2f6658702..85cbe1e7c 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -1388,4 +1388,6 @@ source "drivers/hid/amd-sfh-hid/Kconfig"
@@ -1393,4 +1393,6 @@ endif # HID
source "drivers/hid/surface-hid/Kconfig"
source "drivers/hid/usbhid/Kconfig"
+source "drivers/hid/spi-hid/Kconfig"
+
@@ -947,10 +947,10 @@ diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 24de45f36..f4b2e84c7 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -171,3 +171,5 @@ obj-$(INTEL_ISH_FIRMWARE_DOWNLOADER) += intel-ish-hid/
obj-$(CONFIG_AMD_SFH_HID) += amd-sfh-hid/
@@ -173,3 +173,5 @@ obj-$(CONFIG_AMD_SFH_HID) += amd-sfh-hid/
obj-$(CONFIG_SURFACE_HID_CORE) += surface-hid/
obj-$(CONFIG_INTEL_THC_HID) += intel-thc-hid/
+
+obj-$(CONFIG_SPI_HID_APPLE_CORE) += spi-hid/
diff --git a/drivers/hid/spi-hid/Kconfig b/drivers/hid/spi-hid/Kconfig
@@ -3054,7 +3054,7 @@ diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 85cbe1e7c..e4f81de85 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -1390,4 +1390,6 @@ source "drivers/hid/surface-hid/Kconfig"
@@ -1395,4 +1395,6 @@ source "drivers/hid/usbhid/Kconfig"
source "drivers/hid/spi-hid/Kconfig"
@@ -3065,8 +3065,8 @@ diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index f4b2e84c7..a5026febe 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -173,3 +173,5 @@ obj-$(CONFIG_AMD_SFH_HID) += amd-sfh-hid/
obj-$(CONFIG_SURFACE_HID_CORE) += surface-hid/
@@ -175,3 +175,5 @@ obj-$(CONFIG_SURFACE_HID_CORE) += surface-hid/
obj-$(CONFIG_INTEL_THC_HID) += intel-thc-hid/
obj-$(CONFIG_SPI_HID_APPLE_CORE) += spi-hid/
+
+1 -1
View File
@@ -1 +1 @@
KVER=6.13.7
KVER=6.14