diff options
Diffstat (limited to 'recipes-kernel/linux/linux-imx-3.10.17/0004-regulator-pfuze100-Add-terminate-entry-for-i2c-of-_d.patch')
-rw-r--r-- | recipes-kernel/linux/linux-imx-3.10.17/0004-regulator-pfuze100-Add-terminate-entry-for-i2c-of-_d.patch | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/recipes-kernel/linux/linux-imx-3.10.17/0004-regulator-pfuze100-Add-terminate-entry-for-i2c-of-_d.patch b/recipes-kernel/linux/linux-imx-3.10.17/0004-regulator-pfuze100-Add-terminate-entry-for-i2c-of-_d.patch deleted file mode 100644 index c7381e3..0000000 --- a/recipes-kernel/linux/linux-imx-3.10.17/0004-regulator-pfuze100-Add-terminate-entry-for-i2c-of-_d.patch +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | From fdbdb66994db6b896a5a6464b9c1efd7abfbfdb9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Axel Lin <axel.lin@ingics.com> | ||
3 | Date: Tue, 4 Mar 2014 18:20:14 +0800 | ||
4 | Subject: [PATCH 04/10] regulator: pfuze100: Add terminate entry for | ||
5 | [i2c|of]_device_id tables | ||
6 | Organization: O.S. Systems Software LTDA. | ||
7 | |||
8 | Also remove PFUZE_NUM to avoid below build warnings: | ||
9 | |||
10 | CC [M] drivers/regulator/pfuze100-regulator.o | ||
11 | drivers/regulator/pfuze100-regulator.c:86:2: warning: excess elements in array initializer [enabled by default] | ||
12 | drivers/regulator/pfuze100-regulator.c:86:2: warning: (near initialization for 'pfuze_device_id') [enabled by default] | ||
13 | drivers/regulator/pfuze100-regulator.c:93:2: warning: excess elements in array initializer [enabled by default] | ||
14 | drivers/regulator/pfuze100-regulator.c:93:2: warning: (near initialization for 'pfuze_dt_ids') [enabled by default] | ||
15 | |||
16 | Signed-off-by: Axel Lin <axel.lin@ingics.com> | ||
17 | Signed-off-by: Mark Brown <broonie@linaro.org> | ||
18 | (cherry picked from commit e6c4c3378d82c5eeb136ed06b1a23651bcdaf739) | ||
19 | (cherry picked from commit 12c7dd7c396378fd6dc907903a4ae540a75b31f5) | ||
20 | |||
21 | Upstream-Status: Pending | ||
22 | --- | ||
23 | drivers/regulator/pfuze100-regulator.c | 8 +++++--- | ||
24 | 1 file changed, 5 insertions(+), 3 deletions(-) | ||
25 | |||
26 | diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c | ||
27 | index 35b1de1..0f4924e0 100644 | ||
28 | --- a/drivers/regulator/pfuze100-regulator.c | ||
29 | +++ b/drivers/regulator/pfuze100-regulator.c | ||
30 | @@ -56,7 +56,7 @@ | ||
31 | #define PFUZE100_VGEN5VOL 0x70 | ||
32 | #define PFUZE100_VGEN6VOL 0x71 | ||
33 | |||
34 | -enum chips {PFUZE100, PFUZE200, PFUZE_NUM}; | ||
35 | +enum chips { PFUZE100, PFUZE200 }; | ||
36 | |||
37 | struct pfuze_regulator { | ||
38 | struct regulator_desc desc; | ||
39 | @@ -80,15 +80,17 @@ static const int pfuze100_vsnvs[] = { | ||
40 | 1000000, 1100000, 1200000, 1300000, 1500000, 1800000, 3000000, | ||
41 | }; | ||
42 | |||
43 | -static const struct i2c_device_id pfuze_device_id[PFUZE_NUM] = { | ||
44 | +static const struct i2c_device_id pfuze_device_id[] = { | ||
45 | {.name = "pfuze100", .driver_data = PFUZE100}, | ||
46 | {.name = "pfuze200", .driver_data = PFUZE200}, | ||
47 | + { } | ||
48 | }; | ||
49 | MODULE_DEVICE_TABLE(i2c, pfuze_device_id); | ||
50 | |||
51 | -static const struct of_device_id pfuze_dt_ids[PFUZE_NUM] = { | ||
52 | +static const struct of_device_id pfuze_dt_ids[] = { | ||
53 | { .compatible = "fsl,pfuze100", .data = (void *)PFUZE100}, | ||
54 | { .compatible = "fsl,pfuze200", .data = (void *)PFUZE200}, | ||
55 | + { } | ||
56 | }; | ||
57 | MODULE_DEVICE_TABLE(of, pfuze_dt_ids); | ||
58 | |||
59 | -- | ||
60 | 2.1.0 | ||
61 | |||