imx7d-sdb: Sync devicetree with kernel 6.5-rc1
Subsystems (2)
Fabio Estevam
reviewerPATCH 1/1 imx7d-sdb: Sync devicetree with kernel 6.5-rc1
From: Fabio Estevam <[email protected]>
Commit 0aea5dda2928 ("ARM: dts: imx7d-sdb-u-boot: Fix usdhc1 UHS operation") did a temporary workaround by addng the usdhc1 fix inside the -u-boot.dtsi file.
The imx7d-sdb.dts from kernel 6.5-rc1 contains the proper UHS fix, so sync the devicetree tree and remove the previous fix from -u-boot.dtsi.
Also, adjust the PMIC node name inside pmic_get() to match the devicetree update.
--- arch/arm/dts/imx7d-sdb-u-boot.dtsi | 51 ---------------- arch/arm/dts/imx7d-sdb.dts | 73 +++++++++++++++++------ board/freescale/mx7dsabresd/mx7dsabresd.c | 2 +- 3 files changed, 56 insertions(+), 70 deletions(-)
arch/arm/dts/imx7d-sdb-u-boot.dtsi +0 -51
@@ -5,54 +5,3 @@ &usbotg1 { dr_mode = "peripheral"; }; - -&usdhc1 { - pinctrl-names = "default", "state_100mhz", "state_200mhz"; - pinctrl-0 = <&pinctrl_usdhc1>, <&pinctrl_usdhc1_gpio>; - pinctrl-1 = <&pinctrl_usdhc1_100mhz>, <&pinctrl_usdhc1_gpio>; - pinctrl-2 = <&pinctrl_usdhc1_200mhz>, <&pinctrl_usdhc1_gpio>; -}; - -&pinctrl_usdhc1 { - fsl,pins = < - MX7D_PAD_SD1_CMD__SD1_CMD 0x59 - MX7D_PAD_SD1_CLK__SD1_CLK 0x19 - MX7D_PAD_SD1_DATA0__SD1_DATA0 0x59 - MX7D_PAD_SD1_DATA1__SD1_DATA1 0x59 - MX7D_PAD_SD1_DATA2__SD1_DATA2 0x59 - MX7D_PAD_SD1_DATA3__SD1_DATA3 0x59 - >; -}; - -&iomuxc { - pinctrl_usdhc1_gpio: usdhc1gpiogrp { - fsl,pins = < - MX7D_PAD_SD1_CD_B__GPIO5_IO0 0x59 /* CD */ - MX7D_PAD_SD1_WP__GPIO5_IO1 0x59 /* WP */ - MX7D_PAD_SD1_RESET_B__GPIO5_IO2 0x59 /* vmmc */ - MX7D_PAD_GPIO1_IO08__SD1_VSELECT 0x59 /* VSELECT */ - >; - }; - - pinctrl_usdhc1_100mhz: usdhc1100mhzgrp { - fsl,pins = < - MX7D_PAD_SD1_CMD__SD1_CMD 0x5a - MX7D_PAD_SD1_CLK__SD1_CLK 0x1a - MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5a - MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5a - MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5a - MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5a - >; - }; - - pinctrl_usdhc1_200mhz: usdhc1200mhzgrp { - fsl,pins = < - MX7D_PAD_SD1_CMD__SD1_CMD 0x5b - MX7D_PAD_SD1_CLK__SD1_CLK 0x1b - MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5b - MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5b - MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5b - MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5b - >; - }; -};
arch/arm/dts/imx7d-sdb.dts +55 -18
132 lines not on this page · raw message
board/freescale/mx7dsabresd/mx7dsabresd.c +1 -1
@@ -267,7 +267,7 @@ int power_init_board(void)struct udevice *dev;int ret, dev_id, rev_id; - ret =pmic_get ("pfuze3000@8" , &dev); + ret =pmic_get ("pmic@8" , &dev);if (ret == -ENODEV )return 0 ;if (ret !=0 )
Signature · 1 line
2.34.1
Quoted 6 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Commit
0aea5dda2928("ARM: dts: imx7d-sdb-u-boot: Fix usdhc1 UHS operation") did a temporary workaround by addng the usdhc1 fix inside the-u-boot.dtsifile.
Quoted 8 lines
The
imx7d-sdb.dtsfrom kernel 6.5-rc1 contains the proper UHS fix, so sync the devicetree tree and remove the previous fix from-u-boot.dtsi.Also, adjust the PMIC node name inside
pmic_get()to match the devicetree update.Signed-off-by Fabio Estevam <[email protected]>
Applied to u-boot-imx next, thanks.