Skip to content

Commit ac7de15

Browse files
frank-wfrank-w
committed
Merge tag 'v6.6.112' into 6.6-main
This is the 6.6.112 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmjvcEoACgkQONu9yGCS # aT6h8Q//YbJ4/E+bf2DK509XOisab33u06mhyRD9xaWjrOuqslH9luhzdGrsXylQ # uKVSTjmaEVKY/tMwZPX4lrlPvbg8Cb4l9XV6vWEP5mZuzSavr65XhebzBoufHi94 # 9Bjf+qFpwYR4Jkzl0hAsCazJDMiIoAmsEOhLFxjd3zDgEO9tPsqDRBJKapYiy/kU # LquVnnJ5PLw5aSVgJaBnUwiaEp/07lMS+LAReQrZiJ/3aW3dYbhvpE0OksKpFbpX # 5/4NLBvyufi9hmVpyUQoPOl4i+d0KRNo1CW57kTaDkU+6XwnccvywPY8M2YKPLA+ # vxNWSFJTWpxeMPP1f5u9Ci+otEt1nNy55ISjJS35VdWwWGgixnRoyBAbxfUa8smB # +a7qfAbZZlM0jbEA79QTwVm0KhlzTkIdIUzCVJddhyvIgZWOP2iDMkt5apbBPuzS # WLMvlQYhax2IvLYumJlbYA8jvcxg1UJ3so8F+5VU8qwVmpXbfBDOhKseVSCDZ3kg # eXgSjj6h6LTkITkNO2V6+3WKYBAnYojMLc1qwQahyZOWlnl6CIvqBo2cytyCdlxu # bamx8EovYAFl5+frlMKzr58uUjWNqgioZ5vGD9ZTE5NrRGkCBNH6U/Iy76MPOOWE # 8q51wrel5cKIfl+pN1EZZDKJ0IM+bcliWwsbrekc0p/wB79q4gE= # =7CzX # -----END PGP SIGNATURE----- # gpg: Signature made Wed Oct 15 11:58:34 2025 CEST # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents ddb562a + 0bbbd97 commit ac7de15

198 files changed

Lines changed: 1386 additions & 714 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/trace/histogram-design.rst‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,9 @@ entry, ts0, corresponding to the ts0 variable in the sched_waking
380380
trigger above.
381381

382382
sched_waking histogram
383-
----------------------::
383+
----------------------
384+
385+
.. code-block::
384386
385387
+------------------+
386388
| hist_data |<-------------------------------------------------------+

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 6
4-
SUBLEVEL = 111
4+
SUBLEVEL = 112
55
EXTRAVERSION =
66
NAME = Pinguïn Aangedreven
77

‎arch/arm/boot/dts/renesas/r8a7791-porter.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@
266266
};
267267

268268
can0_pins: can0 {
269-
groups = "can0_data";
269+
groups = "can0_data_b";
270270
function = "can0";
271271
};
272272

‎arch/arm/boot/dts/ti/omap/am335x-baltos.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@
270270
vcc7-supply = <&vbat>;
271271
vccio-supply = <&vbat>;
272272

273-
ti,en-ck32k-xtal = <1>;
273+
ti,en-ck32k-xtal;
274274

275275
regulators {
276276
vrtc_reg: regulator@0 {

‎arch/arm/boot/dts/ti/omap/am335x-cm-t335.dts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -483,8 +483,6 @@ status = "okay";
483483

484484
op-mode = <0>; /* MCASP_IIS_MODE */
485485
tdm-slots = <2>;
486-
/* 16 serializers */
487-
num-serializer = <16>;
488486
serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */
489487
0 0 2 1 0 0 0 0 0 0 0 0 0 0 0 0
490488
>;

‎arch/arm/boot/dts/ti/omap/omap3-devkit8000-lcd-common.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
ti,debounce-max = /bits/ 16 <10>;
6666
ti,debounce-tol = /bits/ 16 <5>;
6767
ti,debounce-rep = /bits/ 16 <1>;
68-
ti,keep-vref-on = <1>;
68+
ti,keep-vref-on;
6969
ti,settle-delay-usec = /bits/ 16 <150>;
7070

7171
wakeup-source;

‎arch/arm/mach-at91/pm_suspend.S‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ e_done:
872872
/**
873873
* at91_mckx_ps_restore: restore MCK1..4 settings
874874
*
875-
* Side effects: overwrites tmp1, tmp2
875+
* Side effects: overwrites tmp1, tmp2 and tmp3
876876
*/
877877
.macro at91_mckx_ps_restore
878878
#ifdef CONFIG_SOC_SAMA7
@@ -916,7 +916,7 @@ r_ps:
916916
bic tmp3, tmp3, #AT91_PMC_MCR_V2_ID_MSK
917917
orr tmp3, tmp3, tmp1
918918
orr tmp3, tmp3, #AT91_PMC_MCR_V2_CMD
919-
str tmp2, [pmc, #AT91_PMC_MCR_V2]
919+
str tmp3, [pmc, #AT91_PMC_MCR_V2]
920920

921921
wait_mckrdy tmp1
922922

‎arch/arm64/boot/dts/apple/t8103-j457.dts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@
2121
};
2222
};
2323

24+
/*
25+
* Adjust pcie0's iommu-map to account for the disabled port01.
26+
*/
27+
&pcie0 {
28+
iommu-map = <0x100 &pcie0_dart_0 1 1>,
29+
<0x200 &pcie0_dart_2 1 1>;
30+
};
31+
2432
&bluetooth0 {
2533
brcm,board-type = "apple,santorini";
2634
};
@@ -36,10 +44,10 @@
3644
*/
3745

3846
&port02 {
39-
bus-range = <3 3>;
47+
bus-range = <2 2>;
4048
status = "okay";
4149
ethernet0: ethernet@0,0 {
42-
reg = <0x30000 0x0 0x0 0x0 0x0>;
50+
reg = <0x20000 0x0 0x0 0x0 0x0>;
4351
/* To be filled by the loader */
4452
local-mac-address = [00 10 18 00 00 00];
4553
};

‎arch/arm64/boot/dts/mediatek/mt6331.dtsi‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
#include <dt-bindings/input/input.h>
77

88
&pwrap {
9-
pmic: mt6331 {
9+
pmic: pmic {
1010
compatible = "mediatek,mt6331";
1111
interrupt-controller;
1212
#interrupt-cells = <2>;
1313

14-
mt6331regulator: mt6331regulator {
14+
mt6331regulator: regulators {
1515
compatible = "mediatek,mt6331-regulator";
1616

1717
mt6331_vdvfs11_reg: buck-vdvfs11 {
@@ -258,19 +258,19 @@
258258
};
259259

260260
mt6331_vdig18_reg: ldo-vdig18 {
261-
regulator-name = "dvdd18_dig";
261+
regulator-name = "vdig18";
262262
regulator-min-microvolt = <1800000>;
263263
regulator-max-microvolt = <1800000>;
264264
regulator-ramp-delay = <0>;
265265
regulator-always-on;
266266
};
267267
};
268268

269-
mt6331rtc: mt6331rtc {
269+
mt6331rtc: rtc {
270270
compatible = "mediatek,mt6331-rtc";
271271
};
272272

273-
mt6331keys: mt6331keys {
273+
mt6331keys: keys {
274274
compatible = "mediatek,mt6331-keys";
275275
power {
276276
linux,keycodes = <KEY_POWER>;

‎arch/arm64/boot/dts/mediatek/mt6795-sony-xperia-m5.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136

137137
&mmc0 {
138138
/* eMMC controller */
139-
mediatek,latch-ck = <0x14>; /* hs400 */
139+
mediatek,latch-ck = <4>; /* hs400 */
140140
mediatek,hs200-cmd-int-delay = <1>;
141141
mediatek,hs400-cmd-int-delay = <1>;
142142
mediatek,hs400-ds-dly3 = <0x1a>;

0 commit comments

Comments
 (0)