Skip to content

Commit 1e7c8c5

Browse files
arndbarndb
committed
Merge tag 'imx-fixes-6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes
i.MX fixes for 6.16: - Keep LDO5 always on for imx8mm-verdin to fix broken Ethernet support - Add big-endian property back for LS1046A watchdog, as the removal was an accident - Fix DMA interrupter number of i.MX95 pcie0_ep device - A set of changes from Tim Harvey to fix TPM SPI frequency on imx8mp-venice devices - A couple of changes from Wei Fang to fix NETC overshoot issue on i.MX95 EVK boards * tag 'imx-fixes-6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: dts: freescale: imx8mm-verdin: Keep LDO5 always on arm64: dts: imx95: Correct the DMA interrupter number of pcie0_ep arm64: dts: add big-endian property back into watchdog node arm64: dts: imx95-15x15-evk: fix the overshoot issue of NETC arm64: dts: imx95-19x19-evk: fix the overshoot issue of NETC arm64: dts: imx8mp-venice-gw74xx: fix TPM SPI frequency arm64: dts: imx8mp-venice-gw73xx: fix TPM SPI frequency arm64: dts: imx8mp-venice-gw72xx: fix TPM SPI frequency arm64: dts: imx8mp-venice-gw71xx: fix TPM SPI frequency Link: https://lore.kernel.org/r/aGzNeZ7KtsRsUkZT@dragon Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 3f3fb97 + fbe94be commit 1e7c8c5

File tree

9 files changed

+24
-22
lines changed

9 files changed

+24
-22
lines changed

‎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
@@ -574,17 +574,17 @@
574574
&scmi_iomuxc {
575575
pinctrl_emdio: emdiogrp {
576576
fsl,pins = <
577-
IMX95_PAD_ENET2_MDC__NETCMIX_TOP_NETC_MDC 0x57e
578-
IMX95_PAD_ENET2_MDIO__NETCMIX_TOP_NETC_MDIO 0x97e
577+
IMX95_PAD_ENET2_MDC__NETCMIX_TOP_NETC_MDC 0x50e
578+
IMX95_PAD_ENET2_MDIO__NETCMIX_TOP_NETC_MDIO 0x90e
579579
>;
580580
};
581581

582582
pinctrl_enetc0: enetc0grp {
583583
fsl,pins = <
584-
IMX95_PAD_ENET1_TD3__NETCMIX_TOP_ETH0_RGMII_TD3 0x57e
585-
IMX95_PAD_ENET1_TD2__NETCMIX_TOP_ETH0_RGMII_TD2 0x57e
586-
IMX95_PAD_ENET1_TD1__NETCMIX_TOP_ETH0_RGMII_TD1 0x57e
587-
IMX95_PAD_ENET1_TD0__NETCMIX_TOP_ETH0_RGMII_TD0 0x57e
584+
IMX95_PAD_ENET1_TD3__NETCMIX_TOP_ETH0_RGMII_TD3 0x50e
585+
IMX95_PAD_ENET1_TD2__NETCMIX_TOP_ETH0_RGMII_TD2 0x50e
586+
IMX95_PAD_ENET1_TD1__NETCMIX_TOP_ETH0_RGMII_TD1 0x50e
587+
IMX95_PAD_ENET1_TD0__NETCMIX_TOP_ETH0_RGMII_TD0 0x50e
588588
IMX95_PAD_ENET1_TX_CTL__NETCMIX_TOP_ETH0_RGMII_TX_CTL 0x57e
589589
IMX95_PAD_ENET1_TXC__NETCMIX_TOP_ETH0_RGMII_TX_CLK 0x58e
590590
IMX95_PAD_ENET1_RX_CTL__NETCMIX_TOP_ETH0_RGMII_RX_CTL 0x57e
@@ -598,10 +598,10 @@
598598

599599
pinctrl_enetc1: enetc1grp {
600600
fsl,pins = <
601-
IMX95_PAD_ENET2_TD3__NETCMIX_TOP_ETH1_RGMII_TD3 0x57e
602-
IMX95_PAD_ENET2_TD2__NETCMIX_TOP_ETH1_RGMII_TD2 0x57e
603-
IMX95_PAD_ENET2_TD1__NETCMIX_TOP_ETH1_RGMII_TD1 0x57e
604-
IMX95_PAD_ENET2_TD0__NETCMIX_TOP_ETH1_RGMII_TD0 0x57e
601+
IMX95_PAD_ENET2_TD3__NETCMIX_TOP_ETH1_RGMII_TD3 0x50e
602+
IMX95_PAD_ENET2_TD2__NETCMIX_TOP_ETH1_RGMII_TD2 0x50e
603+
IMX95_PAD_ENET2_TD1__NETCMIX_TOP_ETH1_RGMII_TD1 0x50e
604+
IMX95_PAD_ENET2_TD0__NETCMIX_TOP_ETH1_RGMII_TD0 0x50e
605605
IMX95_PAD_ENET2_TX_CTL__NETCMIX_TOP_ETH1_RGMII_TX_CTL 0x57e
606606
IMX95_PAD_ENET2_TXC__NETCMIX_TOP_ETH1_RGMII_TX_CLK 0x58e
607607
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
@@ -566,17 +566,17 @@
566566
&scmi_iomuxc {
567567
pinctrl_emdio: emdiogrp{
568568
fsl,pins = <
569-
IMX95_PAD_ENET1_MDC__NETCMIX_TOP_NETC_MDC 0x57e
570-
IMX95_PAD_ENET1_MDIO__NETCMIX_TOP_NETC_MDIO 0x97e
569+
IMX95_PAD_ENET1_MDC__NETCMIX_TOP_NETC_MDC 0x50e
570+
IMX95_PAD_ENET1_MDIO__NETCMIX_TOP_NETC_MDIO 0x90e
571571
>;
572572
};
573573

574574
pinctrl_enetc0: enetc0grp {
575575
fsl,pins = <
576-
IMX95_PAD_ENET1_TD3__NETCMIX_TOP_ETH0_RGMII_TD3 0x57e
577-
IMX95_PAD_ENET1_TD2__NETCMIX_TOP_ETH0_RGMII_TD2 0x57e
578-
IMX95_PAD_ENET1_TD1__NETCMIX_TOP_ETH0_RGMII_TD1 0x57e
579-
IMX95_PAD_ENET1_TD0__NETCMIX_TOP_ETH0_RGMII_TD0 0x57e
576+
IMX95_PAD_ENET1_TD3__NETCMIX_TOP_ETH0_RGMII_TD3 0x50e
577+
IMX95_PAD_ENET1_TD2__NETCMIX_TOP_ETH0_RGMII_TD2 0x50e
578+
IMX95_PAD_ENET1_TD1__NETCMIX_TOP_ETH0_RGMII_TD1 0x50e
579+
IMX95_PAD_ENET1_TD0__NETCMIX_TOP_ETH0_RGMII_TD0 0x50e
580580
IMX95_PAD_ENET1_TX_CTL__NETCMIX_TOP_ETH0_RGMII_TX_CTL 0x57e
581581
IMX95_PAD_ENET1_TXC__NETCMIX_TOP_ETH0_RGMII_TX_CLK 0x58e
582582
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
@@ -1708,7 +1708,7 @@
17081708
<0x9 0 1 0>;
17091709
reg-names = "dbi","atu", "dbi2", "app", "dma", "addr_space";
17101710
num-lanes = <1>;
1711-
interrupts = <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>;
1711+
interrupts = <GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH>;
17121712
interrupt-names = "dma";
17131713
clocks = <&scmi_clk IMX95_CLK_HSIO>,
17141714
<&scmi_clk IMX95_CLK_HSIOPLL>,

0 commit comments

Comments
 (0)