| Message ID | 20210724081009.15761-8-ashok.reddy.soma@xilinx.com |
|---|---|
| State | Superseded |
| Delegated to: | Michal Simek |
| Headers | show |
| Series | Arasan sdhci driver updates | expand |
On 7/24/21 5:10 PM, Ashok Reddy Soma wrote: > Since set_control_reg is available in sdhci.c, use it and remove > arasan_sdhci_set_control_reg(). > > Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma@xilinx.com> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com> Best Regards, Jaehoon Chung > --- > > drivers/mmc/zynq_sdhci.c | 21 +-------------------- > 1 file changed, 1 insertion(+), 20 deletions(-) > > diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c > index a192f60320..93d453a284 100644 > --- a/drivers/mmc/zynq_sdhci.c > +++ b/drivers/mmc/zynq_sdhci.c > @@ -600,29 +600,10 @@ static void arasan_dt_parse_clk_phases(struct udevice *dev) > "clk-phase-mmc-hs400"); > } > > -static void arasan_sdhci_set_control_reg(struct sdhci_host *host) > -{ > - struct mmc *mmc = (struct mmc *)host->mmc; > - u32 reg; > - > - if (!IS_SD(mmc)) > - return; > - > - if (mmc->signal_voltage == MMC_SIGNAL_VOLTAGE_180) { > - reg = sdhci_readw(host, SDHCI_HOST_CONTROL2); > - reg |= SDHCI_CTRL_VDD_180; > - sdhci_writew(host, reg, SDHCI_HOST_CONTROL2); > - } > - > - if (mmc->selected_mode > SD_HS && > - mmc->selected_mode <= MMC_HS_200) > - sdhci_set_uhs_timing(host); > -} > - > static const struct sdhci_ops arasan_ops = { > .platform_execute_tuning = &arasan_sdhci_execute_tuning, > .set_delay = &arasan_sdhci_set_tapdelay, > - .set_control_reg = &arasan_sdhci_set_control_reg, > + .set_control_reg = &sdhci_set_control_reg, > }; > #endif > >
diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c index a192f60320..93d453a284 100644 --- a/drivers/mmc/zynq_sdhci.c +++ b/drivers/mmc/zynq_sdhci.c @@ -600,29 +600,10 @@ static void arasan_dt_parse_clk_phases(struct udevice *dev) "clk-phase-mmc-hs400"); } -static void arasan_sdhci_set_control_reg(struct sdhci_host *host) -{ - struct mmc *mmc = (struct mmc *)host->mmc; - u32 reg; - - if (!IS_SD(mmc)) - return; - - if (mmc->signal_voltage == MMC_SIGNAL_VOLTAGE_180) { - reg = sdhci_readw(host, SDHCI_HOST_CONTROL2); - reg |= SDHCI_CTRL_VDD_180; - sdhci_writew(host, reg, SDHCI_HOST_CONTROL2); - } - - if (mmc->selected_mode > SD_HS && - mmc->selected_mode <= MMC_HS_200) - sdhci_set_uhs_timing(host); -} - static const struct sdhci_ops arasan_ops = { .platform_execute_tuning = &arasan_sdhci_execute_tuning, .set_delay = &arasan_sdhci_set_tapdelay, - .set_control_reg = &arasan_sdhci_set_control_reg, + .set_control_reg = &sdhci_set_control_reg, }; #endif
Since set_control_reg is available in sdhci.c, use it and remove arasan_sdhci_set_control_reg(). Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma@xilinx.com> --- drivers/mmc/zynq_sdhci.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-)