diff options
| -rw-r--r-- | Documentation/DocBook/shrm.tmpl | 2 | ||||
| -rw-r--r-- | Documentation/DocBook/stmpe.tmpl | 6 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/shrm_driver.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/shrm_private.h | 1 | ||||
| -rw-r--r-- | drivers/dma/ste_dma40.c | 2 | ||||
| -rw-r--r-- | drivers/gpio/gpio-nomadik.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/busses/i2c-nomadik.c | 27 | ||||
| -rw-r--r-- | drivers/mfd/stmpe.c | 2 | ||||
| -rw-r--r-- | drivers/mfd/stmpe.h | 1 | ||||
| -rw-r--r-- | include/linux/mfd/stmpe.h | 3 |
10 files changed, 26 insertions, 21 deletions
diff --git a/Documentation/DocBook/shrm.tmpl b/Documentation/DocBook/shrm.tmpl index b35e1bc4e0b..7f21cd3f7dd 100644 --- a/Documentation/DocBook/shrm.tmpl +++ b/Documentation/DocBook/shrm.tmpl @@ -109,6 +109,7 @@ This Section lists the API's provided by the SHRM driver used in transmission of RPC, AUDIO and SECURITY messages. </para> !Edrivers/char/shrm_char.c + </chapter> <chapter id="private"> @@ -132,7 +133,6 @@ <para> This Section lists some of the Data structure used by the SHRM driver. </para> -!Iarch/arm/mach-ux500/include/mach/shrm.h !Iarch/arm/mach-ux500/include/mach/shrm_driver.h !Iarch/arm/mach-ux500/include/mach/shrm_private.h </chapter> diff --git a/Documentation/DocBook/stmpe.tmpl b/Documentation/DocBook/stmpe.tmpl index 6759149d6ce..9e64a00f6b3 100644 --- a/Documentation/DocBook/stmpe.tmpl +++ b/Documentation/DocBook/stmpe.tmpl @@ -101,11 +101,7 @@ <section id="stmpe-keypad.c"> <title>stmpe-keypad.c</title> !Idrivers/input/keyboard/stmpe-keypad.c - </section> - <section id="stmpe-gpio.c"> - <title>stmpe-gpio.c</title> -!Idrivers/gpio/stmpe-gpio.c - </section> + </section> </chapter> <chapter id="Other"> diff --git a/arch/arm/mach-ux500/include/mach/shrm_driver.h b/arch/arm/mach-ux500/include/mach/shrm_driver.h index 41f518238b3..36bb8413ad9 100644 --- a/arch/arm/mach-ux500/include/mach/shrm_driver.h +++ b/arch/arm/mach-ux500/include/mach/shrm_driver.h @@ -173,6 +173,7 @@ struct message_queue { * struct isadev_context - shrm char interface context * @dl_queue: structre to store the queue related info * @device_id: message id(ISI, RPC, AUDIO, SECURITY) + * @addr: device addresses. */ struct isadev_context { struct message_queue dl_queue; diff --git a/arch/arm/mach-ux500/include/mach/shrm_private.h b/arch/arm/mach-ux500/include/mach/shrm_private.h index 33a0e18234b..1f09e7bef94 100644 --- a/arch/arm/mach-ux500/include/mach/shrm_private.h +++ b/arch/arm/mach-ux500/include/mach/shrm_private.h @@ -61,6 +61,7 @@ typedef void (*MSG_PENDING_NOTIF)(const u32 Wptr); * @availablesize: available memory in fifo * @end_addr_fifo: fifo end addr * @fifo_virtual_addr: fifo virtual addr + * @fifo_update_lock: spin lock to update fifo. * * On writting a message to FIFO the same has to be read by the modem before * writing the next message to the FIFO. In oder to over come this a local diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index beadb86eeca..3b9311b58b5 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -185,6 +185,8 @@ struct d40_base; * @log_def: Default logical channel settings. * @lcla: Space for one dst src pair for logical channel transfers. * @lcpa: Pointer to dst and src lcpa settings. + * @runtime_addr: runtime configured address. + * @runtime_direction: runtime configured direction. * * This struct can either "be" a logical or a physical channel. */ diff --git a/drivers/gpio/gpio-nomadik.c b/drivers/gpio/gpio-nomadik.c index 2c212c732d7..be27545f16f 100644 --- a/drivers/gpio/gpio-nomadik.c +++ b/drivers/gpio/gpio-nomadik.c @@ -353,7 +353,7 @@ static int __nmk_config_pins(pin_cfg_t *cfgs, int num, bool sleep) /** * nmk_config_pin - configure a pin's mux attributes * @cfg: pin confguration - * + * @sleep: Non-zero to apply the sleep mode configuration * Configures a pin's mode (alternate function or GPIO), its pull up status, * and its sleep mode based on the specified configuration. The @cfg is * usually one of the SoC specific macros defined in mach/<soc>-pins.h. These diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 1af968fc4f1..a885960f7e2 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -135,18 +135,19 @@ struct i2c_nmk_client { }; /** - * struct nmk_i2c_dev - private data structure of the controller - * @pdev: parent platform device - * @adap: corresponding I2C adapter - * @irq: interrupt line for the controller - * @virtbase: virtual io memory area - * @clk: hardware i2c block clock - * @cfg: machine provided controller configuration - * @cli: holder of client specific data - * @stop: stop condition - * @xfer_complete: acknowledge completion for a I2C message - * @result: controller propogated result - * @busy: Busy doing transfer + * struct nmk_i2c_dev - private data structure of the controller. + * @pdev: parent platform device. + * @adap: corresponding I2C adapter. + * @irq: interrupt line for the controller. + * @virtbase: virtual io memory area. + * @clk: hardware i2c block clock. + * @cfg: machine provided controller configuration. + * @cli: holder of client specific data. + * @stop: stop condition. + * @xfer_complete: acknowledge completion for a I2C message. + * @result: controller propogated result. + * @regulator: pointer to i2c regulator. + * @busy: Busy doing transfer. */ struct nmk_i2c_dev { struct platform_device *pdev; @@ -683,7 +684,7 @@ out: /** * disable_interrupts() - disable the interrupts * @dev: private data of controller - * @irq: interrupt number + * @irq: interrupt number. */ static int disable_interrupts(struct nmk_i2c_dev *dev, u32 irq) { diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c index a791d415e8d..f9abf20975b 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, EXPORT_SYMBOL_GPL(stmpe_block_write); /** - * stmpe_set_altfunc: set the alternate function for STMPE pins + * stmpe_set_altfunc()- set the alternate function for STMPE pins * @stmpe: Device to configure * @pins: Bitmask of pins to affect * @block: block to enable alternate functions for diff --git a/drivers/mfd/stmpe.h b/drivers/mfd/stmpe.h index 0dbdc4e8cd7..e4ee3895658 100644 --- a/drivers/mfd/stmpe.h +++ b/drivers/mfd/stmpe.h @@ -42,6 +42,7 @@ struct stmpe_variant_block { * @id_mask: bits valid in CHIPID register for comparison with id_val * @num_gpios: number of GPIOS * @af_bits: number of bits used to specify the alternate function + * @regs: variant specific registers. * @blocks: list of blocks present on this device * @num_blocks: number of blocks present on this device * @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 a05f03b16bf..54046d1d6b5 100644 --- a/include/linux/mfd/stmpe.h +++ b/include/linux/mfd/stmpe.h @@ -57,6 +57,7 @@ struct stmpe_variant_info; * @irq_lock: IRQ bus lock * @dev: device, mostly for dev_dbg() * @i2c: i2c client + * @partnum: part number * @variant: the detected STMPE model number * @regs: list of addresses of registers which are at different addresses on * different variants. Indexed by one of STMPE_IDX_*. @@ -121,6 +122,8 @@ struct stmpe_keypad_platform_data { * @norequest_mask: bitmask specifying which GPIOs should _not_ be * requestable due to different usage (e.g. touch, keypad) * STMPE_GPIO_NOREQ_* macros can be used here. + * @setup: board specific setup callback. + * @remove: board specific remove callback */ struct stmpe_gpio_platform_data { int gpio_base; |