On 12 March 2012 08:08, Kyungmin Park <kmpark@xxxxxxxxxxxxx> wrote:
> On 3/11/12, Thomas Abraham <thomas.abraham@xxxxxxxxxx> wrote:
>> The platform specific callback to setup the sdhci pin mux and pin config
>> is removed and the pinctrl subsystem interface is used to setup the
>> mux and config.
>>
>> Signed-off-by: Thomas Abraham <thomas.abraham@xxxxxxxxxx>
>> ---
>> drivers/mmc/host/sdhci-s3c.c | 15 +++++++++++++--
>> 1 files changed, 13 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
>> index ea0767e..76c1c36 100644
>> --- a/drivers/mmc/host/sdhci-s3c.c
>> +++ b/drivers/mmc/host/sdhci-s3c.c
>> @@ -22,6 +22,7 @@
>> #include <linux/module.h>
>> #include <linux/of.h>
>> #include <linux/of_gpio.h>
>> +#include <linux/pinctrl/consumer.h>
>>
>> #include <linux/mmc/host.h>
>>
>> @@ -50,6 +51,7 @@ struct sdhci_s3c {
>> struct platform_device *pdev;
>> struct resource *ioarea;
>> struct s3c_sdhci_platdata *pdata;
>> + struct pinctrl *pinctrl;
>> unsigned int cur_clk;
>> int ext_cd_irq;
>> int ext_cd_gpio;
>> @@ -529,6 +531,9 @@ static inline struct sdhci_s3c_drv_data
>> *sdhci_s3c_get_driver_data(
>> platform_get_device_id(pdev)->driver_data;
>> }
>>
>> +#include <plat/map-s5p.h>
>> +#include <plat/map-base.h>
>
> Why this header files are required?
Sorry, that was a mistake. This was left over here after adding it
here for some debugging. I will take care next time.
>> +
>> static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
>> {
>> struct s3c_sdhci_platdata *pdata;
>> @@ -538,6 +543,7 @@ static int __devinit sdhci_s3c_probe(struct
>> platform_device *pdev)
>> struct sdhci_s3c *sc;
>> struct resource *res;
>> int ret, irq, ptr, clks;
>> + char *pstate;
>>
>> if (!pdev->dev.platform_data && !pdev->dev.of_node) {
>> dev_err(dev, "no device data specified\n");
>> @@ -643,8 +649,13 @@ static int __devinit sdhci_s3c_probe(struct
>> platform_device *pdev)
>> }
>>
>> /* Ensure we have minimal gpio selected CMD/CLK/Detect */
>> - if (pdata->cfg_gpio)
>> - pdata->cfg_gpio(pdev, pdata->max_width);
>> + pstate = pdata->max_width ? "sdhci-pcfg8" : "sdhci-pcfg4";
> You should check pdata->max_width == 8 instead of max_width itself.
Thanks. I will fix that.
> BTW if platform set the amx_width as 1. How do you handle this?
If the bus width is 1, we need to add pin map entry for 1 bit bus
width and correspondingly change the code here. I used the sdhci-s3c
driver for testing the samsung pinctrl driver and only tested with
4-bit and 8-bit bus width. The changes in this patch are not final yet
and was mainly included in this series to show how platform callbacks
can be removed.
Thanks,
Thomas.
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
