Skip to content

Commit 0012cff

Browse files
8bitbuddhist8bitbuddhist
committed
microsoft/surface: update stable linux-surface to 6.14.2
1 parent 33aa2d8 commit 0012cff

File tree

3 files changed

+164
-163
lines changed

3 files changed

+164
-163
lines changed

‎microsoft/surface/common/default.nix

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ let
66
# Set the version and hash for the kernel sources
77
srcVersion = with config.microsoft-surface;
88
if kernelVersion == "longterm" then
9-
"6.12.19"
9+
"6.12.22"
1010
else if kernelVersion == "stable" then
11-
"6.13.6"
11+
"6.14.2"
1212
else
1313
abort "Invalid kernel version: ${kernelVersion}";
1414

1515
srcHash = with config.microsoft-surface;
1616
if kernelVersion == "longterm" then
17-
"sha256-1zvwV77ARDSxadG2FkGTb30Ml865I6KB8y413U3MZTE="
17+
"sha256-q0iACrSZhaeNIxiuisXyj9PhI+oXNX7yFJgQWlMzczY="
1818
else if kernelVersion == "stable" then
19-
"sha256-3gBTy0E9QI8g/R1XiCGZUbikQD5drBsdkDIJCTis0Zk="
19+
"sha256-xcaCo1TqMZATk1elfTSnnlw3IhrOgjqTjhARa1d6Lhs="
2020
else
2121
abort "Invalid kernel version: ${kernelVersion}";
2222

@@ -25,15 +25,15 @@ let
2525
if kernelVersion == "longterm" then
2626
"6.12.7"
2727
else if kernelVersion == "stable" then
28-
"6.13.6"
28+
"6.14.2"
2929
else
3030
abort "Invalid kernel version: ${kernelVersion}";
3131

3232
pkgHash = with config.microsoft-surface;
3333
if kernelVersion == "longterm" then
3434
"sha256-Pv7O8D8ma+MPLhYP3HSGQki+Yczp8b7d63qMb6l4+mY="
3535
else if kernelVersion == "stable" then
36-
"sha256-otD1ckNxNnvV8xipf9SZpbfg+bBq5EPwyieYtLIV4Ck="
36+
"sha256-Pzn+C52TtDcqDVepM5z2cVNCsnRDy0Wwn+FLwgsuicQ="
3737
else
3838
abort "Invalid kernel version: ${kernelVersion}";
3939

‎microsoft/surface/common/kernel/6.13/patches.nix

Lines changed: 0 additions & 157 deletions
This file was deleted.

‎microsoft/surface/common/kernel/6.14/patches.nix

Lines changed: 158 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,158 @@
1+
{ lib,
2+
kernel ? lib.kernel,
3+
patchSrc,
4+
version,
5+
}:
6+
7+
[
8+
{
9+
name = "microsoft-surface-patches-linux-${version}";
10+
patch = null;
11+
extraStructuredConfig = with kernel; {
12+
STAGING_MEDIA = yes;
13+
##
14+
## Surface Aggregator Module
15+
##
16+
CONFIG_SURFACE_AGGREGATOR = module;
17+
# CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION is not set
18+
CONFIG_SURFACE_AGGREGATOR_BUS = yes;
19+
CONFIG_SURFACE_AGGREGATOR_CDEV = module;
20+
CONFIG_SURFACE_AGGREGATOR_HUB = module;
21+
CONFIG_SURFACE_AGGREGATOR_REGISTRY = module;
22+
CONFIG_SURFACE_AGGREGATOR_TABLET_SWITCH = module;
23+
24+
CONFIG_SURFACE_ACPI_NOTIFY = module;
25+
CONFIG_SURFACE_DTX = module;
26+
CONFIG_SURFACE_PLATFORM_PROFILE = module;
27+
28+
CONFIG_SURFACE_HID = module;
29+
CONFIG_SURFACE_KBD = module;
30+
31+
CONFIG_BATTERY_SURFACE = module;
32+
CONFIG_CHARGER_SURFACE = module;
33+
34+
CONFIG_SENSORS_SURFACE_TEMP = module;
35+
CONFIG_SENSORS_SURFACE_FAN = module;
36+
37+
CONFIG_RTC_DRV_SURFACE = module;
38+
39+
##
40+
## Surface Hotplug
41+
##
42+
CONFIG_SURFACE_HOTPLUG = module;
43+
44+
##
45+
## IPTS and ITHC touchscreen
46+
##
47+
## This only enables the user interface for IPTS/ITHC data.
48+
## For the touchscreen to work, you need to install iptsd.
49+
##
50+
CONFIG_HID_IPTS = module;
51+
CONFIG_HID_ITHC = module;
52+
53+
##
54+
## Cameras: IPU3
55+
##
56+
CONFIG_VIDEO_DW9719 = module;
57+
CONFIG_VIDEO_IPU3_IMGU = module;
58+
CONFIG_VIDEO_IPU3_CIO2 = module;
59+
CONFIG_IPU_BRIDGE = module;
60+
CONFIG_INTEL_SKL_INT3472 = module;
61+
CONFIG_REGULATOR_TPS68470 = module;
62+
CONFIG_COMMON_CLK_TPS68470 = module;
63+
CONFIG_LEDS_TPS68470 = module;
64+
65+
##
66+
## Cameras: Sensor drivers
67+
##
68+
CONFIG_VIDEO_OV5693 = module;
69+
CONFIG_VIDEO_OV7251 = module;
70+
CONFIG_VIDEO_OV8865 = module;
71+
72+
##
73+
## Surface 3: atomisp causes problems (see issue #1095). Disable it for now.
74+
##
75+
# CONFIG_INTEL_ATOMISP is not set
76+
77+
##
78+
## ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
79+
##
80+
CONFIG_APDS9960 = module;
81+
82+
##
83+
## Build-in UFS support (required for some Surface Go devices)
84+
##
85+
CONFIG_SCSI_UFSHCD = module;
86+
CONFIG_SCSI_UFSHCD_PCI = module;
87+
88+
##
89+
## Other Drivers
90+
##
91+
CONFIG_INPUT_SOC_BUTTON_ARRAY = module;
92+
CONFIG_SURFACE_3_POWER_OPREGION = module;
93+
CONFIG_SURFACE_PRO3_BUTTON = module;
94+
CONFIG_SURFACE_GPE = module;
95+
CONFIG_SURFACE_BOOK1_DGPU_SWITCH = module;
96+
};
97+
}
98+
{
99+
name = "ms-surface/0001-secureboot";
100+
patch = patchSrc + "/0001-secureboot.patch";
101+
}
102+
{
103+
name = "ms-surface/0002-surface3";
104+
patch = patchSrc + "/0002-surface3.patch";
105+
}
106+
{
107+
name = "ms-surface/0003-mwifiex";
108+
patch = patchSrc + "/0003-mwifiex.patch";
109+
}
110+
{
111+
name = "ms-surface/0004-ath10k";
112+
patch = patchSrc + "/0004-ath10k.patch";
113+
}
114+
{
115+
name = "ms-surface/0005-ipts";
116+
patch = patchSrc + "/0005-ipts.patch";
117+
}
118+
{
119+
name = "ms-surface/0006-ithc";
120+
patch = patchSrc + "/0006-ithc.patch";
121+
}
122+
{
123+
name = "ms-surface/0007-surface-sam";
124+
patch = patchSrc + "/0007-surface-sam.patch";
125+
}
126+
{
127+
name = "ms-surface/0008-surface-sam-over-hid";
128+
patch = patchSrc + "/0008-surface-sam-over-hid.patch";
129+
}
130+
{
131+
name = "ms-surface/0009-surface-button";
132+
patch = patchSrc + "/0009-surface-button.patch";
133+
}
134+
{
135+
name = "ms-surface/0010-surface-typecover";
136+
patch = patchSrc + "/0010-surface-typecover.patch";
137+
}
138+
{
139+
name = "ms-surface/0011-surface-shutdown";
140+
patch = patchSrc + "/0011-surface-shutdown.patch";
141+
}
142+
{
143+
name = "ms-surface/0012-surface-gpe";
144+
patch = patchSrc + "/0012-surface-gpe.patch";
145+
}
146+
{
147+
name = "ms-surface/0013-cameras";
148+
patch = patchSrc + "/0013-cameras.patch";
149+
}
150+
{
151+
name = "ms-surface/0014-amd-gpio";
152+
patch = patchSrc + "/0014-amd-gpio.patch";
153+
}
154+
{
155+
name = "ms-surface/0015-rtc";
156+
patch = patchSrc + "/0015-rtc.patch";
157+
}
158+
]

0 commit comments

Comments
 (0)