Skip to content

Commit

Permalink
ARM: 7175/1: add subname parameter to mfp_set_groupg callers
Browse files Browse the repository at this point in the history
commit 798681b "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>
Acked-by: Wan Zongshun <mcuos.com@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Axel Lin authored and Russell King committed Nov 26, 2011
1 parent 46589e2 commit 97371fa
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-nuc900.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/spi/spi-nuc900.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion sound/soc/nuc900/nuc900-ac97.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 97371fa

Please sign in to comment.