From: Tanmay Kathpalia Date: Wed, 3 Dec 2025 12:21:38 +0000 (-0800) Subject: mmc: sdhci-cadence6: socfpga: Fix DT property naming convention X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c2ba8a2024101463ec03b8003e6c0146f2db893;p=thirdparty%2Fu-boot.git mmc: sdhci-cadence6: socfpga: Fix DT property naming convention 1. Replace underscores with hyphens in device tree property names to follow the standard DT naming convention. This affects all "lpbk_ctrl" properties which are now correctly named "lpbk-ctrl". Changes: - cdns,phy-gate-lpbk_ctrl-delay-* → cdns,phy-gate-lpbk-ctrl-delay-* - cdns,ctrl-hrs10-lpbk_ctrl-delay-* → cdns,ctrl-hrs10-lpbk-ctrl-delay-* 2. Fix typo: semmc → emmc in eMMC SDR PHY property name Signed-off-by: Tanmay Kathpalia Reviewed-by: Balsundar Ponnusamy Acked-by: Peng Fan Signed-off-by: Peng Fan --- diff --git a/drivers/mmc/sdhci-cadence6.c b/drivers/mmc/sdhci-cadence6.c index d4e2cb1c83e..d9467293807 100644 --- a/drivers/mmc/sdhci-cadence6.c +++ b/drivers/mmc/sdhci-cadence6.c @@ -73,84 +73,84 @@ struct sdhci_cdns6_ctrl_cfg { static struct sdhci_cdns6_phy_cfg sd_ds_phy_cfgs[] = { { "cdns,phy-dqs-timing-delay-sd-ds", 0x00380004, }, - { "cdns,phy-gate-lpbk_ctrl-delay-sd-ds", 0x01A00040, }, + { "cdns,phy-gate-lpbk-ctrl-delay-sd-ds", 0x01A00040, }, { "cdns,phy-dll-slave-ctrl-sd-ds", 0x00000000, }, { "cdns,phy-dq-timing-delay-sd-ds", 0x00000001, }, }; static struct sdhci_cdns6_phy_cfg sd_hs_phy_cfgs[] = { { "cdns,phy-dqs-timing-delay-sd-hs", 0x00380004, }, - { "cdns,phy-gate-lpbk_ctrl-delay-sd-hs", 0x01A00040, }, + { "cdns,phy-gate-lpbk-ctrl-delay-sd-hs", 0x01A00040, }, { "cdns,phy-dll-slave-ctrl-sd-hs", 0x00000000, }, { "cdns,phy-dq-timing-delay-sd-hs", 0x00000001, }, }; static struct sdhci_cdns6_phy_cfg emmc_sdr_phy_cfgs[] = { - { "cdns,phy-dqs-timing-delay-semmc-sdr", 0x00380004, }, - { "cdns,phy-gate-lpbk_ctrl-delay-emmc-sdr", 0x01A00040, }, + { "cdns,phy-dqs-timing-delay-emmc-sdr", 0x00380004, }, + { "cdns,phy-gate-lpbk-ctrl-delay-emmc-sdr", 0x01A00040, }, { "cdns,phy-dll-slave-ctrl-emmc-sdr", 0x00000000, }, { "cdns,phy-dq-timing-delay-emmc-sdr", 0x00000001, }, }; static struct sdhci_cdns6_phy_cfg emmc_ddr_phy_cfgs[] = { { "cdns,phy-dqs-timing-delay-emmc-ddr", 0x00380004, }, - { "cdns,phy-gate-lpbk_ctrl-delay-emmc-ddr", 0x01A00040, }, + { "cdns,phy-gate-lpbk-ctrl-delay-emmc-ddr", 0x01A00040, }, { "cdns,phy-dll-slave-ctrl-emmc-ddr", 0x00000000, }, { "cdns,phy-dq-timing-delay-emmc-ddr", 0x10000001, }, }; static struct sdhci_cdns6_phy_cfg emmc_hs200_phy_cfgs[] = { { "cdns,phy-dqs-timing-delay-emmc-hs200", 0x00380004, }, - { "cdns,phy-gate-lpbk_ctrl-delay-emmc-hs200", 0x01A00040, }, + { "cdns,phy-gate-lpbk-ctrl-delay-emmc-hs200", 0x01A00040, }, { "cdns,phy-dll-slave-ctrl-emmc-hs200", 0x00DADA00, }, { "cdns,phy-dq-timing-delay-emmc-hs200", 0x00000001, }, }; static struct sdhci_cdns6_phy_cfg emmc_hs400_phy_cfgs[] = { { "cdns,phy-dqs-timing-delay-emmc-hs400", 0x00280004, }, - { "cdns,phy-gate-lpbk_ctrl-delay-emmc-hs400", 0x01A00040, }, + { "cdns,phy-gate-lpbk-ctrl-delay-emmc-hs400", 0x01A00040, }, { "cdns,phy-dll-slave-ctrl-emmc-hs400", 0x00DAD800, }, { "cdns,phy-dq-timing-delay-emmc-hs400", 0x00000001, }, }; static struct sdhci_cdns6_ctrl_cfg sd_ds_ctrl_cfgs[] = { { "cdns,ctrl-hrs09-timing-delay-sd-ds", 0x0001800C, }, - { "cdns,ctrl-hrs10-lpbk_ctrl-delay-sd-ds", 0x00020000, }, + { "cdns,ctrl-hrs10-lpbk-ctrl-delay-sd-ds", 0x00020000, }, { "cdns,ctrl-hrs16-slave-ctrl-sd-ds", 0x00000000, }, { "cdns,ctrl-hrs07-timing-delay-sd-ds", 0x00080000, }, }; static struct sdhci_cdns6_ctrl_cfg sd_hs_ctrl_cfgs[] = { { "cdns,ctrl-hrs09-timing-delay-sd-hs", 0x0001800C, }, - { "cdns,ctrl-hrs10-lpbk_ctrl-delay-sd-hs", 0x00030000, }, + { "cdns,ctrl-hrs10-lpbk-ctrl-delay-sd-hs", 0x00030000, }, { "cdns,ctrl-hrs16-slave-ctrl-sd-hs", 0x00000000, }, { "cdns,ctrl-hrs07-timing-delay-sd-hs", 0x00080000, }, }; static struct sdhci_cdns6_ctrl_cfg emmc_sdr_ctrl_cfgs[] = { { "cdns,ctrl-hrs09-timing-delay-emmc-sdr", 0x0001800C, }, - { "cdns,ctrl-hrs10-lpbk_ctrl-delay-emmc-sdr", 0x00030000, }, + { "cdns,ctrl-hrs10-lpbk-ctrl-delay-emmc-sdr", 0x00030000, }, { "cdns,ctrl-hrs16-slave-ctrl-emmc-sdr", 0x00000000, }, { "cdns,ctrl-hrs07-timing-delay-emmc-sdr", 0x00080000, }, }; static struct sdhci_cdns6_ctrl_cfg emmc_ddr_ctrl_cfgs[] = { { "cdns,ctrl-hrs09-timing-delay-emmc-ddr", 0x0001800C, }, - { "cdns,ctrl-hrs10-lpbk_ctrl-delay-emmc-ddr", 0x00020000, }, + { "cdns,ctrl-hrs10-lpbk-ctrl-delay-emmc-ddr", 0x00020000, }, { "cdns,ctrl-hrs16-slave-ctrl-emmc-ddr", 0x11000001, }, { "cdns,ctrl-hrs07-timing-delay-emmc-ddr", 0x00090001, }, }; static struct sdhci_cdns6_ctrl_cfg emmc_hs200_ctrl_cfgs[] = { { "cdns,ctrl-hrs09-timing-delay-emmc-hs200", 0x00018000, }, - { "cdns,ctrl-hrs10-lpbk_ctrl-delay-emmc-hs200", 0x00080000, }, + { "cdns,ctrl-hrs10-lpbk-ctrl-delay-emmc-hs200", 0x00080000, }, { "cdns,ctrl-hrs16-slave-ctrl-emmc-hs200", 0x00000000, }, { "cdns,ctrl-hrs07-timing-delay-emmc-hs200", 0x00090000, }, }; static struct sdhci_cdns6_ctrl_cfg emmc_hs400_ctrl_cfgs[] = { { "cdns,ctrl-hrs09-timing-delay-emmc-hs400", 0x00018000, }, - { "cdns,ctrl-hrs10-lpbk_ctrl-delay-emmc-hs400", 0x00080000, }, + { "cdns,ctrl-hrs10-lpbk-ctrl-delay-emmc-hs400", 0x00080000, }, { "cdns,ctrl-hrs16-slave-ctrl-emmc-hs400", 0x11000000, }, { "cdns,ctrl-hrs07-timing-delay-emmc-hs400", 0x00080000, }, };