Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e37051dc7f35de5ce3f64c40852365ff24f2436c

Authored by Axel Lin
Committed by Russell King
1 parent 28f9a9294a
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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: Axel Lin <axel.lin@gmail.com>
Acked-by: Wan Zongshun <mcuos.com@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 5 changed files with 7 additions and 7 deletions Side-by-side Diff

arch/arm/mach-w90x900/clksel.c
Diff comments   View file @ e37051d
... ... @@ -48,7 +48,7 @@
48 48 offset = ATAOFFSET;
49 49 else if (strcmp(dev_id, "nuc900-lcd") == 0)
50 50 offset = LCDOFFSET;
51   - else if (strcmp(dev_id, "nuc900-audio") == 0)
  51 + else if (strcmp(dev_id, "nuc900-ac97") == 0)
52 52 offset = AUDOFFSET;
53 53 else
54 54 offset = CPUOFFSET;
arch/arm/mach-w90x900/cpu.c
Diff comments   View file @ e37051d
... ... @@ -79,7 +79,7 @@
79 79  
80 80 static struct clk_lookup nuc900_clkregs[] = {
81 81 DEF_CLKLOOK(&clk_lcd, "nuc900-lcd", NULL),
82   - DEF_CLKLOOK(&clk_audio, "nuc900-audio", NULL),
  82 + DEF_CLKLOOK(&clk_audio, "nuc900-ac97", NULL),
83 83 DEF_CLKLOOK(&clk_fmi, "nuc900-fmi", NULL),
84 84 DEF_CLKLOOK(&clk_ms, "nuc900-fmi", "MS"),
85 85 DEF_CLKLOOK(&clk_sd, "nuc900-fmi", "SD"),
arch/arm/mach-w90x900/dev.c
Diff comments   View file @ e37051d
... ... @@ -501,8 +501,8 @@
501 501  
502 502 };
503 503  
504   -struct platform_device nuc900_device_audio = {
505   - .name = "nuc900-audio",
  504 +struct platform_device nuc900_device_ac97 = {
  505 + .name = "nuc900-ac97",
506 506 .id = -1,
507 507 .num_resources = ARRAY_SIZE(nuc900_ac97_resource),
508 508 .resource = nuc900_ac97_resource,
... ... @@ -523,7 +523,7 @@
523 523 &nuc900_device_emc,
524 524 &nuc900_device_spi,
525 525 &nuc900_device_wdt,
526   - &nuc900_device_audio,
  526 + &nuc900_device_ac97,
527 527 };
528 528  
529 529 /* Provide adding specific CPU platform devices API */
arch/arm/mach-w90x900/mfp.c
Diff comments   View file @ e37051d
... ... @@ -155,7 +155,7 @@
155 155 } else if (strcmp(dev_id, "nuc900-i2c1") == 0) {
156 156 mfpen &= ~(GPIOG2TO3);
157 157 mfpen |= ENI2C1;/*enable i2c1*/
158   - } else if (strcmp(dev_id, "nuc900-audio") == 0) {
  158 + } else if (strcmp(dev_id, "nuc900-ac97") == 0) {
159 159 mfpen &= ~(GPIOG22TO23);
160 160 mfpen |= ENAC97;/*enable AC97*/
161 161 } else if (strcmp(dev_id, "nuc900-mmc-port1") == 0) {
sound/soc/nuc900/nuc900-ac97.c
Diff comments   View file @ e37051d
... ... @@ -366,7 +366,7 @@
366 366 goto out3;
367 367  
368 368 /* enbale ac97 multifunction pin */
369   - mfp_set_groupg(nuc900_audio->dev, "nuc900-audio");
  369 + mfp_set_groupg(nuc900_audio->dev, NULL);
370 370  
371 371 return 0;
372 372