* [PATCH 4/4] spi/pl022: minor kerneldoc updates
@ 2011-02-08 12:03 Linus Walleij
2011-02-15 22:09 ` Grant Likely
0 siblings, 1 reply; 3+ messages in thread
From: Linus Walleij @ 2011-02-08 12:03 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/spi/amba-pl022.c | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c
index 2b591f0..4cd05cc 100644
--- a/drivers/spi/amba-pl022.c
+++ b/drivers/spi/amba-pl022.c
@@ -329,15 +329,16 @@ struct vendor_data {
/**
* struct pl022 - This is the private SSP driver data structure
* @adev: AMBA device model hookup
- * @vendor: Vendor data for the IP block
- * @phybase: The physical memory where the SSP device resides
- * @virtbase: The virtual memory where the SSP is mapped
+ * @vendor: vendor data for the IP block
+ * @phybase: the physical memory where the SSP device resides
+ * @virtbase: the virtual memory where the SSP is mapped
+ * @clk: outgoing clock "SPICLK" for the SPI bus
* @master: SPI framework hookup
* @master_info: controller-specific data from machine setup
- * @regs: SSP controller register's virtual address
- * @pump_messages: Work struct for scheduling work to the workqueue
- * @lock: spinlock to syncronise access to driver data
* @workqueue: a workqueue on which any spi_message request is queued
+ * @pump_messages: work struct for scheduling work to the workqueue
+ * @queue_lock: spinlock to syncronise access to message queue
+ * @queue: message queue
* @busy: workqueue is busy
* @running: workqueue is running
* @pump_transfers: Tasklet used in Interrupt Transfer mode
@@ -348,8 +349,14 @@ struct vendor_data {
* @tx_end: end position in TX buffer to be read
* @rx: current position in RX buffer to be written
* @rx_end: end position in RX buffer to be written
- * @readingtype: the type of read currently going on
- * @writingtype: the type or write currently going on
+ * @read: the type of read currently going on
+ * @write: the type of write currently going on
+ * @exp_fifo_level: expected FIFO level
+ * @dma_rx_channel: optional channel for RX DMA
+ * @dma_tx_channel: optional channel for TX DMA
+ * @sgt_rx: scattertable for the RX transfer
+ * @sgt_tx: scattertable for the TX transfer
+ * @dummypage: a dummy page used for driving data on the bus with DMA
*/
struct pl022 {
struct amba_device *adev;
@@ -397,8 +404,8 @@ struct pl022 {
* @cpsr: Value of Clock prescale register
* @n_bytes: how many bytes(power of 2) reqd for a given data width of client
* @enable_dma: Whether to enable DMA or not
- * @write: function ptr to be used to write when doing xfer for this chip
* @read: function ptr to be used to read when doing xfer for this chip
+ * @write: function ptr to be used to write when doing xfer for this chip
* @cs_control: chip select callback provided by chip
* @xfer_type: polling/interrupt/DMA
*
--
1.7.3.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 4/4] spi/pl022: minor kerneldoc updates
2011-02-08 12:03 [PATCH 4/4] spi/pl022: minor kerneldoc updates Linus Walleij
@ 2011-02-15 22:09 ` Grant Likely
0 siblings, 0 replies; 3+ messages in thread
From: Grant Likely @ 2011-02-15 22:09 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Feb 08, 2011 at 01:03:55PM +0100, Linus Walleij wrote:
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Applied, thanks.
g.
> ---
> drivers/spi/amba-pl022.c | 25 ++++++++++++++++---------
> 1 files changed, 16 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c
> index 2b591f0..4cd05cc 100644
> --- a/drivers/spi/amba-pl022.c
> +++ b/drivers/spi/amba-pl022.c
> @@ -329,15 +329,16 @@ struct vendor_data {
> /**
> * struct pl022 - This is the private SSP driver data structure
> * @adev: AMBA device model hookup
> - * @vendor: Vendor data for the IP block
> - * @phybase: The physical memory where the SSP device resides
> - * @virtbase: The virtual memory where the SSP is mapped
> + * @vendor: vendor data for the IP block
> + * @phybase: the physical memory where the SSP device resides
> + * @virtbase: the virtual memory where the SSP is mapped
> + * @clk: outgoing clock "SPICLK" for the SPI bus
> * @master: SPI framework hookup
> * @master_info: controller-specific data from machine setup
> - * @regs: SSP controller register's virtual address
> - * @pump_messages: Work struct for scheduling work to the workqueue
> - * @lock: spinlock to syncronise access to driver data
> * @workqueue: a workqueue on which any spi_message request is queued
> + * @pump_messages: work struct for scheduling work to the workqueue
> + * @queue_lock: spinlock to syncronise access to message queue
> + * @queue: message queue
> * @busy: workqueue is busy
> * @running: workqueue is running
> * @pump_transfers: Tasklet used in Interrupt Transfer mode
> @@ -348,8 +349,14 @@ struct vendor_data {
> * @tx_end: end position in TX buffer to be read
> * @rx: current position in RX buffer to be written
> * @rx_end: end position in RX buffer to be written
> - * @readingtype: the type of read currently going on
> - * @writingtype: the type or write currently going on
> + * @read: the type of read currently going on
> + * @write: the type of write currently going on
> + * @exp_fifo_level: expected FIFO level
> + * @dma_rx_channel: optional channel for RX DMA
> + * @dma_tx_channel: optional channel for TX DMA
> + * @sgt_rx: scattertable for the RX transfer
> + * @sgt_tx: scattertable for the TX transfer
> + * @dummypage: a dummy page used for driving data on the bus with DMA
> */
> struct pl022 {
> struct amba_device *adev;
> @@ -397,8 +404,8 @@ struct pl022 {
> * @cpsr: Value of Clock prescale register
> * @n_bytes: how many bytes(power of 2) reqd for a given data width of client
> * @enable_dma: Whether to enable DMA or not
> - * @write: function ptr to be used to write when doing xfer for this chip
> * @read: function ptr to be used to read when doing xfer for this chip
> + * @write: function ptr to be used to write when doing xfer for this chip
> * @cs_control: chip select callback provided by chip
> * @xfer_type: polling/interrupt/DMA
> *
> --
> 1.7.3.2
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 4/4] spi/pl022: minor kerneldoc updates
@ 2011-02-08 12:02 Linus Walleij
0 siblings, 0 replies; 3+ messages in thread
From: Linus Walleij @ 2011-02-08 12:02 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/spi/amba-pl022.c | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c
index 2b591f0..4cd05cc 100644
--- a/drivers/spi/amba-pl022.c
+++ b/drivers/spi/amba-pl022.c
@@ -329,15 +329,16 @@ struct vendor_data {
/**
* struct pl022 - This is the private SSP driver data structure
* @adev: AMBA device model hookup
- * @vendor: Vendor data for the IP block
- * @phybase: The physical memory where the SSP device resides
- * @virtbase: The virtual memory where the SSP is mapped
+ * @vendor: vendor data for the IP block
+ * @phybase: the physical memory where the SSP device resides
+ * @virtbase: the virtual memory where the SSP is mapped
+ * @clk: outgoing clock "SPICLK" for the SPI bus
* @master: SPI framework hookup
* @master_info: controller-specific data from machine setup
- * @regs: SSP controller register's virtual address
- * @pump_messages: Work struct for scheduling work to the workqueue
- * @lock: spinlock to syncronise access to driver data
* @workqueue: a workqueue on which any spi_message request is queued
+ * @pump_messages: work struct for scheduling work to the workqueue
+ * @queue_lock: spinlock to syncronise access to message queue
+ * @queue: message queue
* @busy: workqueue is busy
* @running: workqueue is running
* @pump_transfers: Tasklet used in Interrupt Transfer mode
@@ -348,8 +349,14 @@ struct vendor_data {
* @tx_end: end position in TX buffer to be read
* @rx: current position in RX buffer to be written
* @rx_end: end position in RX buffer to be written
- * @readingtype: the type of read currently going on
- * @writingtype: the type or write currently going on
+ * @read: the type of read currently going on
+ * @write: the type of write currently going on
+ * @exp_fifo_level: expected FIFO level
+ * @dma_rx_channel: optional channel for RX DMA
+ * @dma_tx_channel: optional channel for TX DMA
+ * @sgt_rx: scattertable for the RX transfer
+ * @sgt_tx: scattertable for the TX transfer
+ * @dummypage: a dummy page used for driving data on the bus with DMA
*/
struct pl022 {
struct amba_device *adev;
@@ -397,8 +404,8 @@ struct pl022 {
* @cpsr: Value of Clock prescale register
* @n_bytes: how many bytes(power of 2) reqd for a given data width of client
* @enable_dma: Whether to enable DMA or not
- * @write: function ptr to be used to write when doing xfer for this chip
* @read: function ptr to be used to read when doing xfer for this chip
+ * @write: function ptr to be used to write when doing xfer for this chip
* @cs_control: chip select callback provided by chip
* @xfer_type: polling/interrupt/DMA
*
--
1.7.3.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-02-15 22:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-08 12:03 [PATCH 4/4] spi/pl022: minor kerneldoc updates Linus Walleij
2011-02-15 22:09 ` Grant Likely
-- strict thread matches above, loose matches on Subject: below --
2011-02-08 12:02 Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox