Skip to content

Commit f2f68e7

Browse files
popcornmixpopcornmix
committed
Merge remote-tracking branch 'stable/linux-6.18.y' into rpi-6.18.y
2 parents 1d5bb99 + c0d886e commit f2f68e7

216 files changed

Lines changed: 1621 additions & 791 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/admin-guide/mm/damon/reclaim.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ of parametrs except ``enabled`` again. Once the re-reading is done, this
7171
parameter is set as ``N``. If invalid parameters are found while the
7272
re-reading, DAMON_RECLAIM will be disabled.
7373

74+
Once ``Y`` is written to this parameter, the user must not write to any
75+
parameters until reading ``commit_inputs`` again returns ``N``. If users
76+
violate this rule, the kernel may exhibit undefined behavior.
77+
7478
min_age
7579
-------
7680

‎Documentation/devicetree/bindings/net/nvidia,tegra234-mgbe.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ properties:
4242
- const: mgbe
4343
- const: mac
4444
- const: mac-divider
45-
- const: ptp-ref
45+
- const: ptp_ref
4646
- const: rx-input-m
4747
- const: rx-input
4848
- const: tx
@@ -133,7 +133,7 @@ examples:
133133
<&bpmp TEGRA234_CLK_MGBE0_RX_PCS_M>,
134134
<&bpmp TEGRA234_CLK_MGBE0_RX_PCS>,
135135
<&bpmp TEGRA234_CLK_MGBE0_TX_PCS>;
136-
clock-names = "mgbe", "mac", "mac-divider", "ptp-ref", "rx-input-m",
136+
clock-names = "mgbe", "mac", "mac-divider", "ptp_ref", "rx-input-m",
137137
"rx-input", "tx", "eee-pcs", "rx-pcs-input", "rx-pcs-m",
138138
"rx-pcs", "tx-pcs";
139139
resets = <&bpmp TEGRA234_RESET_MGBE0_MAC>,

‎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 = 18
4-
SUBLEVEL = 23
4+
SUBLEVEL = 24
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

‎arch/arm/boot/dts/microchip/sam9x7.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1226,7 +1226,7 @@
12261226
interrupt-controller;
12271227
#gpio-cells = <2>;
12281228
gpio-controller;
1229-
#gpio-lines = <26>;
1229+
#gpio-lines = <27>;
12301230
clocks = <&pmc PMC_TYPE_PERIPHERAL 3>;
12311231
};
12321232

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1632,7 +1632,7 @@
16321632
<&clk IMX8MQ_GPU_PLL_OUT>,
16331633
<&clk IMX8MQ_GPU_PLL>;
16341634
assigned-clock-rates = <800000000>, <800000000>,
1635-
<800000000>, <800000000>, <0>;
1635+
<800000000>, <400000000>, <0>;
16361636
power-domains = <&pgc_gpu>;
16371637
};
16381638

‎arch/arm64/boot/dts/freescale/imx91-tqma9131.dtsi‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -272,20 +272,20 @@
272272
/* enable SION for data and cmd pad due to ERR052021 */
273273
pinctrl_usdhc1: usdhc1grp {
274274
fsl,pins = /* PD | FSEL 3 | DSE X5 */
275-
<MX91_PAD_SD1_CLK__USDHC1_CLK 0x5be>,
275+
<MX91_PAD_SD1_CLK__USDHC1_CLK 0x59e>,
276276
/* HYS | FSEL 0 | no drive */
277277
<MX91_PAD_SD1_STROBE__USDHC1_STROBE 0x1000>,
278278
/* HYS | FSEL 3 | X5 */
279-
<MX91_PAD_SD1_CMD__USDHC1_CMD 0x400011be>,
279+
<MX91_PAD_SD1_CMD__USDHC1_CMD 0x4000139e>,
280280
/* HYS | FSEL 3 | X4 */
281-
<MX91_PAD_SD1_DATA0__USDHC1_DATA0 0x4000119e>,
282-
<MX91_PAD_SD1_DATA1__USDHC1_DATA1 0x4000119e>,
283-
<MX91_PAD_SD1_DATA2__USDHC1_DATA2 0x4000119e>,
284-
<MX91_PAD_SD1_DATA3__USDHC1_DATA3 0x4000119e>,
285-
<MX91_PAD_SD1_DATA4__USDHC1_DATA4 0x4000119e>,
286-
<MX91_PAD_SD1_DATA5__USDHC1_DATA5 0x4000119e>,
287-
<MX91_PAD_SD1_DATA6__USDHC1_DATA6 0x4000119e>,
288-
<MX91_PAD_SD1_DATA7__USDHC1_DATA7 0x4000119e>;
281+
<MX91_PAD_SD1_DATA0__USDHC1_DATA0 0x4000139e>,
282+
<MX91_PAD_SD1_DATA1__USDHC1_DATA1 0x4000139e>,
283+
<MX91_PAD_SD1_DATA2__USDHC1_DATA2 0x4000139e>,
284+
<MX91_PAD_SD1_DATA3__USDHC1_DATA3 0x4000139e>,
285+
<MX91_PAD_SD1_DATA4__USDHC1_DATA4 0x4000139e>,
286+
<MX91_PAD_SD1_DATA5__USDHC1_DATA5 0x4000139e>,
287+
<MX91_PAD_SD1_DATA6__USDHC1_DATA6 0x4000139e>,
288+
<MX91_PAD_SD1_DATA7__USDHC1_DATA7 0x4000139e>;
289289
};
290290

291291
pinctrl_wdog: wdoggrp {

‎arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,7 @@
507507
pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
508508
bus-width = <8>;
509509
non-removable;
510+
fsl,tuning-step = <1>;
510511
status = "okay";
511512
};
512513

@@ -519,6 +520,7 @@
519520
vmmc-supply = <&reg_usdhc2_vmmc>;
520521
bus-width = <4>;
521522
no-mmc;
523+
fsl,tuning-step = <1>;
522524
status = "okay";
523525
};
524526

‎arch/arm64/boot/dts/freescale/imx93-tqma9352.dtsi‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -270,21 +270,21 @@
270270
/* enable SION for data and cmd pad due to ERR052021 */
271271
pinctrl_usdhc1: usdhc1grp {
272272
fsl,pins = <
273-
/* PD | FSEL 3 | DSE X5 */
274-
MX93_PAD_SD1_CLK__USDHC1_CLK 0x5be
273+
/* PD | FSEL 3 | DSE X4 */
274+
MX93_PAD_SD1_CLK__USDHC1_CLK 0x59e
275275
/* HYS | FSEL 0 | no drive */
276276
MX93_PAD_SD1_STROBE__USDHC1_STROBE 0x1000
277-
/* HYS | FSEL 3 | X5 */
278-
MX93_PAD_SD1_CMD__USDHC1_CMD 0x400011be
279-
/* HYS | FSEL 3 | X4 */
280-
MX93_PAD_SD1_DATA0__USDHC1_DATA0 0x4000119e
281-
MX93_PAD_SD1_DATA1__USDHC1_DATA1 0x4000119e
282-
MX93_PAD_SD1_DATA2__USDHC1_DATA2 0x4000119e
283-
MX93_PAD_SD1_DATA3__USDHC1_DATA3 0x4000119e
284-
MX93_PAD_SD1_DATA4__USDHC1_DATA4 0x4000119e
285-
MX93_PAD_SD1_DATA5__USDHC1_DATA5 0x4000119e
286-
MX93_PAD_SD1_DATA6__USDHC1_DATA6 0x4000119e
287-
MX93_PAD_SD1_DATA7__USDHC1_DATA7 0x4000119e
277+
/* HYS | PU | FSEL 3 | DSE X4 */
278+
MX93_PAD_SD1_CMD__USDHC1_CMD 0x4000139e
279+
/* HYS | PU | FSEL 3 | DSE X4 */
280+
MX93_PAD_SD1_DATA0__USDHC1_DATA0 0x4000139e
281+
MX93_PAD_SD1_DATA1__USDHC1_DATA1 0x4000139e
282+
MX93_PAD_SD1_DATA2__USDHC1_DATA2 0x4000139e
283+
MX93_PAD_SD1_DATA3__USDHC1_DATA3 0x4000139e
284+
MX93_PAD_SD1_DATA4__USDHC1_DATA4 0x4000139e
285+
MX93_PAD_SD1_DATA5__USDHC1_DATA5 0x4000139e
286+
MX93_PAD_SD1_DATA6__USDHC1_DATA6 0x4000139e
287+
MX93_PAD_SD1_DATA7__USDHC1_DATA7 0x4000139e
288288
>;
289289
};
290290

‎arch/arm64/boot/dts/qcom/qcm6490-idp.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
pinctrl-0 = <&wcd_default>;
178178
pinctrl-names = "default";
179179

180-
reset-gpios = <&tlmm 83 GPIO_ACTIVE_HIGH>;
180+
reset-gpios = <&tlmm 83 GPIO_ACTIVE_LOW>;
181181

182182
vdd-buck-supply = <&vreg_l17b_1p7>;
183183
vdd-rxtx-supply = <&vreg_l18b_1p8>;

‎arch/arm64/boot/dts/qcom/qcs8300.dtsi‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -756,6 +756,11 @@
756756
hwlocks = <&tcsr_mutex 3>;
757757
};
758758

759+
gunyah_md_mem: gunyah-md-region@91a80000 {
760+
reg = <0x0 0x91a80000 0x0 0x80000>;
761+
no-map;
762+
};
763+
759764
lpass_machine_learning_mem: lpass-machine-learning-region@93b00000 {
760765
reg = <0x0 0x93b00000 0x0 0xf00000>;
761766
no-map;
@@ -5430,12 +5435,12 @@
54305435
};
54315436

54325437
qup_uart10_rts: qup-uart10-rts-state {
5433-
pins = "gpio84";
5438+
pins = "gpio85";
54345439
function = "qup1_se2";
54355440
};
54365441

54375442
qup_uart10_tx: qup-uart10-tx-state {
5438-
pins = "gpio85";
5443+
pins = "gpio86";
54395444
function = "qup1_se2";
54405445
};
54415446

0 commit comments

Comments
 (0)