| Message ID | 20230418164618.2571309-10-jonas@kwiboo.se |
|---|---|
| State | Accepted |
| Commit | 667576c59d492116b0c4ffc0194b3b86b84c85e3 |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: eMMC fixes for RK3568 and support for RK3588 | expand |
On 2023/4/19 00:46, Jonas Karlman wrote: > Remove empty implementations of get_phy and set_enhanced_strobe ops. > Change driver set_enhanced_strobe to return 0 in order to allow missing > implementation of the ops. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > v2: > - No change > > drivers/mmc/rockchip_sdhci.c | 14 +------------- > 1 file changed, 1 insertion(+), 13 deletions(-) > > diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c > index 8e29430a483e..9716fbb54dd4 100644 > --- a/drivers/mmc/rockchip_sdhci.c > +++ b/drivers/mmc/rockchip_sdhci.c > @@ -365,16 +365,6 @@ static int rk3568_sdhci_config_dll(struct sdhci_host *host, u32 clock, bool enab > return 0; > } > > -static int rk3568_emmc_get_phy(struct udevice *dev) > -{ > - return 0; > -} > - > -static int rk3568_sdhci_set_enhanced_strobe(struct sdhci_host *host) > -{ > - return 0; > -} > - > static int rk3568_sdhci_set_ios_post(struct sdhci_host *host) > { > struct mmc *mmc = host->mmc; > @@ -525,7 +515,7 @@ static int rockchip_sdhci_set_enhanced_strobe(struct sdhci_host *host) > if (data->set_enhanced_strobe) > return data->set_enhanced_strobe(host); > > - return -ENOTSUPP; > + return 0; > } > > static struct sdhci_ops rockchip_sdhci_ops = { > @@ -615,11 +605,9 @@ static const struct sdhci_data rk3399_data = { > }; > > static const struct sdhci_data rk3568_data = { > - .get_phy = rk3568_emmc_get_phy, > .set_ios_post = rk3568_sdhci_set_ios_post, > .set_clock = rk3568_sdhci_set_clock, > .config_dll = rk3568_sdhci_config_dll, > - .set_enhanced_strobe = rk3568_sdhci_set_enhanced_strobe, > }; > > static const struct udevice_id sdhci_ids[] = {
diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c index 8e29430a483e..9716fbb54dd4 100644 --- a/drivers/mmc/rockchip_sdhci.c +++ b/drivers/mmc/rockchip_sdhci.c @@ -365,16 +365,6 @@ static int rk3568_sdhci_config_dll(struct sdhci_host *host, u32 clock, bool enab return 0; } -static int rk3568_emmc_get_phy(struct udevice *dev) -{ - return 0; -} - -static int rk3568_sdhci_set_enhanced_strobe(struct sdhci_host *host) -{ - return 0; -} - static int rk3568_sdhci_set_ios_post(struct sdhci_host *host) { struct mmc *mmc = host->mmc; @@ -525,7 +515,7 @@ static int rockchip_sdhci_set_enhanced_strobe(struct sdhci_host *host) if (data->set_enhanced_strobe) return data->set_enhanced_strobe(host); - return -ENOTSUPP; + return 0; } static struct sdhci_ops rockchip_sdhci_ops = { @@ -615,11 +605,9 @@ static const struct sdhci_data rk3399_data = { }; static const struct sdhci_data rk3568_data = { - .get_phy = rk3568_emmc_get_phy, .set_ios_post = rk3568_sdhci_set_ios_post, .set_clock = rk3568_sdhci_set_clock, .config_dll = rk3568_sdhci_config_dll, - .set_enhanced_strobe = rk3568_sdhci_set_enhanced_strobe, }; static const struct udevice_id sdhci_ids[] = {
Remove empty implementations of get_phy and set_enhanced_strobe ops. Change driver set_enhanced_strobe to return 0 in order to allow missing implementation of the ops. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- v2: - No change drivers/mmc/rockchip_sdhci.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)