[PATCH] ARM: add subname parameter to mfp_set_groupg callers

[PATCH] ARM: add subname parameter to mfp_set_groupg callers

[Axel Lin]

commit 798681bf "ARM: 7158/1: add new MFP implement for NUC900"
adds subname parameter for mfp_set_groupg.

Thus add subname parameter to the callers.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
commit 798681bf is in Russell King's tree,
I think this patch should route via Russell's tree.
This patch is against linux-next 20111123.

Axel
 drivers/i2c/busses/i2c-nuc900.c |    2 +-
 drivers/spi/spi-nuc900.c        |    2 +-
 sound/soc/nuc900/nuc900-ac97.c  |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/i2c/busses/i2c-nuc900.c b/drivers/i2c/busses/i2c-nuc900.c
index 835e47b..03b6157 100644
--- a/drivers/i2c/busses/i2c-nuc900.c
+++ b/drivers/i2c/busses/i2c-nuc900.c
@@ -593,7 +593,7 @@ static int __devinit nuc900_i2c_probe(struct platform_device *pdev)
 	i2c->adap.algo_data = i2c;
 	i2c->adap.dev.parent = &pdev->dev;
 
-	mfp_set_groupg(&pdev->dev);
+	mfp_set_groupg(&pdev->dev, NULL);
 
 	clk_get_rate(i2c->clk);
 
diff --git a/drivers/spi/spi-nuc900.c b/drivers/spi/spi-nuc900.c
index e763254..21c70b2 100644
--- a/drivers/spi/spi-nuc900.c
+++ b/drivers/spi/spi-nuc900.c
@@ -426,7 +426,7 @@ static int __devinit nuc900_spi_probe(struct platform_device *pdev)
 		goto err_clk;
 	}
 
-	mfp_set_groupg(&pdev->dev);
+	mfp_set_groupg(&pdev->dev, NULL);
 	nuc900_init_spi(hw);
 
 	err = spi_bitbang_start(&hw->bitbang);
diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c
index d9343ee..dbf597f 100644
--- a/sound/soc/nuc900/nuc900-ac97.c
+++ b/sound/soc/nuc900/nuc900-ac97.c
@@ -365,7 +365,8 @@ static int __devinit nuc900_ac97_drvprobe(struct platform_device *pdev)
 	if (ret)
 		goto out3;
 
-	mfp_set_groupg(nuc900_audio->dev); /* enbale ac97 multifunction pin*/
+	/* enbale ac97 multifunction pin */
+	mfp_set_groupg(nuc900_audio->dev, "nuc900-audio");
 
 	return 0;
 
-- 
1.7.5.4

Re: [PATCH] ARM: add subname parameter to mfp_set_groupg callers

[Mark Brown]

On Thu, Nov 24, 2011 at 11:06:23AM +0800, Axel Lin wrote:
> commit 798681bf "ARM: 7158/1: add new MFP implement for NUC900"
> adds subname parameter for mfp_set_groupg.
> 
> Thus add subname parameter to the callers.
> 
> Signed-off-by: Axel Lin <axel.lin@gmail.com>

Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Re: [PATCH] ARM: add subname parameter to mfp_set_groupg callers

[Russell King]

On Thu, Nov 24, 2011 at 11:06:23AM +0800, Axel Lin wrote:
> commit 798681bf "ARM: 7158/1: add new MFP implement for NUC900"
> adds subname parameter for mfp_set_groupg.
> 
> Thus add subname parameter to the callers.
> 
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> commit 798681bf is in Russell King's tree,

It's in mainline as of 20th November.

> I think this patch should route via Russell's tree.
> This patch is against linux-next 20111123.

Is there a reason why this isn't copied to linux-arm-kernel ?

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:

Re: [PATCH] ARM: add subname parameter to mfp_set_groupg callers

[Axel Lin]

2011/11/24 Russell King <rmk@arm.linux.org.uk>:
> On Thu, Nov 24, 2011 at 11:06:23AM +0800, Axel Lin wrote:
>> commit 798681bf "ARM: 7158/1: add new MFP implement for NUC900"
>> adds subname parameter for mfp_set_groupg.
>>
>> Thus add subname parameter to the callers.
>>
>> Signed-off-by: Axel Lin <axel.lin@gmail.com>
>> ---
>> commit 798681bf is in Russell King's tree,
>
> It's in mainline as of 20th November.

Then this patch should be for 3.2. It fixes build errors.

>
>> I think this patch should route via Russell's tree.
>> This patch is against linux-next 20111123.
>
> Is there a reason why this isn't copied to linux-arm-kernel ?
Sorry.
I don't know why scripts/get_maintainer.pl does not suggest to Cc
linux-arm-kernel
when I run scripts/get_maintainer.pl against this patch.

Regards,
Axel
>
> --
> Russell King
>  Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
>  maintainer of:
>

Re: [PATCH] ARM: add subname parameter to mfp_set_groupg callers

[Wan ZongShun]

2011/11/24 Axel Lin <axel.lin@gmail.com>:
> 2011/11/24 Russell King <rmk@arm.linux.org.uk>:
>> On Thu, Nov 24, 2011 at 11:06:23AM +0800, Axel Lin wrote:
>>> commit 798681bf "ARM: 7158/1: add new MFP implement for NUC900"
>>> adds subname parameter for mfp_set_groupg.
>>>
>>> Thus add subname parameter to the callers.
>>>
>>> Signed-off-by: Axel Lin <axel.lin@gmail.com>
>>> ---
>>> commit 798681bf is in Russell King's tree,
>>
>> It's in mainline as of 20th November.
>
> Then this patch should be for 3.2. It fixes build errors.
>
>>
>>> I think this patch should route via Russell's tree.
>>> This patch is against linux-next 20111123.
>>
>> Is there a reason why this isn't copied to linux-arm-kernel ?
> Sorry.
> I don't know why scripts/get_maintainer.pl does not suggest to Cc
> linux-arm-kernel
> when I run scripts/get_maintainer.pl against this patch.
>
> Regards,
> Axel
>>
>> --
>> Russell King
>>  Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
>>  maintainer of:
>>
>

Acked-by :Wan Zongshun <mcuos.com@gmail.com>

This is my omit, thanks Alex!

-- 
Wan ZongShun.
www.mcuos.com