On 11:44-20231221, Bryan Brattlof wrote: > With the Linux and U-Boot board dtb files unified, we now have > a duplicate sdhci0 pinmux node. Remove it > > Signed-off-by: Bryan Brattlof <b...@ti.com> > --- > arch/arm/dts/k3-am654-r5-base-board.dts | 25 +++++++------------------ > 1 file changed, 7 insertions(+), 18 deletions(-) > > diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts > b/arch/arm/dts/k3-am654-r5-base-board.dts > index 66953eb5581ae..856917bdfaa5d 100644 > --- a/arch/arm/dts/k3-am654-r5-base-board.dts > +++ b/arch/arm/dts/k3-am654-r5-base-board.dts > @@ -137,22 +137,6 @@ > }; > > &main_pmx0 { > - main_mmc0_pins_default: main_mmc0_pins_default { > - pinctrl-single,pins = < > - AM65X_IOPAD(0x01a8, PIN_INPUT_PULLDOWN, 0) /* > (B25) MMC0_CLK */ > - AM65X_IOPAD(0x01aC, PIN_INPUT_PULLUP, 0) /* > (B27) MMC0_CMD */ > - AM65X_IOPAD(0x01a4, PIN_INPUT_PULLUP, 0) /* > (A26) MMC0_DAT0 */ > - AM65X_IOPAD(0x01a0, PIN_INPUT_PULLUP, 0) /* > (E25) MMC0_DAT1 */ > - AM65X_IOPAD(0x019c, PIN_INPUT_PULLUP, 0) /* > (C26) MMC0_DAT2 */ > - AM65X_IOPAD(0x0198, PIN_INPUT_PULLUP, 0) /* > (A25) MMC0_DAT3 */ > - AM65X_IOPAD(0x0194, PIN_INPUT_PULLUP, 0) /* > (E24) MMC0_DAT4 */ > - AM65X_IOPAD(0x0190, PIN_INPUT_PULLUP, 0) /* > (A24) MMC0_DAT5 */ > - AM65X_IOPAD(0x018c, PIN_INPUT_PULLUP, 0) /* > (B26) MMC0_DAT6 */ > - AM65X_IOPAD(0x0188, PIN_INPUT_PULLUP, 0) /* > (D25) MMC0_DAT7 */ > - AM65X_IOPAD(0x01b0, PIN_INPUT, 0) /* > (C25) MMC0_DS */ > - >; > - }; > - > main_mmc1_pins_default: main_mmc1_pins_default { > pinctrl-single,pins = < > AM65X_IOPAD(0x02d4, PIN_INPUT_PULLDOWN, 0) /* > (C27) MMC1_CLK */ > @@ -179,12 +163,17 @@ > pinctrl-0 = <&wkup_vtt_pins_default>; > }; > > +/* MMC is probed to pull in firmware, so any clock > + * or power-domain operation will fail as we do not > + * have the firmware running at this point. Delete the > + * power-domain properties to avoid making calls to > + * SYSFW before it is loaded. Public ROM has already > + * set it up for us anyway. > + */
Please fix your comment style here: /* * blah blah */ > &sdhci0 { > clock-names = "clk_xin"; > clocks = <&clk_200mhz>; > - pinctrl-0 = <&main_mmc0_pins_default>; > /delete-property/ power-domains; > - ti,driver-strength-ohm = <50>; > }; > > &sdhci1 { > -- > 2.43.0 > -- Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D