| Message ID | E1dnO3z-0000tI-7K@debutante (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Mark, On Thursday 31 August 2017 05:25 PM, Mark Brown wrote: > The patch > > regulator: pbias: Select voltage table based on max-voltage > > has been applied to the regulator tree at > > git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git > > All being well this means that it will be integrated into the linux-next > tree (usually sometime in the next 24 hours) and sent to Linus during > the next merge window (or sooner if it is a bug fix), however if > problems are discovered then the patch may be dropped or reverted. > > You may get further e-mails resulting from automated or manual testing > and review of the tree, please engage with people reporting problems and > send followup patches addressing any issues that are reported if needed. > > If any updates are required or you are submitting further changes they > should be sent as incremental updates against current git, existing > patches will not be replaced. > > Please add any relevant lists and maintainers to the CCs when replying > to this mail. This patch should be merged along with the 1st patch of the series "mmc: host: omap_hsmmc: Remove setting PBIAS voltage". Or else it'll break MMC with omap_hsmmc driver. Thanks Kishon
On Thu, Aug 31, 2017 at 05:37:34PM +0530, Kishon Vijay Abraham I wrote: > This patch should be merged along with the 1st patch of the series "mmc: host: > omap_hsmmc: Remove setting PBIAS voltage". Or else it'll break MMC with > omap_hsmmc driver. I can sign a tag if it's needed for a cross tree merge.
On 31 August 2017 at 15:50, Mark Brown <broonie@kernel.org> wrote: > On Thu, Aug 31, 2017 at 05:37:34PM +0530, Kishon Vijay Abraham I wrote: > >> This patch should be merged along with the 1st patch of the series "mmc: host: >> omap_hsmmc: Remove setting PBIAS voltage". Or else it'll break MMC with >> omap_hsmmc driver. > > I can sign a tag if it's needed for a cross tree merge. Easier if you could drop it and instead just provide an ack. Unless you believes there may conflict in your regulator tree? Kind regards Uffe
Hi Mark, On Friday 01 September 2017 09:53 PM, Mark Brown wrote: > On Fri, Sep 01, 2017 at 03:18:03PM +0200, Ulf Hansson wrote: >> On 31 August 2017 at 15:50, Mark Brown <broonie@kernel.org> wrote: >>> On Thu, Aug 31, 2017 at 05:37:34PM +0530, Kishon Vijay Abraham I wrote: > >>>> This patch should be merged along with the 1st patch of the series "mmc: host: >>>> omap_hsmmc: Remove setting PBIAS voltage". Or else it'll break MMC with >>>> omap_hsmmc driver. > > Hang on, how can this break anything? If it breaks things shouldn't > there be bugfixes for incorrect constraints somewhere? omap_hsmmc sets the pbias voltage to 3V. But here we program the volt table to support either 1.8V or 3.3V (Initially the volt table was programmed to support 3V because of a bug in TRM). So set_voltage of pbias voltage in omap_hsmmc will fail. Thanks Kishon
On Mon, Sep 04, 2017 at 11:16:54AM +0530, Kishon Vijay Abraham I wrote: > On Friday 01 September 2017 09:53 PM, Mark Brown wrote: > > Hang on, how can this break anything? If it breaks things shouldn't > > there be bugfixes for incorrect constraints somewhere? > omap_hsmmc sets the pbias voltage to 3V. But here we program the volt table to > support either 1.8V or 3.3V (Initially the volt table was programmed to support > 3V because of a bug in TRM). So set_voltage of pbias voltage in omap_hsmmc will > fail. Oh, that's appauling. I guess this is some voltage that doesn't get presented to cards because otherwise I'm surprised nobody noticed. Anyway I've dropped the commit from my pull request for now, it'll not go for v4.14, but the pull request is still there.
diff --git a/drivers/regulator/pbias-regulator.c b/drivers/regulator/pbias-regulator.c index 0cb76ba29e84..8f782d22fdbe 100644 --- a/drivers/regulator/pbias-regulator.c +++ b/drivers/regulator/pbias-regulator.c @@ -34,6 +34,8 @@ struct pbias_reg_info { u32 vmode; unsigned int enable_time; char *name; + const unsigned int *pbias_volt_table; + int n_voltages; }; struct pbias_regulator_data { @@ -49,11 +51,16 @@ struct pbias_of_data { unsigned int offset; }; -static const unsigned int pbias_volt_table[] = { +static const unsigned int pbias_volt_table_3_0V[] = { 1800000, 3000000 }; +static const unsigned int pbias_volt_table_3_3V[] = { + 1800000, + 3300000 +}; + static const struct regulator_ops pbias_regulator_voltage_ops = { .list_voltage = regulator_list_voltage_table, .get_voltage_sel = regulator_get_voltage_sel_regmap, @@ -69,6 +76,8 @@ static const struct pbias_reg_info pbias_mmc_omap2430 = { .vmode = BIT(0), .disable_val = 0, .enable_time = 100, + .pbias_volt_table = pbias_volt_table_3_0V, + .n_voltages = 2, .name = "pbias_mmc_omap2430" }; @@ -77,6 +86,8 @@ static const struct pbias_reg_info pbias_sim_omap3 = { .enable_mask = BIT(9), .vmode = BIT(8), .enable_time = 100, + .pbias_volt_table = pbias_volt_table_3_0V, + .n_voltages = 2, .name = "pbias_sim_omap3" }; @@ -86,6 +97,8 @@ static const struct pbias_reg_info pbias_mmc_omap4 = { .disable_val = BIT(25), .vmode = BIT(21), .enable_time = 100, + .pbias_volt_table = pbias_volt_table_3_0V, + .n_voltages = 2, .name = "pbias_mmc_omap4" }; @@ -95,6 +108,8 @@ static const struct pbias_reg_info pbias_mmc_omap5 = { .disable_val = BIT(25), .vmode = BIT(21), .enable_time = 100, + .pbias_volt_table = pbias_volt_table_3_3V, + .n_voltages = 2, .name = "pbias_mmc_omap5" }; @@ -199,8 +214,8 @@ static int pbias_regulator_probe(struct platform_device *pdev) drvdata[data_idx].desc.owner = THIS_MODULE; drvdata[data_idx].desc.type = REGULATOR_VOLTAGE; drvdata[data_idx].desc.ops = &pbias_regulator_voltage_ops; - drvdata[data_idx].desc.volt_table = pbias_volt_table; - drvdata[data_idx].desc.n_voltages = 2; + drvdata[data_idx].desc.volt_table = info->pbias_volt_table; + drvdata[data_idx].desc.n_voltages = info->n_voltages; drvdata[data_idx].desc.enable_time = info->enable_time; drvdata[data_idx].desc.vsel_reg = offset; drvdata[data_idx].desc.vsel_mask = info->vmode;