michaelh/zephyr
1
0
Fork 0
Code Releases Activity

boards: arm: Renamed NXP usdhc in imxrt5xx

Browse source 
The names of these peripherals in the device tree
did not match the Reference Manual for the RT500.

Also fixed a typo in a comment referring to USDHC which should have been
about USB.

Signed-off-by: Declan Snyder <declan.snyder@nxp.com>
This commit is contained in:
Declan Snyder 2022-08-30 10:30:44 -05:00 • committed by Carles Cufí
commit 19bd9a3618
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
boards/arm/mimxrt595_evk/mimxrt595_evk_cm33.dts
View file

@ -24,7 +24,7 @@
watchdog0 = &wwdt0; watchdog0 = &wwdt0;
magn0 = &fxos8700; magn0 = &fxos8700;
accel0 = &fxos8700; accel0 = &fxos8700;
sdhc0 = &usdhc1; sdhc0 = &usdhc0;
}; };
chosen { chosen {
@ -320,7 +320,7 @@ zephyr_udc0: &usbhs {
status = "okay"; status = "okay";
}; };
&usdhc1 { &usdhc0 {
status = "okay"; status = "okay";
pwr-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>; pwr-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>;
cd-gpios = <&gpio2 9 GPIO_ACTIVE_LOW>; cd-gpios = <&gpio2 9 GPIO_ACTIVE_LOW>;

4
dts/arm/nxp/nxp_rt5xx_common.dtsi
View file

@ -362,7 +362,7 @@
clk-divider = <1>; clk-divider = <1>;
}; };
usdhc1: usdhc@136000 { usdhc0: usdhc@136000 {
compatible = "nxp,imx-usdhc"; compatible = "nxp,imx-usdhc";
reg = <0x136000 0x1000>; reg = <0x136000 0x1000>;
status = "disabled"; status = "disabled";
@ -374,7 +374,7 @@
min-bus-freq = <400000>; min-bus-freq = <400000>;
}; };
usdhc2: usdhc@137000 { usdhc1: usdhc@137000 {
compatible = "nxp,imx-usdhc"; compatible = "nxp,imx-usdhc";
reg = <0x137000 0x1000>; reg = <0x137000 0x1000>;
status = "disabled"; status = "disabled";

4
soc/arm/nxp_imx/rt5xx/soc.c
View file

@ -147,7 +147,7 @@ static void usb_device_clock_init(void)
BOARD_USB_PHY_TXCAL45DM, BOARD_USB_PHY_TXCAL45DM,
}; };
/* Make sure USDHC ram buffer and usb1 phy has power up */ /* Make sure USBHS ram buffer and usb1 phy has power up */
POWER_DisablePD(kPDRUNCFG_APD_USBHS_SRAM); POWER_DisablePD(kPDRUNCFG_APD_USBHS_SRAM);
POWER_DisablePD(kPDRUNCFG_PPD_USBHS_SRAM); POWER_DisablePD(kPDRUNCFG_PPD_USBHS_SRAM);
POWER_DisablePD(kPDRUNCFG_LP_HSPAD_FSPI0_VDET); POWER_DisablePD(kPDRUNCFG_LP_HSPAD_FSPI0_VDET);
@ -289,7 +289,7 @@ static void clock_init(void)
/* Switch CLKOUT to FRO_DIV2 */ /* Switch CLKOUT to FRO_DIV2 */
CLOCK_AttachClk(kFRO_DIV2_to_CLKOUT); CLOCK_AttachClk(kFRO_DIV2_to_CLKOUT);
#if DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc1), okay) && CONFIG_IMX_USDHC #if DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc0), okay) && CONFIG_IMX_USDHC
/* Make sure USDHC ram buffer has been power up*/ /* Make sure USDHC ram buffer has been power up*/
POWER_DisablePD(kPDRUNCFG_APD_USDHC0_SRAM); POWER_DisablePD(kPDRUNCFG_APD_USDHC0_SRAM);
POWER_DisablePD(kPDRUNCFG_PPD_USDHC0_SRAM); POWER_DisablePD(kPDRUNCFG_PPD_USDHC0_SRAM);