diff mbox series

sdhci: tegra: Avoid reading autocal timeout values when not applicable

Message ID 1590005337-1087-1-git-send-email-skomatineni@nvidia.com
State New
Headers show
Series sdhci: tegra: Avoid reading autocal timeout values when not applicable | expand

Commit Message

Sowjanya Komatineni May 20, 2020, 8:08 p.m. UTC
When auto calibration timeouts, calibration is disabled and fail-safe
drive strength values are programmed based on the signal voltage.

Different fail-safe drive strength values based on voltage are
applicable only for SoCs supporting 3V3 and 1V8 pad controls.

So, this patch avoids reading these properties from the device tree
for SoCs not using pad controls and the warning of missing properties
will not show up on these SoC platforms.

Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
---
 drivers/mmc/host/sdhci-tegra.c | 57 ++++++++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 24 deletions(-)

Comments

Dmitry Osipenko May 21, 2020, 12:40 p.m. UTC | #1
20.05.2020 23:08, Sowjanya Komatineni пишет:
> When auto calibration timeouts, calibration is disabled and fail-safe
> drive strength values are programmed based on the signal voltage.
> 
> Different fail-safe drive strength values based on voltage are
> applicable only for SoCs supporting 3V3 and 1V8 pad controls.
> 
> So, this patch avoids reading these properties from the device tree
> for SoCs not using pad controls and the warning of missing properties
> will not show up on these SoC platforms.
> 
> Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
> ---
>  drivers/mmc/host/sdhci-tegra.c | 57 ++++++++++++++++++++++++------------------
>  1 file changed, 33 insertions(+), 24 deletions(-)

Hello Sowjanya,

Thank you for the patch.

Tested-by: Dmitry Osipenko <digetx@gmail.com>
Thierry Reding May 22, 2020, 12:26 p.m. UTC | #2
On Wed, May 20, 2020 at 01:08:57PM -0700, Sowjanya Komatineni wrote:
> When auto calibration timeouts, calibration is disabled and fail-safe
> drive strength values are programmed based on the signal voltage.
> 
> Different fail-safe drive strength values based on voltage are
> applicable only for SoCs supporting 3V3 and 1V8 pad controls.
> 
> So, this patch avoids reading these properties from the device tree
> for SoCs not using pad controls and the warning of missing properties
> will not show up on these SoC platforms.
> 
> Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
> ---
>  drivers/mmc/host/sdhci-tegra.c | 57 ++++++++++++++++++++++++------------------
>  1 file changed, 33 insertions(+), 24 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
> index 3e2c510..141b49b 100644
> --- a/drivers/mmc/host/sdhci-tegra.c
> +++ b/drivers/mmc/host/sdhci-tegra.c
> @@ -605,6 +605,39 @@ static void tegra_sdhci_parse_pad_autocal_dt(struct sdhci_host *host)
>  		autocal->pull_down_1v8 = 0;
>  
>  	err = device_property_read_u32(host->mmc->parent,
> +			"nvidia,pad-autocal-pull-up-offset-sdr104",
> +			&autocal->pull_up_sdr104);
> +	if (err)
> +		autocal->pull_up_sdr104 = autocal->pull_up_1v8;
> +
> +	err = device_property_read_u32(host->mmc->parent,
> +			"nvidia,pad-autocal-pull-down-offset-sdr104",
> +			&autocal->pull_down_sdr104);
> +	if (err)
> +		autocal->pull_down_sdr104 = autocal->pull_down_1v8;
> +
> +	err = device_property_read_u32(host->mmc->parent,
> +			"nvidia,pad-autocal-pull-up-offset-hs400",
> +			&autocal->pull_up_hs400);
> +	if (err)
> +		autocal->pull_up_hs400 = autocal->pull_up_1v8;
> +
> +	err = device_property_read_u32(host->mmc->parent,
> +			"nvidia,pad-autocal-pull-down-offset-hs400",
> +			&autocal->pull_down_hs400);
> +	if (err)
> +		autocal->pull_down_hs400 = autocal->pull_down_1v8;
> +
> +	/*
> +	 * Different fail-safe drive strength values based on the signaling
> +	 * voltage are applicable for SoCs supporting 3V3 and 1V8 pad controls.
> +	 * So, avoid reading below device tree properies for SoCs that don't
> +	 * have NVQUIRK_NEEDS_PAD_CONTROL.
> +	 */
> +	if (!(tegra_host->soc_data->nvquirks & NVQUIRK_NEEDS_PAD_CONTROL))
> +		return;

Hm... so what exactly is the difference between NVQUIRK_HAS_PADCALIB? I
think Tegra30 will also end up calling tegra_sdhci_set_padctrl(), but it
will then write the default (0) value for these drive strength. Is that
okay?

Thierry
Dmitry Osipenko May 22, 2020, 12:28 p.m. UTC | #3
20.05.2020 23:08, Sowjanya Komatineni пишет:
> When auto calibration timeouts, calibration is disabled and fail-safe
> drive strength values are programmed based on the signal voltage.
> 
> Different fail-safe drive strength values based on voltage are
> applicable only for SoCs supporting 3V3 and 1V8 pad controls.
> 
> So, this patch avoids reading these properties from the device tree
> for SoCs not using pad controls and the warning of missing properties
> will not show up on these SoC platforms.
> 
> Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
> ---
>  drivers/mmc/host/sdhci-tegra.c | 57 ++++++++++++++++++++++++------------------
>  1 file changed, 33 insertions(+), 24 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
> index 3e2c510..141b49b 100644
> --- a/drivers/mmc/host/sdhci-tegra.c
> +++ b/drivers/mmc/host/sdhci-tegra.c
> @@ -605,6 +605,39 @@ static void tegra_sdhci_parse_pad_autocal_dt(struct sdhci_host *host)
>  		autocal->pull_down_1v8 = 0;
>  
>  	err = device_property_read_u32(host->mmc->parent,
> +			"nvidia,pad-autocal-pull-up-offset-sdr104",
> +			&autocal->pull_up_sdr104);
> +	if (err)
> +		autocal->pull_up_sdr104 = autocal->pull_up_1v8;
> +
> +	err = device_property_read_u32(host->mmc->parent,
> +			"nvidia,pad-autocal-pull-down-offset-sdr104",
> +			&autocal->pull_down_sdr104);
> +	if (err)
> +		autocal->pull_down_sdr104 = autocal->pull_down_1v8;
> +
> +	err = device_property_read_u32(host->mmc->parent,
> +			"nvidia,pad-autocal-pull-up-offset-hs400",
> +			&autocal->pull_up_hs400);
> +	if (err)
> +		autocal->pull_up_hs400 = autocal->pull_up_1v8;
> +
> +	err = device_property_read_u32(host->mmc->parent,
> +			"nvidia,pad-autocal-pull-down-offset-hs400",
> +			&autocal->pull_down_hs400);
> +	if (err)
> +		autocal->pull_down_hs400 = autocal->pull_down_1v8;
> +
> +	/*
> +	 * Different fail-safe drive strength values based on the signaling
> +	 * voltage are applicable for SoCs supporting 3V3 and 1V8 pad controls.
> +	 * So, avoid reading below device tree properies for SoCs that don't

typo s/properies/properties/                      ^^^

> +	 * have NVQUIRK_NEEDS_PAD_CONTROL.
> +	 */
...
Dmitry Osipenko May 22, 2020, 12:42 p.m. UTC | #4
22.05.2020 15:26, Thierry Reding пишет:
> On Wed, May 20, 2020 at 01:08:57PM -0700, Sowjanya Komatineni wrote:
>> When auto calibration timeouts, calibration is disabled and fail-safe
>> drive strength values are programmed based on the signal voltage.
>>
>> Different fail-safe drive strength values based on voltage are
>> applicable only for SoCs supporting 3V3 and 1V8 pad controls.
>>
>> So, this patch avoids reading these properties from the device tree
>> for SoCs not using pad controls and the warning of missing properties
>> will not show up on these SoC platforms.
>>
>> Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
>> ---
>>  drivers/mmc/host/sdhci-tegra.c | 57 ++++++++++++++++++++++++------------------
>>  1 file changed, 33 insertions(+), 24 deletions(-)
>>
>> diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
>> index 3e2c510..141b49b 100644
>> --- a/drivers/mmc/host/sdhci-tegra.c
>> +++ b/drivers/mmc/host/sdhci-tegra.c
>> @@ -605,6 +605,39 @@ static void tegra_sdhci_parse_pad_autocal_dt(struct sdhci_host *host)
>>  		autocal->pull_down_1v8 = 0;
>>  
>>  	err = device_property_read_u32(host->mmc->parent,
>> +			"nvidia,pad-autocal-pull-up-offset-sdr104",
>> +			&autocal->pull_up_sdr104);
>> +	if (err)
>> +		autocal->pull_up_sdr104 = autocal->pull_up_1v8;
>> +
>> +	err = device_property_read_u32(host->mmc->parent,
>> +			"nvidia,pad-autocal-pull-down-offset-sdr104",
>> +			&autocal->pull_down_sdr104);
>> +	if (err)
>> +		autocal->pull_down_sdr104 = autocal->pull_down_1v8;
>> +
>> +	err = device_property_read_u32(host->mmc->parent,
>> +			"nvidia,pad-autocal-pull-up-offset-hs400",
>> +			&autocal->pull_up_hs400);
>> +	if (err)
>> +		autocal->pull_up_hs400 = autocal->pull_up_1v8;
>> +
>> +	err = device_property_read_u32(host->mmc->parent,
>> +			"nvidia,pad-autocal-pull-down-offset-hs400",
>> +			&autocal->pull_down_hs400);
>> +	if (err)
>> +		autocal->pull_down_hs400 = autocal->pull_down_1v8;
>> +
>> +	/*
>> +	 * Different fail-safe drive strength values based on the signaling
>> +	 * voltage are applicable for SoCs supporting 3V3 and 1V8 pad controls.
>> +	 * So, avoid reading below device tree properies for SoCs that don't
>> +	 * have NVQUIRK_NEEDS_PAD_CONTROL.
>> +	 */
>> +	if (!(tegra_host->soc_data->nvquirks & NVQUIRK_NEEDS_PAD_CONTROL))
>> +		return;
> 
> Hm... so what exactly is the difference between NVQUIRK_HAS_PADCALIB? I
> think Tegra30 will also end up calling tegra_sdhci_set_padctrl(), but it
> will then write the default (0) value for these drive strength. Is that
> okay?

It won't write 0, but skip the writing if values are 0. Technically T30+
supports the customized strengths, but I'm not sure whether it was ever
tested and whether it's really needed. I think Sowjanya said before that
the default values are always okay for older SoCs.
Thierry Reding May 22, 2020, 12:52 p.m. UTC | #5
On Fri, May 22, 2020 at 03:42:18PM +0300, Dmitry Osipenko wrote:
> 22.05.2020 15:26, Thierry Reding пишет:
> > On Wed, May 20, 2020 at 01:08:57PM -0700, Sowjanya Komatineni wrote:
> >> When auto calibration timeouts, calibration is disabled and fail-safe
> >> drive strength values are programmed based on the signal voltage.
> >>
> >> Different fail-safe drive strength values based on voltage are
> >> applicable only for SoCs supporting 3V3 and 1V8 pad controls.
> >>
> >> So, this patch avoids reading these properties from the device tree
> >> for SoCs not using pad controls and the warning of missing properties
> >> will not show up on these SoC platforms.
> >>
> >> Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
> >> ---
> >>  drivers/mmc/host/sdhci-tegra.c | 57 ++++++++++++++++++++++++------------------
> >>  1 file changed, 33 insertions(+), 24 deletions(-)
> >>
> >> diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
> >> index 3e2c510..141b49b 100644
> >> --- a/drivers/mmc/host/sdhci-tegra.c
> >> +++ b/drivers/mmc/host/sdhci-tegra.c
> >> @@ -605,6 +605,39 @@ static void tegra_sdhci_parse_pad_autocal_dt(struct sdhci_host *host)
> >>  		autocal->pull_down_1v8 = 0;
> >>  
> >>  	err = device_property_read_u32(host->mmc->parent,
> >> +			"nvidia,pad-autocal-pull-up-offset-sdr104",
> >> +			&autocal->pull_up_sdr104);
> >> +	if (err)
> >> +		autocal->pull_up_sdr104 = autocal->pull_up_1v8;
> >> +
> >> +	err = device_property_read_u32(host->mmc->parent,
> >> +			"nvidia,pad-autocal-pull-down-offset-sdr104",
> >> +			&autocal->pull_down_sdr104);
> >> +	if (err)
> >> +		autocal->pull_down_sdr104 = autocal->pull_down_1v8;
> >> +
> >> +	err = device_property_read_u32(host->mmc->parent,
> >> +			"nvidia,pad-autocal-pull-up-offset-hs400",
> >> +			&autocal->pull_up_hs400);
> >> +	if (err)
> >> +		autocal->pull_up_hs400 = autocal->pull_up_1v8;
> >> +
> >> +	err = device_property_read_u32(host->mmc->parent,
> >> +			"nvidia,pad-autocal-pull-down-offset-hs400",
> >> +			&autocal->pull_down_hs400);
> >> +	if (err)
> >> +		autocal->pull_down_hs400 = autocal->pull_down_1v8;
> >> +
> >> +	/*
> >> +	 * Different fail-safe drive strength values based on the signaling
> >> +	 * voltage are applicable for SoCs supporting 3V3 and 1V8 pad controls.
> >> +	 * So, avoid reading below device tree properies for SoCs that don't
> >> +	 * have NVQUIRK_NEEDS_PAD_CONTROL.
> >> +	 */
> >> +	if (!(tegra_host->soc_data->nvquirks & NVQUIRK_NEEDS_PAD_CONTROL))
> >> +		return;
> > 
> > Hm... so what exactly is the difference between NVQUIRK_HAS_PADCALIB? I
> > think Tegra30 will also end up calling tegra_sdhci_set_padctrl(), but it
> > will then write the default (0) value for these drive strength. Is that
> > okay?
> 
> It won't write 0, but skip the writing if values are 0. Technically T30+
> supports the customized strengths, but I'm not sure whether it was ever
> tested and whether it's really needed. I think Sowjanya said before that
> the default values are always okay for older SoCs.

Alright then, in that case:

Acked-by: Thierry Reding <treding@nvidia.com>
Sowjanya Komatineni May 22, 2020, 3:11 p.m. UTC | #6
On 5/22/20 5:52 AM, Thierry Reding wrote:
> On Fri, May 22, 2020 at 03:42:18PM +0300, Dmitry Osipenko wrote:
>> 22.05.2020 15:26, Thierry Reding пишет:
>>> On Wed, May 20, 2020 at 01:08:57PM -0700, Sowjanya Komatineni wrote:
>>>> When auto calibration timeouts, calibration is disabled and fail-safe
>>>> drive strength values are programmed based on the signal voltage.
>>>>
>>>> Different fail-safe drive strength values based on voltage are
>>>> applicable only for SoCs supporting 3V3 and 1V8 pad controls.
>>>>
>>>> So, this patch avoids reading these properties from the device tree
>>>> for SoCs not using pad controls and the warning of missing properties
>>>> will not show up on these SoC platforms.
>>>>
>>>> Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
>>>> ---
>>>>   drivers/mmc/host/sdhci-tegra.c | 57 ++++++++++++++++++++++++------------------
>>>>   1 file changed, 33 insertions(+), 24 deletions(-)
>>>>
>>>> diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
>>>> index 3e2c510..141b49b 100644
>>>> --- a/drivers/mmc/host/sdhci-tegra.c
>>>> +++ b/drivers/mmc/host/sdhci-tegra.c
>>>> @@ -605,6 +605,39 @@ static void tegra_sdhci_parse_pad_autocal_dt(struct sdhci_host *host)
>>>>   		autocal->pull_down_1v8 = 0;
>>>>   
>>>>   	err = device_property_read_u32(host->mmc->parent,
>>>> +			"nvidia,pad-autocal-pull-up-offset-sdr104",
>>>> +			&autocal->pull_up_sdr104);
>>>> +	if (err)
>>>> +		autocal->pull_up_sdr104 = autocal->pull_up_1v8;
>>>> +
>>>> +	err = device_property_read_u32(host->mmc->parent,
>>>> +			"nvidia,pad-autocal-pull-down-offset-sdr104",
>>>> +			&autocal->pull_down_sdr104);
>>>> +	if (err)
>>>> +		autocal->pull_down_sdr104 = autocal->pull_down_1v8;
>>>> +
>>>> +	err = device_property_read_u32(host->mmc->parent,
>>>> +			"nvidia,pad-autocal-pull-up-offset-hs400",
>>>> +			&autocal->pull_up_hs400);
>>>> +	if (err)
>>>> +		autocal->pull_up_hs400 = autocal->pull_up_1v8;
>>>> +
>>>> +	err = device_property_read_u32(host->mmc->parent,
>>>> +			"nvidia,pad-autocal-pull-down-offset-hs400",
>>>> +			&autocal->pull_down_hs400);
>>>> +	if (err)
>>>> +		autocal->pull_down_hs400 = autocal->pull_down_1v8;
>>>> +
>>>> +	/*
>>>> +	 * Different fail-safe drive strength values based on the signaling
>>>> +	 * voltage are applicable for SoCs supporting 3V3 and 1V8 pad controls.
>>>> +	 * So, avoid reading below device tree properies for SoCs that don't
>>>> +	 * have NVQUIRK_NEEDS_PAD_CONTROL.
>>>> +	 */
>>>> +	if (!(tegra_host->soc_data->nvquirks & NVQUIRK_NEEDS_PAD_CONTROL))
>>>> +		return;
>>> Hm... so what exactly is the difference between NVQUIRK_HAS_PADCALIB? I
>>> think Tegra30 will also end up calling tegra_sdhci_set_padctrl(), but it
>>> will then write the default (0) value for these drive strength. Is that
>>> okay?

Yes separate 3v3 and 1v8 drive strengths are for Tegra210/184/194 where 
they have separate pad controls.

T30 also has auto calibration enabled but don't need to use these 
properties as they don't have separate default drive strengths based on 
signaling.

Same default drive strengths set by boot loader/default pinmux will hold 
good.

>> It won't write 0, but skip the writing if values are 0. Technically T30+
>> supports the customized strengths, but I'm not sure whether it was ever
>> tested and whether it's really needed. I think Sowjanya said before that
>> the default values are always okay for older SoCs.
> Alright then, in that case:
>
> Acked-by: Thierry Reding <treding@nvidia.com>
Adrian Hunter May 24, 2020, 3:33 p.m. UTC | #7
On 20/05/20 11:08 pm, Sowjanya Komatineni wrote:
> When auto calibration timeouts, calibration is disabled and fail-safe
> drive strength values are programmed based on the signal voltage.
> 
> Different fail-safe drive strength values based on voltage are
> applicable only for SoCs supporting 3V3 and 1V8 pad controls.
> 
> So, this patch avoids reading these properties from the device tree
> for SoCs not using pad controls and the warning of missing properties
> will not show up on these SoC platforms.
> 
> Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>

Acked-by: Adrian Hunter <adrian.hunter@intel.com>

> ---
>  drivers/mmc/host/sdhci-tegra.c | 57 ++++++++++++++++++++++++------------------
>  1 file changed, 33 insertions(+), 24 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
> index 3e2c510..141b49b 100644
> --- a/drivers/mmc/host/sdhci-tegra.c
> +++ b/drivers/mmc/host/sdhci-tegra.c
> @@ -605,6 +605,39 @@ static void tegra_sdhci_parse_pad_autocal_dt(struct sdhci_host *host)
>  		autocal->pull_down_1v8 = 0;
>  
>  	err = device_property_read_u32(host->mmc->parent,
> +			"nvidia,pad-autocal-pull-up-offset-sdr104",
> +			&autocal->pull_up_sdr104);
> +	if (err)
> +		autocal->pull_up_sdr104 = autocal->pull_up_1v8;
> +
> +	err = device_property_read_u32(host->mmc->parent,
> +			"nvidia,pad-autocal-pull-down-offset-sdr104",
> +			&autocal->pull_down_sdr104);
> +	if (err)
> +		autocal->pull_down_sdr104 = autocal->pull_down_1v8;
> +
> +	err = device_property_read_u32(host->mmc->parent,
> +			"nvidia,pad-autocal-pull-up-offset-hs400",
> +			&autocal->pull_up_hs400);
> +	if (err)
> +		autocal->pull_up_hs400 = autocal->pull_up_1v8;
> +
> +	err = device_property_read_u32(host->mmc->parent,
> +			"nvidia,pad-autocal-pull-down-offset-hs400",
> +			&autocal->pull_down_hs400);
> +	if (err)
> +		autocal->pull_down_hs400 = autocal->pull_down_1v8;
> +
> +	/*
> +	 * Different fail-safe drive strength values based on the signaling
> +	 * voltage are applicable for SoCs supporting 3V3 and 1V8 pad controls.
> +	 * So, avoid reading below device tree properies for SoCs that don't
> +	 * have NVQUIRK_NEEDS_PAD_CONTROL.
> +	 */
> +	if (!(tegra_host->soc_data->nvquirks & NVQUIRK_NEEDS_PAD_CONTROL))
> +		return;
> +
> +	err = device_property_read_u32(host->mmc->parent,
>  			"nvidia,pad-autocal-pull-up-offset-3v3-timeout",
>  			&autocal->pull_up_3v3_timeout);
>  	if (err) {
> @@ -647,30 +680,6 @@ static void tegra_sdhci_parse_pad_autocal_dt(struct sdhci_host *host)
>  				mmc_hostname(host->mmc));
>  		autocal->pull_down_1v8_timeout = 0;
>  	}
> -
> -	err = device_property_read_u32(host->mmc->parent,
> -			"nvidia,pad-autocal-pull-up-offset-sdr104",
> -			&autocal->pull_up_sdr104);
> -	if (err)
> -		autocal->pull_up_sdr104 = autocal->pull_up_1v8;
> -
> -	err = device_property_read_u32(host->mmc->parent,
> -			"nvidia,pad-autocal-pull-down-offset-sdr104",
> -			&autocal->pull_down_sdr104);
> -	if (err)
> -		autocal->pull_down_sdr104 = autocal->pull_down_1v8;
> -
> -	err = device_property_read_u32(host->mmc->parent,
> -			"nvidia,pad-autocal-pull-up-offset-hs400",
> -			&autocal->pull_up_hs400);
> -	if (err)
> -		autocal->pull_up_hs400 = autocal->pull_up_1v8;
> -
> -	err = device_property_read_u32(host->mmc->parent,
> -			"nvidia,pad-autocal-pull-down-offset-hs400",
> -			&autocal->pull_down_hs400);
> -	if (err)
> -		autocal->pull_down_hs400 = autocal->pull_down_1v8;
>  }
>  
>  static void tegra_sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
>
Ulf Hansson May 25, 2020, 8:47 a.m. UTC | #8
On Wed, 20 May 2020 at 22:09, Sowjanya Komatineni
<skomatineni@nvidia.com> wrote:
>
> When auto calibration timeouts, calibration is disabled and fail-safe
> drive strength values are programmed based on the signal voltage.
>
> Different fail-safe drive strength values based on voltage are
> applicable only for SoCs supporting 3V3 and 1V8 pad controls.
>
> So, this patch avoids reading these properties from the device tree
> for SoCs not using pad controls and the warning of missing properties
> will not show up on these SoC platforms.
>
> Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>

Applied for next and by fixing the misspelled "properies", thanks!

Kind regards
Uffe


> ---
>  drivers/mmc/host/sdhci-tegra.c | 57 ++++++++++++++++++++++++------------------
>  1 file changed, 33 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
> index 3e2c510..141b49b 100644
> --- a/drivers/mmc/host/sdhci-tegra.c
> +++ b/drivers/mmc/host/sdhci-tegra.c
> @@ -605,6 +605,39 @@ static void tegra_sdhci_parse_pad_autocal_dt(struct sdhci_host *host)
>                 autocal->pull_down_1v8 = 0;
>
>         err = device_property_read_u32(host->mmc->parent,
> +                       "nvidia,pad-autocal-pull-up-offset-sdr104",
> +                       &autocal->pull_up_sdr104);
> +       if (err)
> +               autocal->pull_up_sdr104 = autocal->pull_up_1v8;
> +
> +       err = device_property_read_u32(host->mmc->parent,
> +                       "nvidia,pad-autocal-pull-down-offset-sdr104",
> +                       &autocal->pull_down_sdr104);
> +       if (err)
> +               autocal->pull_down_sdr104 = autocal->pull_down_1v8;
> +
> +       err = device_property_read_u32(host->mmc->parent,
> +                       "nvidia,pad-autocal-pull-up-offset-hs400",
> +                       &autocal->pull_up_hs400);
> +       if (err)
> +               autocal->pull_up_hs400 = autocal->pull_up_1v8;
> +
> +       err = device_property_read_u32(host->mmc->parent,
> +                       "nvidia,pad-autocal-pull-down-offset-hs400",
> +                       &autocal->pull_down_hs400);
> +       if (err)
> +               autocal->pull_down_hs400 = autocal->pull_down_1v8;
> +
> +       /*
> +        * Different fail-safe drive strength values based on the signaling
> +        * voltage are applicable for SoCs supporting 3V3 and 1V8 pad controls.
> +        * So, avoid reading below device tree properies for SoCs that don't
> +        * have NVQUIRK_NEEDS_PAD_CONTROL.
> +        */
> +       if (!(tegra_host->soc_data->nvquirks & NVQUIRK_NEEDS_PAD_CONTROL))
> +               return;
> +
> +       err = device_property_read_u32(host->mmc->parent,
>                         "nvidia,pad-autocal-pull-up-offset-3v3-timeout",
>                         &autocal->pull_up_3v3_timeout);
>         if (err) {
> @@ -647,30 +680,6 @@ static void tegra_sdhci_parse_pad_autocal_dt(struct sdhci_host *host)
>                                 mmc_hostname(host->mmc));
>                 autocal->pull_down_1v8_timeout = 0;
>         }
> -
> -       err = device_property_read_u32(host->mmc->parent,
> -                       "nvidia,pad-autocal-pull-up-offset-sdr104",
> -                       &autocal->pull_up_sdr104);
> -       if (err)
> -               autocal->pull_up_sdr104 = autocal->pull_up_1v8;
> -
> -       err = device_property_read_u32(host->mmc->parent,
> -                       "nvidia,pad-autocal-pull-down-offset-sdr104",
> -                       &autocal->pull_down_sdr104);
> -       if (err)
> -               autocal->pull_down_sdr104 = autocal->pull_down_1v8;
> -
> -       err = device_property_read_u32(host->mmc->parent,
> -                       "nvidia,pad-autocal-pull-up-offset-hs400",
> -                       &autocal->pull_up_hs400);
> -       if (err)
> -               autocal->pull_up_hs400 = autocal->pull_up_1v8;
> -
> -       err = device_property_read_u32(host->mmc->parent,
> -                       "nvidia,pad-autocal-pull-down-offset-hs400",
> -                       &autocal->pull_down_hs400);
> -       if (err)
> -               autocal->pull_down_hs400 = autocal->pull_down_1v8;
>  }
>
>  static void tegra_sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
> --
> 2.7.4
>
diff mbox series

Patch

diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index 3e2c510..141b49b 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -605,6 +605,39 @@  static void tegra_sdhci_parse_pad_autocal_dt(struct sdhci_host *host)
 		autocal->pull_down_1v8 = 0;
 
 	err = device_property_read_u32(host->mmc->parent,
+			"nvidia,pad-autocal-pull-up-offset-sdr104",
+			&autocal->pull_up_sdr104);
+	if (err)
+		autocal->pull_up_sdr104 = autocal->pull_up_1v8;
+
+	err = device_property_read_u32(host->mmc->parent,
+			"nvidia,pad-autocal-pull-down-offset-sdr104",
+			&autocal->pull_down_sdr104);
+	if (err)
+		autocal->pull_down_sdr104 = autocal->pull_down_1v8;
+
+	err = device_property_read_u32(host->mmc->parent,
+			"nvidia,pad-autocal-pull-up-offset-hs400",
+			&autocal->pull_up_hs400);
+	if (err)
+		autocal->pull_up_hs400 = autocal->pull_up_1v8;
+
+	err = device_property_read_u32(host->mmc->parent,
+			"nvidia,pad-autocal-pull-down-offset-hs400",
+			&autocal->pull_down_hs400);
+	if (err)
+		autocal->pull_down_hs400 = autocal->pull_down_1v8;
+
+	/*
+	 * Different fail-safe drive strength values based on the signaling
+	 * voltage are applicable for SoCs supporting 3V3 and 1V8 pad controls.
+	 * So, avoid reading below device tree properies for SoCs that don't
+	 * have NVQUIRK_NEEDS_PAD_CONTROL.
+	 */
+	if (!(tegra_host->soc_data->nvquirks & NVQUIRK_NEEDS_PAD_CONTROL))
+		return;
+
+	err = device_property_read_u32(host->mmc->parent,
 			"nvidia,pad-autocal-pull-up-offset-3v3-timeout",
 			&autocal->pull_up_3v3_timeout);
 	if (err) {
@@ -647,30 +680,6 @@  static void tegra_sdhci_parse_pad_autocal_dt(struct sdhci_host *host)
 				mmc_hostname(host->mmc));
 		autocal->pull_down_1v8_timeout = 0;
 	}
-
-	err = device_property_read_u32(host->mmc->parent,
-			"nvidia,pad-autocal-pull-up-offset-sdr104",
-			&autocal->pull_up_sdr104);
-	if (err)
-		autocal->pull_up_sdr104 = autocal->pull_up_1v8;
-
-	err = device_property_read_u32(host->mmc->parent,
-			"nvidia,pad-autocal-pull-down-offset-sdr104",
-			&autocal->pull_down_sdr104);
-	if (err)
-		autocal->pull_down_sdr104 = autocal->pull_down_1v8;
-
-	err = device_property_read_u32(host->mmc->parent,
-			"nvidia,pad-autocal-pull-up-offset-hs400",
-			&autocal->pull_up_hs400);
-	if (err)
-		autocal->pull_up_hs400 = autocal->pull_up_1v8;
-
-	err = device_property_read_u32(host->mmc->parent,
-			"nvidia,pad-autocal-pull-down-offset-hs400",
-			&autocal->pull_down_hs400);
-	if (err)
-		autocal->pull_down_hs400 = autocal->pull_down_1v8;
 }
 
 static void tegra_sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq)