Skip to content

Commit 97371fa

Browse files
AxelLinRussell King
authored andcommitted
ARM: 7175/1: add subname parameter to mfp_set_groupg callers
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 <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Wan Zongshun <[email protected]> Signed-off-by: Russell King <[email protected]>
1 parent 46589e2 commit 97371fa

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

drivers/i2c/busses/i2c-nuc900.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ static int __devinit nuc900_i2c_probe(struct platform_device *pdev)
593593
i2c->adap.algo_data = i2c;
594594
i2c->adap.dev.parent = &pdev->dev;
595595

596-
mfp_set_groupg(&pdev->dev);
596+
mfp_set_groupg(&pdev->dev, NULL);
597597

598598
clk_get_rate(i2c->clk);
599599

drivers/spi/spi-nuc900.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ static int __devinit nuc900_spi_probe(struct platform_device *pdev)
426426
goto err_clk;
427427
}
428428

429-
mfp_set_groupg(&pdev->dev);
429+
mfp_set_groupg(&pdev->dev, NULL);
430430
nuc900_init_spi(hw);
431431

432432
err = spi_bitbang_start(&hw->bitbang);

sound/soc/nuc900/nuc900-ac97.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,8 @@ static int __devinit nuc900_ac97_drvprobe(struct platform_device *pdev)
365365
if (ret)
366366
goto out3;
367367

368-
mfp_set_groupg(nuc900_audio->dev); /* enbale ac97 multifunction pin*/
368+
/* enbale ac97 multifunction pin */
369+
mfp_set_groupg(nuc900_audio->dev, "nuc900-audio");
369370

370371
return 0;
371372

0 commit comments

Comments
 (0)