| Message ID | 1475678440-3525-6-git-send-email-riteshh@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 05/10/16 17:40, Ritesh Harjani wrote: > This add get_min_clock() and get_max_clock() callback > for sdhci-msm. sdhci-msm min/max clocks may be different > hence implement these callbacks. > > Signed-off-by: Sahitya Tummala <stummala@codeaurora.org> > Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org> > --- > drivers/mmc/host/sdhci-msm.c | 29 +++++++++++++++++++++++++++++ > 1 file changed, 29 insertions(+) > > diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c > index 042ecb2..4e17201 100644 > --- a/drivers/mmc/host/sdhci-msm.c > +++ b/drivers/mmc/host/sdhci-msm.c > @@ -68,6 +68,7 @@ > #define CORE_VENDOR_SPEC_CAPABILITIES0 0x11c > > #define TCXO_FREQ 19200000 > +#define SDHCI_MSM_MIN_CLOCK 400000 > > #define CDR_SELEXT_SHIFT 20 > #define CDR_SELEXT_MASK (0xf << CDR_SELEXT_SHIFT) > @@ -561,6 +562,32 @@ static irqreturn_t sdhci_msm_pwr_irq(int irq, void *data) > return IRQ_HANDLED; > } > > +static unsigned int sdhci_msm_get_max_clock(struct sdhci_host *host) > +{ > + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > + struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host); > + int count; > + > + if (msm_host->clk_table) { I don't know if DT allows empty arrays, but if it does, might not msm_host->clk_table_sz be zero here. > + count = msm_host->clk_table_sz; > + return msm_host->clk_table[count - 1]; > + } else { 'else' is redundant here. > + return clk_round_rate(msm_host->clk, ULONG_MAX); > + } > +} > + > +static unsigned int sdhci_msm_get_min_clock(struct sdhci_host *host) > +{ > + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > + struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host); > + > + if (msm_host->clk_table) { Same about possibility of msm_host->clk_table_sz being zero. > + return msm_host->clk_table[0]; > + } else { 'else' is redundant here. > + return SDHCI_MSM_MIN_CLOCK; > + } > +} > + > static const struct of_device_id sdhci_msm_dt_match[] = { > { .compatible = "qcom,sdhci-msm-v4" }, > {}, > @@ -572,6 +599,8 @@ static const struct sdhci_ops sdhci_msm_ops = { > .platform_execute_tuning = sdhci_msm_execute_tuning, > .reset = sdhci_reset, > .set_clock = sdhci_set_clock, > + .get_min_clock = sdhci_msm_get_min_clock, > + .get_max_clock = sdhci_msm_get_max_clock, > .set_bus_width = sdhci_set_bus_width, > .set_uhs_signaling = sdhci_msm_set_uhs_signaling, > .voltage_switch = sdhci_msm_voltage_switch, > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Adrian, On 10/10/2016 3:16 PM, Adrian Hunter wrote: > On 05/10/16 17:40, Ritesh Harjani wrote: >> This add get_min_clock() and get_max_clock() callback >> for sdhci-msm. sdhci-msm min/max clocks may be different >> hence implement these callbacks. >> >> Signed-off-by: Sahitya Tummala <stummala@codeaurora.org> >> Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org> >> --- >> drivers/mmc/host/sdhci-msm.c | 29 +++++++++++++++++++++++++++++ >> 1 file changed, 29 insertions(+) >> >> diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c >> index 042ecb2..4e17201 100644 >> --- a/drivers/mmc/host/sdhci-msm.c >> +++ b/drivers/mmc/host/sdhci-msm.c >> @@ -68,6 +68,7 @@ >> #define CORE_VENDOR_SPEC_CAPABILITIES0 0x11c >> >> #define TCXO_FREQ 19200000 >> +#define SDHCI_MSM_MIN_CLOCK 400000 >> >> #define CDR_SELEXT_SHIFT 20 >> #define CDR_SELEXT_MASK (0xf << CDR_SELEXT_SHIFT) >> @@ -561,6 +562,32 @@ static irqreturn_t sdhci_msm_pwr_irq(int irq, void *data) >> return IRQ_HANDLED; >> } >> >> +static unsigned int sdhci_msm_get_max_clock(struct sdhci_host *host) >> +{ >> + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); >> + struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host); >> + int count; >> + >> + if (msm_host->clk_table) { > > I don't know if DT allows empty arrays, but if it does, might not > msm_host->clk_table_sz be zero here. Sure, I will take care of this as mentioned in the response of previous patch 03. > >> + count = msm_host->clk_table_sz; >> + return msm_host->clk_table[count - 1]; >> + } else { > > 'else' is redundant here. Done. Will remove it. > >> + return clk_round_rate(msm_host->clk, ULONG_MAX); >> + } >> +} >> + >> +static unsigned int sdhci_msm_get_min_clock(struct sdhci_host *host) >> +{ >> + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); >> + struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host); >> + >> + if (msm_host->clk_table) { > > Same about possibility of msm_host->clk_table_sz being zero. Yes, as mentioned. Will take care of this. > >> + return msm_host->clk_table[0]; >> + } else { > > 'else' is redundant here. Done. > >> + return SDHCI_MSM_MIN_CLOCK; >> + } >> +} >> + >> static const struct of_device_id sdhci_msm_dt_match[] = { >> { .compatible = "qcom,sdhci-msm-v4" }, >> {}, >> @@ -572,6 +599,8 @@ static const struct sdhci_ops sdhci_msm_ops = { >> .platform_execute_tuning = sdhci_msm_execute_tuning, >> .reset = sdhci_reset, >> .set_clock = sdhci_set_clock, >> + .get_min_clock = sdhci_msm_get_min_clock, >> + .get_max_clock = sdhci_msm_get_max_clock, >> .set_bus_width = sdhci_set_bus_width, >> .set_uhs_signaling = sdhci_msm_set_uhs_signaling, >> .voltage_switch = sdhci_msm_voltage_switch, >> > > -- > To unsubscribe from this list: send the line "unsubscribe linux-mmc" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 042ecb2..4e17201 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -68,6 +68,7 @@ #define CORE_VENDOR_SPEC_CAPABILITIES0 0x11c #define TCXO_FREQ 19200000 +#define SDHCI_MSM_MIN_CLOCK 400000 #define CDR_SELEXT_SHIFT 20 #define CDR_SELEXT_MASK (0xf << CDR_SELEXT_SHIFT) @@ -561,6 +562,32 @@ static irqreturn_t sdhci_msm_pwr_irq(int irq, void *data) return IRQ_HANDLED; } +static unsigned int sdhci_msm_get_max_clock(struct sdhci_host *host) +{ + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); + struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host); + int count; + + if (msm_host->clk_table) { + count = msm_host->clk_table_sz; + return msm_host->clk_table[count - 1]; + } else { + return clk_round_rate(msm_host->clk, ULONG_MAX); + } +} + +static unsigned int sdhci_msm_get_min_clock(struct sdhci_host *host) +{ + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); + struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host); + + if (msm_host->clk_table) { + return msm_host->clk_table[0]; + } else { + return SDHCI_MSM_MIN_CLOCK; + } +} + static const struct of_device_id sdhci_msm_dt_match[] = { { .compatible = "qcom,sdhci-msm-v4" }, {}, @@ -572,6 +599,8 @@ static const struct sdhci_ops sdhci_msm_ops = { .platform_execute_tuning = sdhci_msm_execute_tuning, .reset = sdhci_reset, .set_clock = sdhci_set_clock, + .get_min_clock = sdhci_msm_get_min_clock, + .get_max_clock = sdhci_msm_get_max_clock, .set_bus_width = sdhci_set_bus_width, .set_uhs_signaling = sdhci_msm_set_uhs_signaling, .voltage_switch = sdhci_msm_voltage_switch,