Skip to content

Commit 113147c

Browse files
xdevs23xdevs23
committed
Merge remote-tracking branch 'stable/linux-6.15.y' into v6.15+
2 parents edbed81 + 353d169 commit 113147c

227 files changed

Lines changed: 2113 additions & 1236 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 = 15
4-
SUBLEVEL = 7
4+
SUBLEVEL = 8
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
@@ -464,6 +464,7 @@
464464
};
465465

466466
reg_nvcc_sd: LDO5 {
467+
regulator-always-on;
467468
regulator-max-microvolt = <3300000>;
468469
regulator-min-microvolt = <1800000>;
469470
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
@@ -201,7 +201,7 @@
201201
tpm@0 {
202202
compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
203203
reg = <0x0>;
204-
spi-max-frequency = <36000000>;
204+
spi-max-frequency = <25000000>;
205205
};
206206
};
207207

‎arch/arm64/boot/dts/freescale/imx95-15x15-evk.dts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -558,17 +558,17 @@
558558
&scmi_iomuxc {
559559
pinctrl_emdio: emdiogrp {
560560
fsl,pins = <
561-
IMX95_PAD_ENET2_MDC__NETCMIX_TOP_NETC_MDC 0x57e
562-
IMX95_PAD_ENET2_MDIO__NETCMIX_TOP_NETC_MDIO 0x97e
561+
IMX95_PAD_ENET2_MDC__NETCMIX_TOP_NETC_MDC 0x50e
562+
IMX95_PAD_ENET2_MDIO__NETCMIX_TOP_NETC_MDIO 0x90e
563563
>;
564564
};
565565

566566
pinctrl_enetc0: enetc0grp {
567567
fsl,pins = <
568-
IMX95_PAD_ENET1_TD3__NETCMIX_TOP_ETH0_RGMII_TD3 0x57e
569-
IMX95_PAD_ENET1_TD2__NETCMIX_TOP_ETH0_RGMII_TD2 0x57e
570-
IMX95_PAD_ENET1_TD1__NETCMIX_TOP_ETH0_RGMII_TD1 0x57e
571-
IMX95_PAD_ENET1_TD0__NETCMIX_TOP_ETH0_RGMII_TD0 0x57e
568+
IMX95_PAD_ENET1_TD3__NETCMIX_TOP_ETH0_RGMII_TD3 0x50e
569+
IMX95_PAD_ENET1_TD2__NETCMIX_TOP_ETH0_RGMII_TD2 0x50e
570+
IMX95_PAD_ENET1_TD1__NETCMIX_TOP_ETH0_RGMII_TD1 0x50e
571+
IMX95_PAD_ENET1_TD0__NETCMIX_TOP_ETH0_RGMII_TD0 0x50e
572572
IMX95_PAD_ENET1_TX_CTL__NETCMIX_TOP_ETH0_RGMII_TX_CTL 0x57e
573573
IMX95_PAD_ENET1_TXC__NETCMIX_TOP_ETH0_RGMII_TX_CLK 0x58e
574574
IMX95_PAD_ENET1_RX_CTL__NETCMIX_TOP_ETH0_RGMII_RX_CTL 0x57e
@@ -582,10 +582,10 @@
582582

583583
pinctrl_enetc1: enetc1grp {
584584
fsl,pins = <
585-
IMX95_PAD_ENET2_TD3__NETCMIX_TOP_ETH1_RGMII_TD3 0x57e
586-
IMX95_PAD_ENET2_TD2__NETCMIX_TOP_ETH1_RGMII_TD2 0x57e
587-
IMX95_PAD_ENET2_TD1__NETCMIX_TOP_ETH1_RGMII_TD1 0x57e
588-
IMX95_PAD_ENET2_TD0__NETCMIX_TOP_ETH1_RGMII_TD0 0x57e
585+
IMX95_PAD_ENET2_TD3__NETCMIX_TOP_ETH1_RGMII_TD3 0x50e
586+
IMX95_PAD_ENET2_TD2__NETCMIX_TOP_ETH1_RGMII_TD2 0x50e
587+
IMX95_PAD_ENET2_TD1__NETCMIX_TOP_ETH1_RGMII_TD1 0x50e
588+
IMX95_PAD_ENET2_TD0__NETCMIX_TOP_ETH1_RGMII_TD0 0x50e
589589
IMX95_PAD_ENET2_TX_CTL__NETCMIX_TOP_ETH1_RGMII_TX_CTL 0x57e
590590
IMX95_PAD_ENET2_TXC__NETCMIX_TOP_ETH1_RGMII_TX_CLK 0x58e
591591
IMX95_PAD_ENET2_RX_CTL__NETCMIX_TOP_ETH1_RGMII_RX_CTL 0x57e

‎arch/arm64/boot/dts/freescale/imx95-19x19-evk.dts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -536,17 +536,17 @@
536536
&scmi_iomuxc {
537537
pinctrl_emdio: emdiogrp{
538538
fsl,pins = <
539-
IMX95_PAD_ENET1_MDC__NETCMIX_TOP_NETC_MDC 0x57e
540-
IMX95_PAD_ENET1_MDIO__NETCMIX_TOP_NETC_MDIO 0x97e
539+
IMX95_PAD_ENET1_MDC__NETCMIX_TOP_NETC_MDC 0x50e
540+
IMX95_PAD_ENET1_MDIO__NETCMIX_TOP_NETC_MDIO 0x90e
541541
>;
542542
};
543543

544544
pinctrl_enetc0: enetc0grp {
545545
fsl,pins = <
546-
IMX95_PAD_ENET1_TD3__NETCMIX_TOP_ETH0_RGMII_TD3 0x57e
547-
IMX95_PAD_ENET1_TD2__NETCMIX_TOP_ETH0_RGMII_TD2 0x57e
548-
IMX95_PAD_ENET1_TD1__NETCMIX_TOP_ETH0_RGMII_TD1 0x57e
549-
IMX95_PAD_ENET1_TD0__NETCMIX_TOP_ETH0_RGMII_TD0 0x57e
546+
IMX95_PAD_ENET1_TD3__NETCMIX_TOP_ETH0_RGMII_TD3 0x50e
547+
IMX95_PAD_ENET1_TD2__NETCMIX_TOP_ETH0_RGMII_TD2 0x50e
548+
IMX95_PAD_ENET1_TD1__NETCMIX_TOP_ETH0_RGMII_TD1 0x50e
549+
IMX95_PAD_ENET1_TD0__NETCMIX_TOP_ETH0_RGMII_TD0 0x50e
550550
IMX95_PAD_ENET1_TX_CTL__NETCMIX_TOP_ETH0_RGMII_TX_CTL 0x57e
551551
IMX95_PAD_ENET1_TXC__NETCMIX_TOP_ETH0_RGMII_TX_CLK 0x58e
552552
IMX95_PAD_ENET1_RX_CTL__NETCMIX_TOP_ETH0_RGMII_RX_CTL 0x57e

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1678,7 +1678,7 @@
16781678
<0x9 0 1 0>;
16791679
reg-names = "dbi","atu", "dbi2", "app", "dma", "addr_space";
16801680
num-lanes = <1>;
1681-
interrupts = <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>;
1681+
interrupts = <GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH>;
16821682
interrupt-names = "dma";
16831683
clocks = <&scmi_clk IMX95_CLK_HSIO>,
16841684
<&scmi_clk IMX95_CLK_HSIOPLL>,

0 commit comments

Comments
 (0)