Em Fri, 14 Apr 2017 11:25:23 +0900 <Yasunari.Takiguchi@xxxxxxxx> escreveu: > From: Yasunari Takiguchi <Yasunari.Takiguchi@xxxxxxxx> > > Add functions for initializing, reading and writing to the SPI > device for the Sony CXD2880 DVB-T2/T tuner + demodulator. > > Signed-off-by: Yasunari Takiguchi <Yasunari.Takiguchi@xxxxxxxx> > Signed-off-by: Masayuki Yamamoto <Masayuki.Yamamoto@xxxxxxxx> > Signed-off-by: Hideki Nozawa <Hideki.Nozawa@xxxxxxxx> > Signed-off-by: Kota Yonezawa <Kota.Yonezawa@xxxxxxxx> > Signed-off-by: Toshihiko Matsumoto <Toshihiko.Matsumoto@xxxxxxxx> > Signed-off-by: Satoshi Watanabe <Satoshi.C.Watanabe@xxxxxxxx> > --- > .../dvb-frontends/cxd2880/cxd2880_devio_spi.c | 147 +++++++++++++++++++++ > .../dvb-frontends/cxd2880/cxd2880_devio_spi.h | 40 ++++++ > drivers/media/dvb-frontends/cxd2880/cxd2880_spi.h | 51 +++++++ > .../dvb-frontends/cxd2880/cxd2880_spi_device.c | 130 ++++++++++++++++++ > .../dvb-frontends/cxd2880/cxd2880_spi_device.h | 45 +++++++ > 5 files changed, 413 insertions(+) > create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_devio_spi.c > create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_devio_spi.h > create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_spi.h > create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_spi_device.c > create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_spi_device.h > > diff --git a/drivers/media/dvb-frontends/cxd2880/cxd2880_devio_spi.c b/drivers/media/dvb-frontends/cxd2880/cxd2880_devio_spi.c > new file mode 100644 > index 000000000000..516efade6bf5 > --- /dev/null > +++ b/drivers/media/dvb-frontends/cxd2880/cxd2880_devio_spi.c > @@ -0,0 +1,147 @@ > +/* > + * cxd2880_devio_spi.c > + * Sony CXD2880 DVB-T2/T tuner + demodulator driver > + * I/O interface via SPI > + * > + * Copyright (C) 2016, 2017 Sony Semiconductor Solutions Corporation > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License as published by the > + * Free Software Foundation; version 2 of the License. > + * > + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED > + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF > + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN > + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, > + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT > + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF > + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON > + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF > + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + * > + * You should have received a copy of the GNU General Public License along > + * with this program; if not, see <http://www.gnu.org/licenses/>. > + */ > + > +#include "cxd2880_devio_spi.h" > +#include "cxd2880_stdlib.h" > + > +#define BURST_WRITE_MAX 128 > + > +static enum cxd2880_ret cxd2880_io_spi_read_reg(struct cxd2880_io *io, > + enum cxd2880_io_tgt tgt, > + u8 sub_address, u8 *data, > + u32 size) Return argument should be integer, as it is an error code or zero. > +{ > + enum cxd2880_ret ret = CXD2880_RESULT_OK; > + struct cxd2880_spi *spi = NULL; > + u8 send_data[6]; > + u8 *read_data_top = data; > + > + if ((!io) || (!io->if_object) || (!data)) > + return CXD2880_RESULT_ERROR_ARG; > + > + if (sub_address + size > 0x100) > + return CXD2880_RESULT_ERROR_RANGE; Please use standard return error codes. In this specific case, likely -EINVAL and -ERANGE. Same apply to other functions below. > + > + spi = (struct cxd2880_spi *)(io->if_object); > + > + if (tgt == CXD2880_IO_TGT_SYS) > + send_data[0] = 0x0B; > + else > + send_data[0] = 0x0A; > + > + send_data[3] = 0; > + send_data[4] = 0; > + send_data[5] = 0; > + > + while (size > 0) { > + send_data[1] = sub_address; > + if (size > 255) > + send_data[2] = 255; > + else > + send_data[2] = (u8)size; No need to cast. > + > + ret = > + spi->write_read(spi, send_data, sizeof(send_data), > + read_data_top, send_data[2]); > + if (ret != CXD2880_RESULT_OK) > + return ret; Please keep it simple, e. g.: if (ret) return ret; > + > + sub_address += send_data[2]; > + read_data_top += send_data[2]; > + size -= send_data[2]; > + } > + > + return ret; > +} > + > +static enum cxd2880_ret cxd2880_io_spi_write_reg(struct cxd2880_io *io, > + enum cxd2880_io_tgt tgt, > + u8 sub_address, > + const u8 *data, u32 size) > +{ > + enum cxd2880_ret ret = CXD2880_RESULT_OK; > + struct cxd2880_spi *spi = NULL; > + u8 send_data[BURST_WRITE_MAX + 4]; > + const u8 *write_data_top = data; > + > + if ((!io) || (!io->if_object) || (!data)) > + return CXD2880_RESULT_ERROR_ARG; > + > + if (size > BURST_WRITE_MAX) > + return CXD2880_RESULT_ERROR_OVERFLOW; > + > + if (sub_address + size > 0x100) > + return CXD2880_RESULT_ERROR_RANGE; > + > + spi = (struct cxd2880_spi *)(io->if_object); Is cast really needed here? > + > + if (tgt == CXD2880_IO_TGT_SYS) > + send_data[0] = 0x0F; > + else > + send_data[0] = 0x0E; > + > + while (size > 0) { > + send_data[1] = sub_address; > + if (size > 255) > + send_data[2] = 255; > + else > + send_data[2] = (u8)size; cast not needed. > + > + cxd2880_memcpy(&send_data[3], write_data_top, send_data[2]); just memcpy(). > + > + if (tgt == CXD2880_IO_TGT_SYS) { > + send_data[3 + send_data[2]] = 0x00; > + ret = spi->write(spi, send_data, send_data[2] + 4); > + } else { > + ret = spi->write(spi, send_data, send_data[2] + 3); > + } > + if (ret != CXD2880_RESULT_OK) > + return ret; > + > + sub_address += send_data[2]; > + write_data_top += send_data[2]; > + size -= send_data[2]; > + } > + > + return ret; > +} > + > +enum cxd2880_ret cxd2880_io_spi_create(struct cxd2880_io *io, > + struct cxd2880_spi *spi, u8 slave_select) > +{ > + if ((!io) || (!spi)) > + return CXD2880_RESULT_ERROR_ARG; > + > + io->read_regs = cxd2880_io_spi_read_reg; > + io->write_regs = cxd2880_io_spi_write_reg; > + io->write_reg = cxd2880_io_common_write_one_reg; > + io->if_object = spi; > + io->i2c_address_sys = 0; > + io->i2c_address_demod = 0; > + io->slave_select = slave_select; > + > + return CXD2880_RESULT_OK; > +} > diff --git a/drivers/media/dvb-frontends/cxd2880/cxd2880_devio_spi.h b/drivers/media/dvb-frontends/cxd2880/cxd2880_devio_spi.h > new file mode 100644 > index 000000000000..15934bf11935 > --- /dev/null > +++ b/drivers/media/dvb-frontends/cxd2880/cxd2880_devio_spi.h > @@ -0,0 +1,40 @@ > +/* > + * cxd2880_devio_spi.h > + * Sony CXD2880 DVB-T2/T tuner + demodulator driver > + * I/O interface via SPI > + * > + * Copyright (C) 2016, 2017 Sony Semiconductor Solutions Corporation > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License as published by the > + * Free Software Foundation; version 2 of the License. > + * > + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED > + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF > + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN > + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, > + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT > + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF > + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON > + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF > + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + * > + * You should have received a copy of the GNU General Public License along > + * with this program; if not, see <http://www.gnu.org/licenses/>. > + */ > + > +#ifndef CXD2880_DEVIO_SPI_H > +#define CXD2880_DEVIO_SPI_H > + > +#include "cxd2880_common.h" > +#include "cxd2880_io.h" > +#include "cxd2880_spi.h" > + > +#include "cxd2880_tnrdmd.h" > + > +enum cxd2880_ret cxd2880_io_spi_create(struct cxd2880_io *io, > + struct cxd2880_spi *spi, > + u8 slave_select); > + > +#endif > diff --git a/drivers/media/dvb-frontends/cxd2880/cxd2880_spi.h b/drivers/media/dvb-frontends/cxd2880/cxd2880_spi.h > new file mode 100644 > index 000000000000..81e5be747962 > --- /dev/null > +++ b/drivers/media/dvb-frontends/cxd2880/cxd2880_spi.h > @@ -0,0 +1,51 @@ > +/* > + * cxd2880_spi.h > + * Sony CXD2880 DVB-T2/T tuner + demodulator driver > + * SPI access definitions > + * > + * Copyright (C) 2016, 2017 Sony Semiconductor Solutions Corporation > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License as published by the > + * Free Software Foundation; version 2 of the License. > + * > + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED > + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF > + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN > + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, > + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT > + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF > + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON > + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF > + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + * > + * You should have received a copy of the GNU General Public License along > + * with this program; if not, see <http://www.gnu.org/licenses/>. > + */ > + > +#ifndef CXD2880_SPI_H > +#define CXD2880_SPI_H > + > +#include "cxd2880_common.h" > + > +enum cxd2880_spi_mode { > + CXD2880_SPI_MODE_0, > + CXD2880_SPI_MODE_1, > + CXD2880_SPI_MODE_2, > + CXD2880_SPI_MODE_3 > +}; > + > +struct cxd2880_spi { > + enum cxd2880_ret (*read)(struct cxd2880_spi *spi, u8 *data, > + u32 size); > + enum cxd2880_ret (*write)(struct cxd2880_spi *spi, const u8 *data, > + u32 size); > + enum cxd2880_ret (*write_read)(struct cxd2880_spi *spi, > + const u8 *tx_data, u32 tx_size, > + u8 *rx_data, u32 rx_size); please use int for returned values, and convert to the linux error codes. > + u32 flags; > + void *user; > +}; > + > +#endif > diff --git a/drivers/media/dvb-frontends/cxd2880/cxd2880_spi_device.c b/drivers/media/dvb-frontends/cxd2880/cxd2880_spi_device.c > new file mode 100644 > index 000000000000..af9ed40c900b > --- /dev/null > +++ b/drivers/media/dvb-frontends/cxd2880/cxd2880_spi_device.c > @@ -0,0 +1,130 @@ > +/* > + * cxd2880_spi_device.c > + * Sony CXD2880 DVB-T2/T tuner + demodulator driver > + * SPI access functions > + * > + * Copyright (C) 2016, 2017 Sony Semiconductor Solutions Corporation > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License as published by the > + * Free Software Foundation; version 2 of the License. > + * > + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED > + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF > + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN > + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, > + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT > + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF > + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON > + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF > + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + * > + * You should have received a copy of the GNU General Public License along > + * with this program; if not, see <http://www.gnu.org/licenses/>. > + */ > + > +#include <linux/spi/spi.h> > + > +#include "cxd2880_spi_device.h" > + > +static enum cxd2880_ret cxd2880_spi_device_write(struct cxd2880_spi *spi, > + const u8 *data, u32 size) > +{ > + struct cxd2880_spi_device *spi_device = NULL; > + struct spi_message msg; > + struct spi_transfer tx; > + int result = 0; > + > + if ((!spi) || (!spi->user) || (!data) || (size == 0)) > + return CXD2880_RESULT_ERROR_ARG; > + > + spi_device = (struct cxd2880_spi_device *)(spi->user); Is cast needed? > + > + memset(&tx, 0, sizeof(tx)); > + tx.tx_buf = data; > + tx.len = size; > + > + spi_message_init(&msg); > + spi_message_add_tail(&tx, &msg); > + result = spi_sync(spi_device->spi, &msg); > + > + if (result < 0) > + return CXD2880_RESULT_ERROR_IO; > + > + return CXD2880_RESULT_OK; > +} > + > +static enum cxd2880_ret cxd2880_spi_device_write_read(struct cxd2880_spi *spi, > + const u8 *tx_data, > + u32 tx_size, > + u8 *rx_data, > + u32 rx_size) > +{ > + struct cxd2880_spi_device *spi_device = NULL; > + int result = 0; > + > + if ((!spi) || (!spi->user) || (!tx_data) || > + (tx_size == 0) || (!rx_data) || (rx_size == 0)) > + return CXD2880_RESULT_ERROR_ARG; > + > + spi_device = (struct cxd2880_spi_device *)(spi->user); > + > + result = spi_write_then_read(spi_device->spi, tx_data, > + tx_size, rx_data, rx_size); > + if (result < 0) > + return CXD2880_RESULT_ERROR_IO; > + > + return CXD2880_RESULT_OK; > +} > + > +enum cxd2880_ret > +cxd2880_spi_device_initialize(struct cxd2880_spi_device *spi_device, > + enum cxd2880_spi_mode mode, > + u32 speed_hz) > +{ > + int result = 0; > + struct spi_device *spi = spi_device->spi; > + > + switch (mode) { > + case CXD2880_SPI_MODE_0: > + spi->mode = SPI_MODE_0; > + break; > + case CXD2880_SPI_MODE_1: > + spi->mode = SPI_MODE_1; > + break; > + case CXD2880_SPI_MODE_2: > + spi->mode = SPI_MODE_2; > + break; > + case CXD2880_SPI_MODE_3: > + spi->mode = SPI_MODE_3; > + break; > + default: > + return CXD2880_RESULT_ERROR_ARG; > + } > + > + spi->max_speed_hz = speed_hz; > + spi->bits_per_word = 8; > + result = spi_setup(spi); > + if (result != 0) { > + pr_err("spi_setup failed %d\n", result); > + return CXD2880_RESULT_ERROR_ARG; > + } > + > + return CXD2880_RESULT_OK; > +} > + > +enum cxd2880_ret cxd2880_spi_device_create_spi(struct cxd2880_spi *spi, > + struct cxd2880_spi_device *spi_device) > +{ > + if ((!spi) || (!spi_device)) > + return CXD2880_RESULT_ERROR_ARG; > + > + spi->read = NULL; > + spi->write = cxd2880_spi_device_write; > + spi->write_read = cxd2880_spi_device_write_read; > + spi->flags = 0; > + spi->user = spi_device; > + > + return CXD2880_RESULT_OK; > +} > diff --git a/drivers/media/dvb-frontends/cxd2880/cxd2880_spi_device.h b/drivers/media/dvb-frontends/cxd2880/cxd2880_spi_device.h > new file mode 100644 > index 000000000000..343d9161d537 > --- /dev/null > +++ b/drivers/media/dvb-frontends/cxd2880/cxd2880_spi_device.h > @@ -0,0 +1,45 @@ > +/* > + * cxd2880_spi_device.h > + * Sony CXD2880 DVB-T2/T tuner + demodulator driver > + * SPI access interface > + * > + * Copyright (C) 2016, 2017 Sony Semiconductor Solutions Corporation > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License as published by the > + * Free Software Foundation; version 2 of the License. > + * > + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED > + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF > + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN > + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, > + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT > + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF > + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON > + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF > + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + * > + * You should have received a copy of the GNU General Public License along > + * with this program; if not, see <http://www.gnu.org/licenses/>. > + */ > + > +#ifndef CXD2880_SPI_DEVICE_H > +#define CXD2880_SPI_DEVICE_H > + > +#include "cxd2880_spi.h" > + > +struct cxd2880_spi_device { > + struct spi_device *spi; > +}; > + > +enum cxd2880_ret > +cxd2880_spi_device_initialize(struct cxd2880_spi_device *spi_device, > + enum cxd2880_spi_mode mode, > + u32 speedHz); > + > +enum cxd2880_ret > +cxd2880_spi_device_create_spi(struct cxd2880_spi *spi, > + struct cxd2880_spi_device *spi_device); > + > +#endif /* CXD2880_SPI_DEVICE_H */ Thanks, Mauro
