On 18. 11. 20 16:43, Ulf Hansson wrote:
> On Wed, 18 Nov 2020 at 07:22, Manish Narani <manish.narani@xxxxxxxxxx> wrote:
>>
>> Driver should be able to handle optional pinctrl setting.
>>
>> Signed-off-by: Michal Simek <michal.simek@xxxxxxxxxx>
>> Signed-off-by: Manish Narani <manish.narani@xxxxxxxxxx>
>> ---
>> drivers/mmc/host/sdhci-of-arasan.c | 24 ++++++++++++++++++++++++
>> 1 file changed, 24 insertions(+)
>>
>> diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c
>> index 829ccef87426..f788cc9d5914 100644
>> --- a/drivers/mmc/host/sdhci-of-arasan.c
>> +++ b/drivers/mmc/host/sdhci-of-arasan.c
>> @@ -23,6 +23,7 @@
>> #include <linux/regmap.h>
>> #include <linux/of.h>
>> #include <linux/firmware/xlnx-zynqmp.h>
>> +#include <linux/pinctrl/consumer.h>
>>
>> #include "cqhci.h"
>> #include "sdhci-pltfm.h"
>> @@ -135,6 +136,8 @@ struct sdhci_arasan_clk_data {
>> * @clk_ops: Struct for the Arasan Controller Clock Operations.
>> * @soc_ctl_base: Pointer to regmap for syscon for soc_ctl registers.
>> * @soc_ctl_map: Map to get offsets into soc_ctl registers.
>> + * @pinctrl: Per-device pin control state holder.
>> + * @pins_default: Pinctrl state for a device.
>> * @quirks: Arasan deviations from spec.
>> */
>> struct sdhci_arasan_data {
>> @@ -149,6 +152,8 @@ struct sdhci_arasan_data {
>>
>> struct regmap *soc_ctl_base;
>> const struct sdhci_arasan_soc_ctl_map *soc_ctl_map;
>> + struct pinctrl *pinctrl;
>> + struct pinctrl_state *pins_default;
>> unsigned int quirks;
>>
>> /* Controller does not have CD wired and will not function normally without */
>> @@ -1619,6 +1624,25 @@ static int sdhci_arasan_probe(struct platform_device *pdev)
>> goto unreg_clk;
>> }
>>
>> + sdhci_arasan->pinctrl = devm_pinctrl_get(&pdev->dev);
>> + if (!IS_ERR(sdhci_arasan->pinctrl)) {
>> + sdhci_arasan->pins_default =
>> + pinctrl_lookup_state(sdhci_arasan->pinctrl,
>> + PINCTRL_STATE_DEFAULT);
>> + if (IS_ERR(sdhci_arasan->pins_default)) {
>> + dev_err(&pdev->dev, "Missing default pinctrl config\n");
>> + ret = PTR_ERR(sdhci_arasan->pins_default);
>> + goto unreg_clk;
>> + }
>> +
>> + ret = pinctrl_select_state(sdhci_arasan->pinctrl,
>> + sdhci_arasan->pins_default);
>> + if (ret) {
>> + dev_err(&pdev->dev, "could not select default state\n");
>> + goto unreg_clk;
>> + }
>> + }
>
> Isn't all this already taken care of via pinctrl_bind_pins() called by
> driver core during probe?
>
Thanks for the hint.
Manish: Can you please check it?
Thanks,
Michal
