From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752168AbdLUJOk (ORCPT ); Thu, 21 Dec 2017 04:14:40 -0500 Received: from mga07.intel.com ([134.134.136.100]:12800 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751542AbdLUJO2 (ORCPT ); Thu, 21 Dec 2017 04:14:28 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,435,1508828400"; d="scan'208";a="15444316" Subject: Re: [PATCH 08/12] mmc: sdhci-omap: Add support to override f_max and iodelay from pdata To: Kishon Vijay Abraham I , Ulf Hansson , Rob Herring , Tony Lindgren Cc: Mark Rutland , Russell King , linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, nsekhar@ti.com References: <20171214130941.26666-1-kishon@ti.com> <20171214130941.26666-9-kishon@ti.com> From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Message-ID: Date: Thu, 21 Dec 2017 11:13:59 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <20171214130941.26666-9-kishon@ti.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 14/12/17 15:09, Kishon Vijay Abraham I wrote: > DRA74x EVM Rev H EVM comes with revision 2.0 silicon. However, earlier > versions of EVM can come with either revision 1.1 or revision 1.0 of > silicon. > > The device-tree file is written to support rev 2.0 of silicon. > pdata-quirks are used to then override the settings needed for > PG 1.1 silicon. > > PG 1.1 silicon has limitations w.r.t frequencies at which MMC1/2/3 > can operate as well as different IOdelay numbers. > > Add support in sdhci-omap driver to get platform data if available > (added using pdata quirks) and override the data (max-frequency and > iodelay data) obtained from device tree. > > Signed-off-by: Kishon Vijay Abraham I > --- > drivers/mmc/host/sdhci-omap.c | 17 ++++++++++++++++ > include/linux/platform_data/sdhci-omap.h | 35 ++++++++++++++++++++++++++++++++ > 2 files changed, 52 insertions(+) > create mode 100644 include/linux/platform_data/sdhci-omap.h > > diff --git a/drivers/mmc/host/sdhci-omap.c b/drivers/mmc/host/sdhci-omap.c > index 6dee275b2e57..cddc3ad1331f 100644 > --- a/drivers/mmc/host/sdhci-omap.c > +++ b/drivers/mmc/host/sdhci-omap.c > @@ -22,6 +22,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -102,6 +103,7 @@ struct sdhci_omap_data { > }; > > struct sdhci_omap_host { > + char *version; > void __iomem *base; > struct device *dev; > struct regulator *pbias; > @@ -781,11 +783,18 @@ static struct pinctrl_state > u32 *caps, u32 capmask) > { > struct device *dev = omap_host->dev; > + char *version = omap_host->version; > struct pinctrl_state *pinctrl_state = ERR_PTR(-ENODEV); > + char str[20]; > > if (!(*caps & capmask)) > goto ret; > > + if (version) { > + sprintf(str, "%s-%s", mode, version); snprintf please > + pinctrl_state = pinctrl_lookup_state(omap_host->pinctrl, str); Doesn't look like this 'pinctrl_state' is used? > + } > + > pinctrl_state = pinctrl_lookup_state(omap_host->pinctrl, mode); > if (IS_ERR(pinctrl_state)) { > dev_err(dev, "no pinctrl state for %s mode", mode); > @@ -879,6 +888,7 @@ static int sdhci_omap_probe(struct platform_device *pdev) > struct mmc_host *mmc; > const struct of_device_id *match; > struct sdhci_omap_data *data; > + struct sdhci_omap_platform_data *platform_data; > > match = of_match_device(omap_sdhci_match, dev); > if (!match) > @@ -913,6 +923,13 @@ static int sdhci_omap_probe(struct platform_device *pdev) > if (ret) > goto err_pltfm_free; > > + platform_data = dev_get_platdata(dev); > + if (platform_data) { > + omap_host->version = platform_data->version; > + if (platform_data->max_freq) > + mmc->f_max = platform_data->max_freq; > + } > + > pltfm_host->clk = devm_clk_get(dev, "fck"); > if (IS_ERR(pltfm_host->clk)) { > ret = PTR_ERR(pltfm_host->clk); > diff --git a/include/linux/platform_data/sdhci-omap.h b/include/linux/platform_data/sdhci-omap.h > new file mode 100644 > index 000000000000..a46e1240956a > --- /dev/null > +++ b/include/linux/platform_data/sdhci-omap.h > @@ -0,0 +1,35 @@ > +/** > + * SDHCI Controller Platform Data for TI's OMAP SoCs > + * > + * Copyright (C) 2017 Texas Instruments > + * Author: Kishon Vijay Abraham I > + * > + * This program is free software: you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 of > + * the License as published by the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program. If not, see . > + */ > +#ifndef __SDHCI_OMAP_PDATA_H__ > +#define __SDHCI_OMAP_PDATA_H__ > + > +struct sdhci_omap_platform_data { > + const char *name; > + > + /* > + * set if your board has components or wiring that limits the > + * maximum frequency on the MMC bus > + */ > + unsigned int max_freq; > + > + /* string specifying a particular variant of hardware */ > + char *version; > +}; > + > +#endif > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adrian Hunter Subject: Re: [PATCH 08/12] mmc: sdhci-omap: Add support to override f_max and iodelay from pdata Date: Thu, 21 Dec 2017 11:13:59 +0200 Message-ID: References: <20171214130941.26666-1-kishon@ti.com> <20171214130941.26666-9-kishon@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20171214130941.26666-9-kishon-l0cyMroinI0@public.gmane.org> Content-Language: en-US Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Kishon Vijay Abraham I , Ulf Hansson , Rob Herring , Tony Lindgren Cc: Mark Rutland , Russell King , linux-mmc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, nsekhar-l0cyMroinI0@public.gmane.org List-Id: devicetree@vger.kernel.org On 14/12/17 15:09, Kishon Vijay Abraham I wrote: > DRA74x EVM Rev H EVM comes with revision 2.0 silicon. However, earlier > versions of EVM can come with either revision 1.1 or revision 1.0 of > silicon. > > The device-tree file is written to support rev 2.0 of silicon. > pdata-quirks are used to then override the settings needed for > PG 1.1 silicon. > > PG 1.1 silicon has limitations w.r.t frequencies at which MMC1/2/3 > can operate as well as different IOdelay numbers. > > Add support in sdhci-omap driver to get platform data if available > (added using pdata quirks) and override the data (max-frequency and > iodelay data) obtained from device tree. > > Signed-off-by: Kishon Vijay Abraham I > --- > drivers/mmc/host/sdhci-omap.c | 17 ++++++++++++++++ > include/linux/platform_data/sdhci-omap.h | 35 ++++++++++++++++++++++++++++++++ > 2 files changed, 52 insertions(+) > create mode 100644 include/linux/platform_data/sdhci-omap.h > > diff --git a/drivers/mmc/host/sdhci-omap.c b/drivers/mmc/host/sdhci-omap.c > index 6dee275b2e57..cddc3ad1331f 100644 > --- a/drivers/mmc/host/sdhci-omap.c > +++ b/drivers/mmc/host/sdhci-omap.c > @@ -22,6 +22,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -102,6 +103,7 @@ struct sdhci_omap_data { > }; > > struct sdhci_omap_host { > + char *version; > void __iomem *base; > struct device *dev; > struct regulator *pbias; > @@ -781,11 +783,18 @@ static struct pinctrl_state > u32 *caps, u32 capmask) > { > struct device *dev = omap_host->dev; > + char *version = omap_host->version; > struct pinctrl_state *pinctrl_state = ERR_PTR(-ENODEV); > + char str[20]; > > if (!(*caps & capmask)) > goto ret; > > + if (version) { > + sprintf(str, "%s-%s", mode, version); snprintf please > + pinctrl_state = pinctrl_lookup_state(omap_host->pinctrl, str); Doesn't look like this 'pinctrl_state' is used? > + } > + > pinctrl_state = pinctrl_lookup_state(omap_host->pinctrl, mode); > if (IS_ERR(pinctrl_state)) { > dev_err(dev, "no pinctrl state for %s mode", mode); > @@ -879,6 +888,7 @@ static int sdhci_omap_probe(struct platform_device *pdev) > struct mmc_host *mmc; > const struct of_device_id *match; > struct sdhci_omap_data *data; > + struct sdhci_omap_platform_data *platform_data; > > match = of_match_device(omap_sdhci_match, dev); > if (!match) > @@ -913,6 +923,13 @@ static int sdhci_omap_probe(struct platform_device *pdev) > if (ret) > goto err_pltfm_free; > > + platform_data = dev_get_platdata(dev); > + if (platform_data) { > + omap_host->version = platform_data->version; > + if (platform_data->max_freq) > + mmc->f_max = platform_data->max_freq; > + } > + > pltfm_host->clk = devm_clk_get(dev, "fck"); > if (IS_ERR(pltfm_host->clk)) { > ret = PTR_ERR(pltfm_host->clk); > diff --git a/include/linux/platform_data/sdhci-omap.h b/include/linux/platform_data/sdhci-omap.h > new file mode 100644 > index 000000000000..a46e1240956a > --- /dev/null > +++ b/include/linux/platform_data/sdhci-omap.h > @@ -0,0 +1,35 @@ > +/** > + * SDHCI Controller Platform Data for TI's OMAP SoCs > + * > + * Copyright (C) 2017 Texas Instruments > + * Author: Kishon Vijay Abraham I > + * > + * This program is free software: you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 of > + * the License as published by the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program. If not, see . > + */ > +#ifndef __SDHCI_OMAP_PDATA_H__ > +#define __SDHCI_OMAP_PDATA_H__ > + > +struct sdhci_omap_platform_data { > + const char *name; > + > + /* > + * set if your board has components or wiring that limits the > + * maximum frequency on the MMC bus > + */ > + unsigned int max_freq; > + > + /* string specifying a particular variant of hardware */ > + char *version; > +}; > + > +#endif > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 From: adrian.hunter@intel.com (Adrian Hunter) Date: Thu, 21 Dec 2017 11:13:59 +0200 Subject: [PATCH 08/12] mmc: sdhci-omap: Add support to override f_max and iodelay from pdata In-Reply-To: <20171214130941.26666-9-kishon@ti.com> References: <20171214130941.26666-1-kishon@ti.com> <20171214130941.26666-9-kishon@ti.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 14/12/17 15:09, Kishon Vijay Abraham I wrote: > DRA74x EVM Rev H EVM comes with revision 2.0 silicon. However, earlier > versions of EVM can come with either revision 1.1 or revision 1.0 of > silicon. > > The device-tree file is written to support rev 2.0 of silicon. > pdata-quirks are used to then override the settings needed for > PG 1.1 silicon. > > PG 1.1 silicon has limitations w.r.t frequencies at which MMC1/2/3 > can operate as well as different IOdelay numbers. > > Add support in sdhci-omap driver to get platform data if available > (added using pdata quirks) and override the data (max-frequency and > iodelay data) obtained from device tree. > > Signed-off-by: Kishon Vijay Abraham I > --- > drivers/mmc/host/sdhci-omap.c | 17 ++++++++++++++++ > include/linux/platform_data/sdhci-omap.h | 35 ++++++++++++++++++++++++++++++++ > 2 files changed, 52 insertions(+) > create mode 100644 include/linux/platform_data/sdhci-omap.h > > diff --git a/drivers/mmc/host/sdhci-omap.c b/drivers/mmc/host/sdhci-omap.c > index 6dee275b2e57..cddc3ad1331f 100644 > --- a/drivers/mmc/host/sdhci-omap.c > +++ b/drivers/mmc/host/sdhci-omap.c > @@ -22,6 +22,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -102,6 +103,7 @@ struct sdhci_omap_data { > }; > > struct sdhci_omap_host { > + char *version; > void __iomem *base; > struct device *dev; > struct regulator *pbias; > @@ -781,11 +783,18 @@ static struct pinctrl_state > u32 *caps, u32 capmask) > { > struct device *dev = omap_host->dev; > + char *version = omap_host->version; > struct pinctrl_state *pinctrl_state = ERR_PTR(-ENODEV); > + char str[20]; > > if (!(*caps & capmask)) > goto ret; > > + if (version) { > + sprintf(str, "%s-%s", mode, version); snprintf please > + pinctrl_state = pinctrl_lookup_state(omap_host->pinctrl, str); Doesn't look like this 'pinctrl_state' is used? > + } > + > pinctrl_state = pinctrl_lookup_state(omap_host->pinctrl, mode); > if (IS_ERR(pinctrl_state)) { > dev_err(dev, "no pinctrl state for %s mode", mode); > @@ -879,6 +888,7 @@ static int sdhci_omap_probe(struct platform_device *pdev) > struct mmc_host *mmc; > const struct of_device_id *match; > struct sdhci_omap_data *data; > + struct sdhci_omap_platform_data *platform_data; > > match = of_match_device(omap_sdhci_match, dev); > if (!match) > @@ -913,6 +923,13 @@ static int sdhci_omap_probe(struct platform_device *pdev) > if (ret) > goto err_pltfm_free; > > + platform_data = dev_get_platdata(dev); > + if (platform_data) { > + omap_host->version = platform_data->version; > + if (platform_data->max_freq) > + mmc->f_max = platform_data->max_freq; > + } > + > pltfm_host->clk = devm_clk_get(dev, "fck"); > if (IS_ERR(pltfm_host->clk)) { > ret = PTR_ERR(pltfm_host->clk); > diff --git a/include/linux/platform_data/sdhci-omap.h b/include/linux/platform_data/sdhci-omap.h > new file mode 100644 > index 000000000000..a46e1240956a > --- /dev/null > +++ b/include/linux/platform_data/sdhci-omap.h > @@ -0,0 +1,35 @@ > +/** > + * SDHCI Controller Platform Data for TI's OMAP SoCs > + * > + * Copyright (C) 2017 Texas Instruments > + * Author: Kishon Vijay Abraham I > + * > + * This program is free software: you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 of > + * the License as published by the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program. If not, see . > + */ > +#ifndef __SDHCI_OMAP_PDATA_H__ > +#define __SDHCI_OMAP_PDATA_H__ > + > +struct sdhci_omap_platform_data { > + const char *name; > + > + /* > + * set if your board has components or wiring that limits the > + * maximum frequency on the MMC bus > + */ > + unsigned int max_freq; > + > + /* string specifying a particular variant of hardware */ > + char *version; > +}; > + > +#endif >