Skip to content

Commit c74b357

Browse files
frank-wfrank-w
committed
Merge tag 'v6.12.40' into 6.12-main
This is the 6.12.40 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmiB2U8ACgkQONu9yGCS # aT7xBA//ToRxU6UX4V/8YoigpdI3g9K1bRrDaHbLY5e3VlfRpNGdZaaawXzMPj6T # 10y5tatTQ5IWFTmsF4bn0S0oHLeNAu1G2aAo+MLUk9gKs+Umq7bEoSi4fhtVNp61 # psIU7nTiZdYMz9WXMWbJ9YctC3LbvvWG8H1xkP1e9fYtCS8thOPol0ZjoTFy/y5Z # bedYN+UioI0W5h6ntoI76bEa5wPhzJNRL+c7Q9TLWOVkqaOh4YAwO1eBw8OCS6VW # aoF6SogivIEpZGtHxXUWwJ0g2s4RjRAhp6nJRx1+awS8gWfquGtI96gDYSZfkhax # X4oLVPr7ZRZvKdFXui/q90uFcHPzG5GFxHMjRJ04jddDty71pOzlTRqX9IhwU08n # qwShfLqguw6nRXut2o4/puDQv6ZAGlll/P0IuKFu6uYOnomvv3HbiTG47QGoPmV8 # r8d4k/ZsDLOeTsc75iUAACeFZ8migOijJyqQVuQLlzajS4UC/xrIwlMGcUiVWdsj # mlRnY6YPmcEuzXm/w/o/aVyygk8d+Hd9f0QPbRITM1Ib2YwsZ8buyooFawTcCkWV # sA1f0Cuzs7hAtnmxIhXWHomT0ILEmskxVjKobT1ITlGKePkmzBFGKkfc0hBA47rK # rPBPIjEpAv+cVkxNs3vuZaHUrDzM+tSGAgNK2H/HmGmG0nmo5Qo= # =2vmz # -----END PGP SIGNATURE----- # gpg: Signature made Thu Jul 24 08:57:19 2025 CEST # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents 82a02ba + d90ecb2 commit c74b357

167 files changed

Lines changed: 1334 additions & 543 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.

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

‎arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,11 +687,12 @@
687687
};
688688

689689
wdog0: watchdog@2ad0000 {
690-
compatible = "fsl,imx21-wdt";
690+
compatible = "fsl,ls1046a-wdt", "fsl,imx21-wdt";
691691
reg = <0x0 0x2ad0000 0x0 0x10000>;
692692
interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
693693
clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
694694
QORIQ_CLK_PLL_DIV(2)>;
695+
big-endian;
695696
};
696697

697698
edma0: dma-controller@2c00000 {

‎arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,7 @@
484484
};
485485

486486
reg_nvcc_sd: LDO5 {
487+
regulator-always-on;
487488
regulator-max-microvolt = <3300000>;
488489
regulator-min-microvolt = <1800000>;
489490
regulator-name = "On-module +V3.3_1.8_SD (LDO5)";

‎arch/arm64/boot/dts/freescale/imx8mp-venice-gw71xx.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
tpm@1 {
7171
compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
7272
reg = <0x1>;
73-
spi-max-frequency = <36000000>;
73+
spi-max-frequency = <25000000>;
7474
};
7575
};
7676

‎arch/arm64/boot/dts/freescale/imx8mp-venice-gw72xx.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
tpm@1 {
111111
compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
112112
reg = <0x1>;
113-
spi-max-frequency = <36000000>;
113+
spi-max-frequency = <25000000>;
114114
};
115115
};
116116

‎arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
tpm@1 {
123123
compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
124124
reg = <0x1>;
125-
spi-max-frequency = <36000000>;
125+
spi-max-frequency = <25000000>;
126126
};
127127
};
128128

‎arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@
199199
tpm@0 {
200200
compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
201201
reg = <0x0>;
202-
spi-max-frequency = <36000000>;
202+
spi-max-frequency = <25000000>;
203203
};
204204
};
205205

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1523,7 +1523,7 @@
15231523
<0x9 0 1 0>;
15241524
reg-names = "dbi","atu", "dbi2", "app", "dma", "addr_space";
15251525
num-lanes = <1>;
1526-
interrupts = <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>;
1526+
interrupts = <GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH>;
15271527
interrupt-names = "dma";
15281528
clocks = <&scmi_clk IMX95_CLK_HSIO>,
15291529
<&scmi_clk IMX95_CLK_HSIOPLL>,

‎arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,18 @@
344344
<0 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up>;
345345
};
346346
};
347+
348+
spi1 {
349+
spi1_csn0_gpio_pin: spi1-csn0-gpio-pin {
350+
rockchip,pins =
351+
<3 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up_4ma>;
352+
};
353+
354+
spi1_csn1_gpio_pin: spi1-csn1-gpio-pin {
355+
rockchip,pins =
356+
<3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up_4ma>;
357+
};
358+
};
347359
};
348360

349361
&pmu_io_domains {
@@ -361,6 +373,17 @@
361373
vqmmc-supply = <&vccio_sd>;
362374
};
363375

376+
&spi1 {
377+
/*
378+
* Hardware CS has a very slow rise time of about 6us,
379+
* causing transmission errors.
380+
* With cs-gpios we have a rise time of about 20ns.
381+
*/
382+
cs-gpios = <&gpio3 RK_PB1 GPIO_ACTIVE_LOW>, <&gpio3 RK_PB2 GPIO_ACTIVE_LOW>;
383+
pinctrl-names = "default";
384+
pinctrl-0 = <&spi1_clk &spi1_csn0_gpio_pin &spi1_csn1_gpio_pin &spi1_miso &spi1_mosi>;
385+
};
386+
364387
&tsadc {
365388
status = "okay";
366389
};

‎arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@
317317
bus-width = <4>;
318318
cap-mmc-highspeed;
319319
cap-sd-highspeed;
320+
cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
320321
disable-wp;
321322
max-frequency = <150000000>;
322323
no-sdio;

0 commit comments

Comments
 (0)