Skip to content

Commit 987e4eb

Browse files
popcornmixpopcornmix
committed
Merge remote-tracking branch 'stable/linux-6.12.y' into rpi-6.12.y
2 parents bdc0e86 + fcd03f7 commit 987e4eb

File tree

264 files changed

+2038
-1119
lines changed

Some content is hidden

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

264 files changed

+2038
-1119
lines changed

‎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 = 12
4-
SUBLEVEL = 52
4+
SUBLEVEL = 53
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@
290290
};
291291

292292
can0_pins: can0 {
293-
groups = "can0_data";
293+
groups = "can0_data_b";
294294
function = "can0";
295295
};
296296

‎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/freescale/imx93-kontron-bl-osm-s.dts‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@
3333

3434
reg_vcc_panel: regulator-vcc-panel {
3535
compatible = "regulator-fixed";
36-
gpio = <&gpio4 3 GPIO_ACTIVE_HIGH>;
36+
pinctrl-names = "default";
37+
pinctrl-0 = <&pinctrl_reg_vcc_panel>;
38+
gpio = <&gpio2 21 GPIO_ACTIVE_HIGH>;
3739
enable-active-high;
3840
regulator-max-microvolt = <3300000>;
3941
regulator-min-microvolt = <3300000>;
@@ -135,6 +137,16 @@
135137
};
136138

137139
&usbotg1 {
140+
adp-disable;
141+
hnp-disable;
142+
srp-disable;
143+
disable-over-current;
144+
dr_mode = "otg";
145+
usb-role-switch;
146+
status = "okay";
147+
};
148+
149+
&usbotg2 {
138150
#address-cells = <1>;
139151
#size-cells = <0>;
140152
disable-over-current;
@@ -147,17 +159,15 @@
147159
};
148160
};
149161

150-
&usbotg2 {
151-
adp-disable;
152-
hnp-disable;
153-
srp-disable;
154-
disable-over-current;
155-
dr_mode = "otg";
156-
usb-role-switch;
157-
status = "okay";
158-
};
159-
160162
&usdhc2 {
161163
vmmc-supply = <&reg_vdd_3v3>;
162164
status = "okay";
163165
};
166+
167+
&iomuxc {
168+
pinctrl_reg_vcc_panel: regvccpanelgrp {
169+
fsl,pins = <
170+
MX93_PAD_GPIO_IO21__GPIO2_IO21 0x31e /* PWM_2 */
171+
>;
172+
};
173+
};

‎arch/arm64/boot/dts/freescale/imx95.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,7 @@
822822
interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;
823823
clocks = <&scmi_clk IMX95_CLK_LPUART7>;
824824
clock-names = "ipg";
825-
dmas = <&edma2 26 0 FSL_EDMA_RX>, <&edma2 25 0 0>;
825+
dmas = <&edma2 88 0 FSL_EDMA_RX>, <&edma2 87 0 0>;
826826
dma-names = "rx", "tx";
827827
status = "disabled";
828828
};
@@ -834,7 +834,7 @@
834834
interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
835835
clocks = <&scmi_clk IMX95_CLK_LPUART8>;
836836
clock-names = "ipg";
837-
dmas = <&edma2 28 0 FSL_EDMA_RX>, <&edma2 27 0 0>;
837+
dmas = <&edma2 90 0 FSL_EDMA_RX>, <&edma2 89 0 0>;
838838
dma-names = "rx", "tx";
839839
status = "disabled";
840840
};

0 commit comments

Comments
 (0)