On 11:44-20231221, Bryan Brattlof wrote:
> With the Linux and U-Boot board dtb files unified, we now have a
> duplicate sdhci1 pinmux node. Remove it
>
> Signed-off-by: Bryan Brattlof <b...@ti.com>
> ---
> arch/arm/dts/k3-am654-r5-base-board.dts | 22 +++++++---------------
> 1 file changed, 7 insertions(+), 15 deletions(-)
>
> diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts
> b/arch/arm/dts/k3-am654-r5-base-board.dts
> index 856917bdfaa5d..c4096d1b754c4 100644
> --- a/arch/arm/dts/k3-am654-r5-base-board.dts
> +++ b/arch/arm/dts/k3-am654-r5-base-board.dts
> @@ -137,19 +137,6 @@
> };
>
> &main_pmx0 {
> - main_mmc1_pins_default: main_mmc1_pins_default {
> - pinctrl-single,pins = <
> - AM65X_IOPAD(0x02d4, PIN_INPUT_PULLDOWN, 0) /*
> (C27) MMC1_CLK */
> - AM65X_IOPAD(0x02d8, PIN_INPUT_PULLUP, 0) /*
> (C28) MMC1_CMD */
> - AM65X_IOPAD(0x02d0, PIN_INPUT_PULLUP, 0) /*
> (D28) MMC1_DAT0 */
> - AM65X_IOPAD(0x02cc, PIN_INPUT_PULLUP, 0) /*
> (E27) MMC1_DAT1 */
> - AM65X_IOPAD(0x02c8, PIN_INPUT_PULLUP, 0) /*
> (D26) MMC1_DAT2 */
> - AM65X_IOPAD(0x02c4, PIN_INPUT_PULLUP, 0) /*
> (D27) MMC1_DAT3 */
> - AM65X_IOPAD(0x02dc, PIN_INPUT_PULLUP, 0) /*
> (B24) MMC1_SDCD */
> - AM65X_IOPAD(0x02e0, PIN_INPUT, 0) /*
> (C24) MMC1_SDWP */
> - >;
> - };
> -
> usb0_pins_default: usb0_pins_default {
> pinctrl-single,pins = <
> AM65X_IOPAD(0x02bc, PIN_OUTPUT, 0) /* (AD9)
> USB0_DRVVBUS */
> @@ -176,12 +163,17 @@
> /delete-property/ power-domains;
> };
>
> +/* 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.
> + */
Same - please fix the comment style here as well.
> &sdhci1 {
> clock-names = "clk_xin";
> clocks = <&clk_200mhz>;
> - pinctrl-0 = <&main_mmc1_pins_default>;
> /delete-property/ power-domains;
> - ti,driver-strength-ohm = <50>;
> };
>
> &wkup_i2c0 {
> --
> 2.43.0
>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5
849D 1736 249D
