aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOm Prakash <omprakash.pal@stericsson.com>2011-06-27 03:54:22 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2011-07-31 17:28:25 -0400
commit4dcaa6b6df354fa44b3072bed3cb13aad7e5fbd4 (patch)
treec0d09696b116938aadb5b3d195f2cf71fd97a860
parent63c8a58d226a0701272b54015a8d73643d72cd3d (diff)
mfd: Fix missing stmpe kerneldoc
Generating kerneldoc for STMPE result in warnings, so fix this by adding missing documentation. Signed-off-by: Om Prakash <omprakash.pal@stericsson.com> Reviewed-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-by: Jonas Aberg <jonas.aberg@stericsson.com> Reviewed-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/mfd/stmpe.c2
-rw-r--r--drivers/mfd/stmpe.h1
-rw-r--r--include/linux/mfd/stmpe.h3
3 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index 7ab7746631d4..2963689cf45c 100644
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -228,7 +228,7 @@ int stmpe_block_write(struct stmpe *stmpe, u8 reg, u8 length,
228EXPORT_SYMBOL_GPL(stmpe_block_write); 228EXPORT_SYMBOL_GPL(stmpe_block_write);
229 229
230/** 230/**
231 * stmpe_set_altfunc: set the alternate function for STMPE pins 231 * stmpe_set_altfunc()- set the alternate function for STMPE pins
232 * @stmpe: Device to configure 232 * @stmpe: Device to configure
233 * @pins: Bitmask of pins to affect 233 * @pins: Bitmask of pins to affect
234 * @block: block to enable alternate functions for 234 * @block: block to enable alternate functions for
diff --git a/drivers/mfd/stmpe.h b/drivers/mfd/stmpe.h
index 0dbdc4e8cd77..e4ee38956583 100644
--- a/drivers/mfd/stmpe.h
+++ b/drivers/mfd/stmpe.h
@@ -42,6 +42,7 @@ struct stmpe_variant_block {
42 * @id_mask: bits valid in CHIPID register for comparison with id_val 42 * @id_mask: bits valid in CHIPID register for comparison with id_val
43 * @num_gpios: number of GPIOS 43 * @num_gpios: number of GPIOS
44 * @af_bits: number of bits used to specify the alternate function 44 * @af_bits: number of bits used to specify the alternate function
45 * @regs: variant specific registers.
45 * @blocks: list of blocks present on this device 46 * @blocks: list of blocks present on this device
46 * @num_blocks: number of blocks present on this device 47 * @num_blocks: number of blocks present on this device
47 * @num_irqs: number of internal IRQs available on this device 48 * @num_irqs: number of internal IRQs available on this device
diff --git a/include/linux/mfd/stmpe.h b/include/linux/mfd/stmpe.h
index e762c270d8d4..be1af7c42e57 100644
--- a/include/linux/mfd/stmpe.h
+++ b/include/linux/mfd/stmpe.h
@@ -57,6 +57,7 @@ struct stmpe_variant_info;
57 * @irq_lock: IRQ bus lock 57 * @irq_lock: IRQ bus lock
58 * @dev: device, mostly for dev_dbg() 58 * @dev: device, mostly for dev_dbg()
59 * @i2c: i2c client 59 * @i2c: i2c client
60 * @partnum: part number
60 * @variant: the detected STMPE model number 61 * @variant: the detected STMPE model number
61 * @regs: list of addresses of registers which are at different addresses on 62 * @regs: list of addresses of registers which are at different addresses on
62 * different variants. Indexed by one of STMPE_IDX_*. 63 * different variants. Indexed by one of STMPE_IDX_*.
@@ -121,6 +122,8 @@ struct stmpe_keypad_platform_data {
121 * @norequest_mask: bitmask specifying which GPIOs should _not_ be 122 * @norequest_mask: bitmask specifying which GPIOs should _not_ be
122 * requestable due to different usage (e.g. touch, keypad) 123 * requestable due to different usage (e.g. touch, keypad)
123 * STMPE_GPIO_NOREQ_* macros can be used here. 124 * STMPE_GPIO_NOREQ_* macros can be used here.
125 * @setup: board specific setup callback.
126 * @remove: board specific remove callback
124 */ 127 */
125struct stmpe_gpio_platform_data { 128struct stmpe_gpio_platform_data {
126 int gpio_base; 129 int gpio_base;