aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Weber <thomas@tweber.de>2012-02-17 11:46:21 -0500
committerJiri Kosina <jkosina@suse.cz>2012-04-05 19:58:23 -0400
commit91fe4d508f29d71133e9a82ebdc1f2274c514b70 (patch)
tree8fd57d27d592ca779ebfc35ff52e83b1377396bf
parent450c6076a79ebb053cf53e43f948de5ab077c573 (diff)
Fix typo milivolt => millivolt
Signed-off-by: Thomas Weber <thomas@tweber.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--Documentation/hwmon/wm831x2
-rw-r--r--drivers/mfd/tps65911-comparator.c2
-rw-r--r--drivers/power/bq27x00_battery.c2
-rw-r--r--drivers/regulator/tps65910-regulator.c20
-rw-r--r--include/linux/mfd/wm831x/pdata.h2
5 files changed, 14 insertions, 14 deletions
diff --git a/Documentation/hwmon/wm831x b/Documentation/hwmon/wm831x
index 24f47d8f6a42..11446757c8c8 100644
--- a/Documentation/hwmon/wm831x
+++ b/Documentation/hwmon/wm831x
@@ -22,7 +22,7 @@ reporting of all the input values but does not provide any alarms.
22Voltage Monitoring 22Voltage Monitoring
23------------------ 23------------------
24 24
25Voltages are sampled by a 12 bit ADC. Voltages in milivolts are 1.465 25Voltages are sampled by a 12 bit ADC. Voltages in millivolts are 1.465
26times the ADC value. 26times the ADC value.
27 27
28Temperature Monitoring 28Temperature Monitoring
diff --git a/drivers/mfd/tps65911-comparator.c b/drivers/mfd/tps65911-comparator.c
index e7ff783aa31e..5a62e6bf89ae 100644
--- a/drivers/mfd/tps65911-comparator.c
+++ b/drivers/mfd/tps65911-comparator.c
@@ -26,7 +26,7 @@
26#define COMP1 1 26#define COMP1 1
27#define COMP2 2 27#define COMP2 2
28 28
29/* Comparator 1 voltage selection table in milivolts */ 29/* Comparator 1 voltage selection table in millivolts */
30static const u16 COMP_VSEL_TABLE[] = { 30static const u16 COMP_VSEL_TABLE[] = {
31 0, 2500, 2500, 2500, 2500, 2550, 2600, 2650, 31 0, 2500, 2500, 2500, 2500, 2550, 2600, 2650,
32 2700, 2750, 2800, 2850, 2900, 2950, 3000, 3050, 32 2700, 2750, 2800, 2850, 2900, 2950, 3000, 3050,
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index cd1545f57f49..241848745e29 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -456,7 +456,7 @@ static int bq27x00_battery_capacity_level(struct bq27x00_device_info *di,
456} 456}
457 457
458/* 458/*
459 * Return the battery Voltage in milivolts 459 * Return the battery Voltage in millivolts
460 * Or < 0 if something fails. 460 * Or < 0 if something fails.
461 */ 461 */
462static int bq27x00_battery_voltage(struct bq27x00_device_info *di, 462static int bq27x00_battery_voltage(struct bq27x00_device_info *di,
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c
index 5c15ba01e9c7..1711dbf28ea5 100644
--- a/drivers/regulator/tps65910-regulator.c
+++ b/drivers/regulator/tps65910-regulator.c
@@ -27,54 +27,54 @@
27 27
28#define TPS65910_SUPPLY_STATE_ENABLED 0x1 28#define TPS65910_SUPPLY_STATE_ENABLED 0x1
29 29
30/* supported VIO voltages in milivolts */ 30/* supported VIO voltages in millivolts */
31static const u16 VIO_VSEL_table[] = { 31static const u16 VIO_VSEL_table[] = {
32 1500, 1800, 2500, 3300, 32 1500, 1800, 2500, 3300,
33}; 33};
34 34
35/* VSEL tables for TPS65910 specific LDOs and dcdc's */ 35/* VSEL tables for TPS65910 specific LDOs and dcdc's */
36 36
37/* supported VDD3 voltages in milivolts */ 37/* supported VDD3 voltages in millivolts */
38static const u16 VDD3_VSEL_table[] = { 38static const u16 VDD3_VSEL_table[] = {
39 5000, 39 5000,
40}; 40};
41 41
42/* supported VDIG1 voltages in milivolts */ 42/* supported VDIG1 voltages in millivolts */
43static const u16 VDIG1_VSEL_table[] = { 43static const u16 VDIG1_VSEL_table[] = {
44 1200, 1500, 1800, 2700, 44 1200, 1500, 1800, 2700,
45}; 45};
46 46
47/* supported VDIG2 voltages in milivolts */ 47/* supported VDIG2 voltages in millivolts */
48static const u16 VDIG2_VSEL_table[] = { 48static const u16 VDIG2_VSEL_table[] = {
49 1000, 1100, 1200, 1800, 49 1000, 1100, 1200, 1800,
50}; 50};
51 51
52/* supported VPLL voltages in milivolts */ 52/* supported VPLL voltages in millivolts */
53static const u16 VPLL_VSEL_table[] = { 53static const u16 VPLL_VSEL_table[] = {
54 1000, 1100, 1800, 2500, 54 1000, 1100, 1800, 2500,
55}; 55};
56 56
57/* supported VDAC voltages in milivolts */ 57/* supported VDAC voltages in millivolts */
58static const u16 VDAC_VSEL_table[] = { 58static const u16 VDAC_VSEL_table[] = {
59 1800, 2600, 2800, 2850, 59 1800, 2600, 2800, 2850,
60}; 60};
61 61
62/* supported VAUX1 voltages in milivolts */ 62/* supported VAUX1 voltages in millivolts */
63static const u16 VAUX1_VSEL_table[] = { 63static const u16 VAUX1_VSEL_table[] = {
64 1800, 2500, 2800, 2850, 64 1800, 2500, 2800, 2850,
65}; 65};
66 66
67/* supported VAUX2 voltages in milivolts */ 67/* supported VAUX2 voltages in millivolts */
68static const u16 VAUX2_VSEL_table[] = { 68static const u16 VAUX2_VSEL_table[] = {
69 1800, 2800, 2900, 3300, 69 1800, 2800, 2900, 3300,
70}; 70};
71 71
72/* supported VAUX33 voltages in milivolts */ 72/* supported VAUX33 voltages in millivolts */
73static const u16 VAUX33_VSEL_table[] = { 73static const u16 VAUX33_VSEL_table[] = {
74 1800, 2000, 2800, 3300, 74 1800, 2000, 2800, 3300,
75}; 75};
76 76
77/* supported VMMC voltages in milivolts */ 77/* supported VMMC voltages in millivolts */
78static const u16 VMMC_VSEL_table[] = { 78static const u16 VMMC_VSEL_table[] = {
79 1800, 2800, 3000, 3300, 79 1800, 2800, 3000, 3300,
80}; 80};
diff --git a/include/linux/mfd/wm831x/pdata.h b/include/linux/mfd/wm831x/pdata.h
index 1d7a3f7b3b5d..dcc9631b3052 100644
--- a/include/linux/mfd/wm831x/pdata.h
+++ b/include/linux/mfd/wm831x/pdata.h
@@ -26,7 +26,7 @@ struct wm831x_backlight_pdata {
26struct wm831x_backup_pdata { 26struct wm831x_backup_pdata {
27 int charger_enable; 27 int charger_enable;
28 int no_constant_voltage; /** Disable constant voltage charging */ 28 int no_constant_voltage; /** Disable constant voltage charging */
29 int vlim; /** Voltage limit in milivolts */ 29 int vlim; /** Voltage limit in millivolts */
30 int ilim; /** Current limit in microamps */ 30 int ilim; /** Current limit in microamps */
31}; 31};
32 32