Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8bea8672edfca7ec5f661cafb218f1205863b343

Authored by Stephen Rothwell
Committed by Linus Torvalds
1 parent d180ec5d34
Exists in master and in 7 other branches imx_3.0.35_4.1.0, 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

mfd: compile fix for twl4030 renaming 

Caused by commit 0b83ddebc6e884dc0221358cf68c461520fbdd8e ("MFD:
twl4030: add twl4030_codec MFD as a new child to the core") interacting
with commit b07682b6056eb6701f8cb86aa5800e6f2ea7919b ("mfd: Rename
twl4030* driver files to enable re-use").

This file seems to have been missed in the renaming.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 5 additions and 5 deletions Side-by-side Diff

drivers/mfd/twl4030-codec.c
Diff comments   View file @ 8bea867
... ... @@ -26,7 +26,7 @@
26 26 #include <linux/kernel.h>
27 27 #include <linux/fs.h>
28 28 #include <linux/platform_device.h>
29   -#include <linux/i2c/twl4030.h>
  29 +#include <linux/i2c/twl.h>
30 30 #include <linux/mfd/core.h>
31 31 #include <linux/mfd/twl4030-codec.h>
32 32  
... ... @@ -56,7 +56,7 @@
56 56 struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev);
57 57 u8 val;
58 58  
59   - twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val,
  59 + twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val,
60 60 codec->resource[id].reg);
61 61  
62 62 if (enable)
... ... @@ -64,7 +64,7 @@
64 64 else
65 65 val &= ~codec->resource[id].mask;
66 66  
67   - twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
  67 + twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
68 68 val, codec->resource[id].reg);
69 69  
70 70 return val;
... ... @@ -75,7 +75,7 @@
75 75 struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev);
76 76 u8 val;
77 77  
78   - twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val,
  78 + twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val,
79 79 codec->resource[id].reg);
80 80  
81 81 return val;
... ... @@ -183,7 +183,7 @@
183 183 dev_err(&pdev->dev, "Invalid audio_mclk\n");
184 184 return -EINVAL;
185 185 }
186   - twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
  186 + twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
187 187 val, TWL4030_REG_APLL_CTL);
188 188  
189 189 codec = kzalloc(sizeof(struct twl4030_codec), GFP_KERNEL);