Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97371fa9 authored by Axel Lin's avatar Axel Lin Committed by Russell King
Browse files

ARM: 7175/1: add subname parameter to mfp_set_groupg callers 



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: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarWan Zongshun <mcuos.com@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 46589e29

drivers/i2c/busses/i2c-nuc900.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/spi/spi-nuc900.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

sound/soc/nuc900/nuc900-ac97.c

+2 −1
Original line number Diff line number Diff line
@@ -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;