| Message ID | 20200819123208.12337-6-l.stelmach@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/8] spi: spi-s3c64xx: swap s3c64xx_spi_set_cs() and s3c64xx_enable_datapath() | expand |
On Wed, Aug 19, 2020 at 02:32:05PM +0200, Łukasz Stelmach wrote: > Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com> Hi, Missing commit msg - fix what exactly? You need to rebase your patch as most of these were already fixed by Lee Jones. However he did not remove the @rx_dmach and tx entries... Best regards, Krzysztof > --- > drivers/spi/spi-s3c64xx.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c > index 6fe896f2be18..505789f91fdf 100644 > --- a/drivers/spi/spi-s3c64xx.c > +++ b/drivers/spi/spi-s3c64xx.c > @@ -155,19 +155,21 @@ struct s3c64xx_spi_port_config { > * @clk: Pointer to the spi clock. > * @src_clk: Pointer to the clock used to generate SPI signals. > * @ioclk: Pointer to the i/o clock between master and slave > + * @pdev: Pointer to the SPI controller platform device > * @master: Pointer to the SPI Protocol master. > * @cntrlr_info: Platform specific data for the controller this driver manages. > * @lock: Controller specific lock. > * @state: Set of FLAGS to indicate status. > - * @rx_dmach: Controller's DMA channel for Rx. > - * @tx_dmach: Controller's DMA channel for Tx. > + * @rx_dma: Controller's DMA channel for Rx. > + * @tx_dma: Controller's DMA channel for Tx. > * @sfr_start: BUS address of SPI controller regs. > * @regs: Pointer to ioremap'ed controller registers. > - * @irq: interrupt > * @xfer_completion: To indicate completion of xfer task. > * @cur_mode: Stores the active configuration of the controller. > * @cur_bpw: Stores the active bits per word settings. > * @cur_speed: Stores the active xfer clock speed. > + * @port_conf: Pointer to the SPI port configuration > + * @port_id: SPI port ID number > */
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 6fe896f2be18..505789f91fdf 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -155,19 +155,21 @@ struct s3c64xx_spi_port_config { * @clk: Pointer to the spi clock. * @src_clk: Pointer to the clock used to generate SPI signals. * @ioclk: Pointer to the i/o clock between master and slave + * @pdev: Pointer to the SPI controller platform device * @master: Pointer to the SPI Protocol master. * @cntrlr_info: Platform specific data for the controller this driver manages. * @lock: Controller specific lock. * @state: Set of FLAGS to indicate status. - * @rx_dmach: Controller's DMA channel for Rx. - * @tx_dmach: Controller's DMA channel for Tx. + * @rx_dma: Controller's DMA channel for Rx. + * @tx_dma: Controller's DMA channel for Tx. * @sfr_start: BUS address of SPI controller regs. * @regs: Pointer to ioremap'ed controller registers. - * @irq: interrupt * @xfer_completion: To indicate completion of xfer task. * @cur_mode: Stores the active configuration of the controller. * @cur_bpw: Stores the active bits per word settings. * @cur_speed: Stores the active xfer clock speed. + * @port_conf: Pointer to the SPI port configuration + * @port_id: SPI port ID number */ struct s3c64xx_spi_driver_data { void __iomem *regs; @@ -176,7 +178,7 @@ struct s3c64xx_spi_driver_data { struct clk *ioclk; struct platform_device *pdev; struct spi_master *master; - struct s3c64xx_spi_info *cntrlr_info; + struct s3c64xx_spi_info *cntrlr_info; spinlock_t lock; unsigned long sfr_start; struct completion xfer_completion;
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com> --- drivers/spi/spi-s3c64xx.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)