On Fri, 18 May 2012 15:03:32 +0530, Thomas Abraham <[email protected]> wrote: > The set_level callback in the controller data, which is used to configure > the slave select line, cannot be supported when migrating the driver to > device tree based discovery. Since all the platforms currently use gpio > as the slave select line, this callback can be removed from the > controller data and replaced with call to gpio_set_value in the driver. > > Signed-off-by: Thomas Abraham <[email protected]> > Acked-by: Jaswinder Singh <[email protected]>
Acked-by: Grant Likely <[email protected]> > --- > arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 2 -- > drivers/spi/spi-s3c64xx.c | 8 ++++---- > 2 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h > b/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h > index a733ce9..48a6495 100644 > --- a/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h > +++ b/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h > @@ -18,7 +18,6 @@ struct platform_device; > * @fb_delay: Slave specific feedback delay. > * Refer to FB_CLK_SEL register definition in SPI chapter. > * @line: Custom 'identity' of the CS line. > - * @set_level: CS line control. > * > * This is per SPI-Slave Chipselect information. > * Allocate and initialize one in machine init code and make the > @@ -27,7 +26,6 @@ struct platform_device; > struct s3c64xx_spi_csinfo { > u8 fb_delay; > unsigned line; > - void (*set_level)(unsigned line_id, int lvl); > }; > > /** > diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c > index f6bc0e3..d84ce7f 100644 > --- a/drivers/spi/spi-s3c64xx.c > +++ b/drivers/spi/spi-s3c64xx.c > @@ -406,14 +406,14 @@ static inline void enable_cs(struct > s3c64xx_spi_driver_data *sdd, > if (sdd->tgl_spi != spi) { /* if last mssg on diff device */ > /* Deselect the last toggled device */ > cs = sdd->tgl_spi->controller_data; > - cs->set_level(cs->line, > - spi->mode & SPI_CS_HIGH ? 0 : 1); > + gpio_set_value(cs->line, > + spi->mode & SPI_CS_HIGH ? 0 : 1); > } > sdd->tgl_spi = NULL; > } > > cs = spi->controller_data; > - cs->set_level(cs->line, spi->mode & SPI_CS_HIGH ? 1 : 0); > + gpio_set_value(cs->line, spi->mode & SPI_CS_HIGH ? 1 : 0); > } > > static int wait_for_xfer(struct s3c64xx_spi_driver_data *sdd, > @@ -499,7 +499,7 @@ static inline void disable_cs(struct > s3c64xx_spi_driver_data *sdd, > if (sdd->tgl_spi == spi) > sdd->tgl_spi = NULL; > > - cs->set_level(cs->line, spi->mode & SPI_CS_HIGH ? 0 : 1); > + gpio_set_value(cs->line, spi->mode & SPI_CS_HIGH ? 0 : 1); > } > > static void s3c64xx_spi_config(struct s3c64xx_spi_driver_data *sdd) > -- > 1.6.6.rc2 > -- Grant Likely, B.Sc, P.Eng. Secret Lab Technologies, Ltd. ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ spi-devel-general mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/spi-devel-general
