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

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

ARM: 7274/1: NUC900: Rename nuc900-audio platform device to nuc900-ac97 



This change ensures the platform device name matches nuc900-ac97 platform
driver name.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarWan Zongshun <mcuos.com@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 28f9a929

arch/arm/mach-w90x900/clksel.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static void clock_source_select(const char *dev_id, unsigned int clkval) 
		offset = ATAOFFSET;

	else if (strcmp(dev_id, "nuc900-lcd") == 0)

		offset = LCDOFFSET;

	else if (strcmp(dev_id, "nuc900-audio") == 0)

	else if (strcmp(dev_id, "nuc900-ac97") == 0)

		offset = AUDOFFSET;

	else

		offset = CPUOFFSET;

arch/arm/mach-w90x900/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static DEFINE_CLK(timer4, 23); 


static struct clk_lookup nuc900_clkregs[] = {

	DEF_CLKLOOK(&clk_lcd, "nuc900-lcd", NULL),

	DEF_CLKLOOK(&clk_audio, "nuc900-audio", NULL),

	DEF_CLKLOOK(&clk_audio, "nuc900-ac97", NULL),

	DEF_CLKLOOK(&clk_fmi, "nuc900-fmi", NULL),

	DEF_CLKLOOK(&clk_ms, "nuc900-fmi", "MS"),

	DEF_CLKLOOK(&clk_sd, "nuc900-fmi", "SD"),

arch/arm/mach-w90x900/dev.c

+3 −3
Original line number Diff line number Diff line
@@ -501,8 +501,8 @@ static struct resource nuc900_ac97_resource[] = { 


};



struct platform_device nuc900_device_audio = {

	.name		= "nuc900-audio",

struct platform_device nuc900_device_ac97 = {

	.name		= "nuc900-ac97",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(nuc900_ac97_resource),

	.resource	= nuc900_ac97_resource,
@@ -523,7 +523,7 @@ static struct platform_device *nuc900_public_dev[] __initdata = { 
	&nuc900_device_emc,

	&nuc900_device_spi,

	&nuc900_device_wdt,

	&nuc900_device_audio,

	&nuc900_device_ac97,

};



/* Provide adding specific CPU platform devices API */

arch/arm/mach-w90x900/mfp.c

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ void mfp_set_groupg(struct device *dev, const char *subname) 
	} else if (strcmp(dev_id, "nuc900-i2c1") == 0) {

		mfpen &= ~(GPIOG2TO3);

		mfpen |= ENI2C1;/*enable i2c1*/

	} else if (strcmp(dev_id, "nuc900-audio") == 0) {

	} else if (strcmp(dev_id, "nuc900-ac97") == 0) {

		mfpen &= ~(GPIOG22TO23);

		mfpen |= ENAC97;/*enable AC97*/

	} else if (strcmp(dev_id, "nuc900-mmc-port1") == 0) {

sound/soc/nuc900/nuc900-ac97.c

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ static int __devinit nuc900_ac97_drvprobe(struct platform_device *pdev) 
		goto out3;



	/* enbale ac97 multifunction pin */

	mfp_set_groupg(nuc900_audio->dev, "nuc900-audio");

	mfp_set_groupg(nuc900_audio->dev, NULL);



	return 0;