From patchwork Tue Nov 5 14:18:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 3141891 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EF97E9F432 for ; Tue, 5 Nov 2013 14:18:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4DFE42058A for ; Tue, 5 Nov 2013 14:18:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2B8CA20588 for ; Tue, 5 Nov 2013 14:18:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755063Ab3KEOSp (ORCPT ); Tue, 5 Nov 2013 09:18:45 -0500 Received: from mail-ve0-f169.google.com ([209.85.128.169]:44381 "EHLO mail-ve0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754835Ab3KEOSo (ORCPT ); Tue, 5 Nov 2013 09:18:44 -0500 Received: by mail-ve0-f169.google.com with SMTP id c14so2582150vea.0 for ; Tue, 05 Nov 2013 06:18:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=vQM14dPPCv9wZqAhsC0p6T/+zUfKVDz0KgGVLzoBTSc=; b=mzqEMXiPR5a6NypqCDXvHZYzK5BED5H+5Q/9OgjtORZ5AwSxUyFcbPHq3L7b04cnnG vALVIAI6S1hfNFMSpBvGT42TDkq8DOzwzMFJnVx09WWMRFnXtIZkx89PcQ8h5bTH3X4X QpKmwlW+xxL0qnXCgumgX479rsnrjau7WtCRXzahsYMej55+eHNYpUlArb0H+iAuuoWG 6I2nzMN3q9oyTwE8oHduVkwGj6ot+DQKFZtnDX2tKIq2H2h7xIcF1yZtaU7dql73HeEy JkKfx31Q+4d09WfVphmHODBYhAkNhvke6U4ah6x4NEGDAvrxUBFe/vf5drH/j9s3UnKg oURA== MIME-Version: 1.0 X-Received: by 10.220.144.18 with SMTP id x18mr15839039vcu.15.1383661123547; Tue, 05 Nov 2013 06:18:43 -0800 (PST) Received: by 10.58.133.99 with HTTP; Tue, 5 Nov 2013 06:18:43 -0800 (PST) In-Reply-To: References: <1e0bb141e349db9335a7d874cb3d900ec5837c66.1381850640.git.dinesh.ram@cern.ch> Date: Tue, 5 Nov 2013 10:18:43 -0400 Message-ID: Subject: Re: [REVIEW PATCH 6/9] si4713 : Added the USB driver for Si4713 From: "edubezval@gmail.com" To: Dinesh Ram Cc: Linux-Media , Hans Verkuil , d ram Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Dinesh On Tue, Oct 15, 2013 at 11:24 AM, Dinesh Ram wrote: > This is the USB driver for the Silicon Labs development board. > It contains the Si4713 FM transmitter chip. > I tried this driver again. The system attempts to probe the device but it fails because the product revision read out of the USB device is wrong. [ 220.855158] usb 2-1.3.3: new full-speed USB device number 10 using ehci-pci [ 220.949677] usb 2-1.3.3: New USB device found, idVendor=10c4, idProduct=8244 [ 220.949683] usb 2-1.3.3: New USB device strings: Mfr=1, Product=2, SerialNumber=3 [ 220.949688] usb 2-1.3.3: Product: Si47xx Baseboard [ 220.949691] usb 2-1.3.3: Manufacturer: SILICON LABORATORIES INC. [ 220.949695] usb 2-1.3.3: SerialNumber: CBDA8-00-0 [ 220.950157] usbhid 2-1.3.3:1.0: couldn't find an input interrupt endpoint [ 1014.981012] radio-usb-si4713 2-1.3.3:1.0: Si4713 development board discovered: (10C4:8244) [ 1015.870984] si4713 12-0063: IRQ not configured. Using timeouts. [ 1015.943551] si4713 12-0063: Invalid product number <<< Here is the code without modification [ 1015.943556] si4713 12-0063: Failed to probe device information. [ 1015.943568] si4713: probe of 12-0063 failed with error -22 [ 1015.943613] radio-usb-si4713 2-1.3.3:1.0: cannot get v4l2 subdevice [ 1015.943672] usbcore: registered new interface driver radio-usb-si4713 [ 1274.419987] perf samples too long (2504 > 2500), lowering kernel.perf_event_max_sample_rate to 50000 [ 1308.851059] usbcore: deregistering interface driver radio-usb-si4713 [ 1500.478308] radio-usb-si4713 2-1.3.3:1.0: Si4713 development board discovered: (10C4:8244) [ 1500.612240] si4713 12-0063: IRQ not configured. Using timeouts. [ 1500.683489] si4713 12-0063: Invalid product number 0x15 <<< Here it prints the PN read [ 1500.683495] si4713 12-0063: Failed to probe device information. [ 1500.683509] si4713: probe of 12-0063 failed with error -22 [ 1500.683558] radio-usb-si4713 2-1.3.3:1.0: cannot get v4l2 subdevice [ 1500.683624] usbcore: registered new interface driver radio-usb-si4713 Here is simple diff of what I used to print the PN value: It is expected to be 0x0D instead of 0x15, if I am not mistaken. > Signed-off-by: Dinesh Ram > --- > drivers/media/radio/si4713/Kconfig | 15 + > drivers/media/radio/si4713/Makefile | 1 + > drivers/media/radio/si4713/radio-usb-si4713.c | 540 +++++++++++++++++++++++++ > 3 files changed, 556 insertions(+) > create mode 100644 drivers/media/radio/si4713/radio-usb-si4713.c > > diff --git a/drivers/media/radio/si4713/Kconfig b/drivers/media/radio/si4713/Kconfig > index ec640b8..a7c3ba8 100644 > --- a/drivers/media/radio/si4713/Kconfig > +++ b/drivers/media/radio/si4713/Kconfig > @@ -1,3 +1,18 @@ > +config USB_SI4713 > + tristate "Silicon Labs Si4713 FM Radio Transmitter support with USB" > + depends on USB && RADIO_SI4713 > + select SI4713 > + ---help--- > + This is a driver for USB devices with the Silicon Labs SI4713 > + chip. Currently these devices are known to work. > + - 10c4:8244: Silicon Labs FM Transmitter USB device. > + > + Say Y here if you want to connect this type of radio to your > + computer's USB port. > + > + To compile this driver as a module, choose M here: the > + module will be called radio-usb-si4713. > + > config PLATFORM_SI4713 > tristate "Silicon Labs Si4713 FM Radio Transmitter support with I2C" > depends on I2C && RADIO_SI4713 > diff --git a/drivers/media/radio/si4713/Makefile b/drivers/media/radio/si4713/Makefile > index 9d0bd0e..6524674 100644 > --- a/drivers/media/radio/si4713/Makefile > +++ b/drivers/media/radio/si4713/Makefile > @@ -3,5 +3,6 @@ > # > > obj-$(CONFIG_I2C_SI4713) += si4713.o > +obj-$(CONFIG_USB_SI4713) += radio-usb-si4713.o > obj-$(CONFIG_PLATFORM_SI4713) += radio-platform-si4713.o > > diff --git a/drivers/media/radio/si4713/radio-usb-si4713.c b/drivers/media/radio/si4713/radio-usb-si4713.c > new file mode 100644 > index 0000000..a75e2c8 > --- /dev/null > +++ b/drivers/media/radio/si4713/radio-usb-si4713.c > @@ -0,0 +1,540 @@ > +/* > + * Copyright 2013 Cisco Systems, Inc. and/or its affiliates. > + * All rights reserved. > + * > + * This program is free software; you may 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. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF > + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS > + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN > + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN > + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE > + * SOFTWARE. > + */ > + > +/* kernel includes */ > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +/* V4l includes */ > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "si4713.h" > + > +/* driver and module definitions */ > +MODULE_AUTHOR("Dinesh Ram "); > +MODULE_DESCRIPTION("Si4713 FM Transmitter USB driver"); > +MODULE_LICENSE("GPL v2"); > + > +/* The Device announces itself as Cygnal Integrated Products, Inc. */ > +#define USB_SI4713_VENDOR 0x10c4 > +#define USB_SI4713_PRODUCT 0x8244 > + > +#define BUFFER_LENGTH 64 > +#define USB_TIMEOUT 1000 > +#define USB_RESP_TIMEOUT 50000 > + > +/* USB Device ID List */ > +static struct usb_device_id usb_si4713_usb_device_table[] = { > + {USB_DEVICE_AND_INTERFACE_INFO(USB_SI4713_VENDOR, USB_SI4713_PRODUCT, > + USB_CLASS_HID, 0, 0) }, > + { } /* Terminating entry */ > +}; > + > +MODULE_DEVICE_TABLE(usb, usb_si4713_usb_device_table); > + > +struct si4713_usb_device { > + struct usb_device *usbdev; > + struct usb_interface *intf; > + struct video_device vdev; > + struct v4l2_device v4l2_dev; > + struct v4l2_subdev *v4l2_subdev; > + struct mutex lock; > + struct i2c_adapter i2c_adapter; > + > + u8 *buffer; > +}; > + > +static inline struct si4713_usb_device *to_si4713_dev(struct v4l2_device *v4l2_dev) > +{ > + return container_of(v4l2_dev, struct si4713_usb_device, v4l2_dev); > +} > + > +static int vidioc_querycap(struct file *file, void *priv, > + struct v4l2_capability *v) > +{ > + struct si4713_usb_device *radio = video_drvdata(file); > + > + strlcpy(v->driver, "radio-usb-si4713", sizeof(v->driver)); > + strlcpy(v->card, "Si4713 FM Transmitter", sizeof(v->card)); > + usb_make_path(radio->usbdev, v->bus_info, sizeof(v->bus_info)); > + v->device_caps = V4L2_CAP_MODULATOR | V4L2_CAP_RDS_OUTPUT; > + v->capabilities = v->device_caps | V4L2_CAP_DEVICE_CAPS; > + > + return 0; > +} > + > +static int vidioc_g_modulator(struct file *file, void *priv, > + struct v4l2_modulator *vm) > +{ > + struct si4713_usb_device *radio = video_drvdata(file); > + > + return v4l2_subdev_call(radio->v4l2_subdev, tuner, g_modulator, vm); > +} > + > +static int vidioc_s_modulator(struct file *file, void *priv, > + const struct v4l2_modulator *vm) > +{ > + struct si4713_usb_device *radio = video_drvdata(file); > + > + return v4l2_subdev_call(radio->v4l2_subdev, tuner, s_modulator, vm); > +} > + > +static int vidioc_s_frequency(struct file *file, void *priv, > + const struct v4l2_frequency *vf) > +{ > + struct si4713_usb_device *radio = video_drvdata(file); > + > + return v4l2_subdev_call(radio->v4l2_subdev, tuner, s_frequency, vf); > +} > + > +static int vidioc_g_frequency(struct file *file, void *priv, > + struct v4l2_frequency *vf) > +{ > + struct si4713_usb_device *radio = video_drvdata(file); > + > + return v4l2_subdev_call(radio->v4l2_subdev, tuner, g_frequency, vf); > +} > + > +static const struct v4l2_ioctl_ops usb_si4713_ioctl_ops = { > + .vidioc_querycap = vidioc_querycap, > + .vidioc_g_modulator = vidioc_g_modulator, > + .vidioc_s_modulator = vidioc_s_modulator, > + .vidioc_g_frequency = vidioc_g_frequency, > + .vidioc_s_frequency = vidioc_s_frequency, > + .vidioc_log_status = v4l2_ctrl_log_status, > + .vidioc_subscribe_event = v4l2_ctrl_subscribe_event, > + .vidioc_unsubscribe_event = v4l2_event_unsubscribe, > +}; > + > +/* File system interface */ > +static const struct v4l2_file_operations usb_si4713_fops = { > + .owner = THIS_MODULE, > + .open = v4l2_fh_open, > + .release = v4l2_fh_release, > + .poll = v4l2_ctrl_poll, > + .unlocked_ioctl = video_ioctl2, > +}; > + > +static void usb_si4713_video_device_release(struct v4l2_device *v4l2_dev) > +{ > + struct si4713_usb_device *radio = to_si4713_dev(v4l2_dev); > + struct i2c_adapter *adapter = &radio->i2c_adapter; > + > + i2c_del_adapter(adapter); > + v4l2_device_unregister(&radio->v4l2_dev); > + kfree(radio->buffer); > + kfree(radio); > +} > + > +/* > + * This command sequence emulates the behaviour of the Windows driver. > + * The structure of these commands was determined by sniffing the > + * usb traffic of the device during startup. > + * Most likely, these commands make some queries to the device. > + * Commands are sent to enquire parameters like the bus mode, > + * component revision, boot mode, the device serial number etc. > + * > + * These commands are necessary to be sent in this order during startup. > + * The device fails to powerup if these commands are not sent. > + * > + * The complete list of startup commands is given in the start_seq table below. > + */ > +static int si4713_send_startup_command(struct si4713_usb_device *radio) > +{ > + unsigned long until_jiffies = jiffies + usecs_to_jiffies(USB_RESP_TIMEOUT) + 1; > + u8 *buffer = radio->buffer; > + int retval; > + > + /* send the command */ > + retval = usb_control_msg(radio->usbdev, usb_sndctrlpipe(radio->usbdev, 0), > + 0x09, 0x21, 0x033f, 0, radio->buffer, > + BUFFER_LENGTH, USB_TIMEOUT); > + if (retval < 0) > + return retval; > + > + for (;;) { > + /* receive the response */ > + retval = usb_control_msg(radio->usbdev, usb_rcvctrlpipe(radio->usbdev, 0), > + 0x01, 0xa1, 0x033f, 0, radio->buffer, > + BUFFER_LENGTH, USB_TIMEOUT); > + if (retval < 0) > + return retval; > + if (!radio->buffer[1]) { > + /* USB traffic sniffing showed that some commands require > + * additional checks. */ > + switch (buffer[1]) { > + case 0x32: > + if (radio->buffer[2] == 0) > + return 0; > + break; > + case 0x14: > + case 0x12: > + if (radio->buffer[2] & SI4713_CTS) > + return 0; > + break; > + case 0x06: > + if ((radio->buffer[2] & SI4713_CTS) && radio->buffer[9] == 0x08) > + return 0; > + break; > + default: > + return 0; > + } > + } > + if (jiffies > until_jiffies) > + return -EIO; > + msleep(3); > + } > + > + return retval; > +} > + > +struct si4713_start_seq_table { > + int len; > + u8 payload[8]; > +}; > + > +/* > + * Some of the startup commands that could be recognized are : > + * (0x03): Get serial number of the board (Response : CB000-00-00) > + * (0x06, 0x03, 0x03, 0x08, 0x01, 0x0f) : Get Component revision > + */ > +struct si4713_start_seq_table start_seq[] = { > + > + { 1, { 0x03 } }, > + { 2, { 0x32, 0x7f } }, > + { 6, { 0x06, 0x03, 0x03, 0x08, 0x01, 0x0f } }, > + { 2, { 0x14, 0x02 } }, > + { 2, { 0x09, 0x90 } }, > + { 3, { 0x08, 0x90, 0xfa } }, > + { 2, { 0x36, 0x01 } }, > + { 2, { 0x05, 0x03 } }, > + { 7, { 0x06, 0x00, 0x06, 0x0e, 0x01, 0x0f, 0x05 } }, > + { 1, { 0x12 } }, > + /* Commands that are sent after pressing the 'Initialize' > + button in the windows application */ > + { 1, { 0x03 } }, > + { 1, { 0x01 } }, > + { 2, { 0x09, 0x90 } }, > + { 3, { 0x08, 0x90, 0xfa } }, > + { 1, { 0x34 } }, > + { 2, { 0x35, 0x01 } }, > + { 2, { 0x36, 0x01 } }, > + { 2, { 0x30, 0x09 } }, > + { 4, { 0x30, 0x06, 0x00, 0xe2 } }, > + { 3, { 0x31, 0x01, 0x30 } }, > + { 3, { 0x31, 0x04, 0x09 } }, > + { 2, { 0x05, 0x02 } }, > + { 6, { 0x06, 0x03, 0x03, 0x08, 0x01, 0x0f } }, > +}; > + > +static int si4713_start_seq(struct si4713_usb_device *radio) > +{ > + int retval = 0; > + int i; > + > + radio->buffer[0] = 0x3f; > + > + for (i = 0; i < ARRAY_SIZE(start_seq); i++) { > + int len = start_seq[i].len; > + u8 *payload = start_seq[i].payload; > + > + memcpy(radio->buffer + 1, payload, len); > + memset(radio->buffer + len + 1, 0, BUFFER_LENGTH - 1 - len); > + retval = si4713_send_startup_command(radio); > + } > + > + return retval; > +} > + > +static struct i2c_board_info si4713_board_info = { > + I2C_BOARD_INFO("si4713", SI4713_I2C_ADDR_BUSEN_HIGH), > +}; > + > +struct si4713_command_table { > + int command_id; > + u8 payload[8]; > +}; > + > +/* > + * Structure of a command : > + * Byte 1 : 0x3f (always) > + * Byte 2 : 0x06 (send a command) > + * Byte 3 : Unknown > + * Byte 4 : Number of arguments + 1 (for the command byte) > + * Byte 5 : Number of response bytes > + */ > +struct si4713_command_table command_table[] = { > + > + { SI4713_CMD_POWER_UP, { 0x00, SI4713_PWUP_NARGS + 1, SI4713_PWUP_NRESP} }, > + { SI4713_CMD_GET_REV, { 0x03, 0x01, SI4713_GETREV_NRESP } }, > + { SI4713_CMD_POWER_DOWN, { 0x00, 0x01, SI4713_PWDN_NRESP} }, > + { SI4713_CMD_SET_PROPERTY, { 0x00, SI4713_SET_PROP_NARGS + 1, SI4713_SET_PROP_NRESP } }, > + { SI4713_CMD_GET_PROPERTY, { 0x00, SI4713_GET_PROP_NARGS + 1, SI4713_GET_PROP_NRESP } }, > + { SI4713_CMD_TX_TUNE_FREQ, { 0x03, SI4713_TXFREQ_NARGS + 1, SI4713_TXFREQ_NRESP } }, > + { SI4713_CMD_TX_TUNE_POWER, { 0x03, SI4713_TXPWR_NARGS + 1, SI4713_TXPWR_NRESP } }, > + { SI4713_CMD_TX_TUNE_MEASURE, { 0x03, SI4713_TXMEA_NARGS + 1, SI4713_TXMEA_NRESP } }, > + { SI4713_CMD_TX_TUNE_STATUS, { 0x00, SI4713_TXSTATUS_NARGS + 1, SI4713_TXSTATUS_NRESP } }, > + { SI4713_CMD_TX_ASQ_STATUS, { 0x03, SI4713_ASQSTATUS_NARGS + 1, SI4713_ASQSTATUS_NRESP } }, > + { SI4713_CMD_GET_INT_STATUS, { 0x03, 0x01, SI4713_GET_STATUS_NRESP } }, > + { SI4713_CMD_TX_RDS_BUFF, { 0x03, SI4713_RDSBUFF_NARGS + 1, SI4713_RDSBUFF_NRESP } }, > + { SI4713_CMD_TX_RDS_PS, { 0x00, SI4713_RDSPS_NARGS + 1, SI4713_RDSPS_NRESP } }, > +}; > + > +static int send_command(struct si4713_usb_device *radio, u8 *payload, char *data, int len) > +{ > + int retval; > + > + radio->buffer[0] = 0x3f; > + radio->buffer[1] = 0x06; > + > + memcpy(radio->buffer + 2, payload, 3); > + memcpy(radio->buffer + 5, data, len); > + memset(radio->buffer + 5 + len, 0, BUFFER_LENGTH - 5 - len); > + > + /* send the command */ > + retval = usb_control_msg(radio->usbdev, usb_sndctrlpipe(radio->usbdev, 0), > + 0x09, 0x21, 0x033f, 0, radio->buffer, > + BUFFER_LENGTH, USB_TIMEOUT); > + > + return retval < 0 ? retval : 0; > +} > + > +static int si4713_i2c_read(struct si4713_usb_device *radio, char *data, int len) > +{ > + unsigned long until_jiffies = jiffies + usecs_to_jiffies(USB_RESP_TIMEOUT) + 1; > + int retval; > + > + /* receive the response */ > + for (;;) { > + retval = usb_control_msg(radio->usbdev, > + usb_rcvctrlpipe(radio->usbdev, 0), > + 0x01, 0xa1, 0x033f, 0, radio->buffer, > + BUFFER_LENGTH, USB_TIMEOUT); > + if (retval < 0) > + return retval; > + > + /* > + * Check that we get a valid reply back (buffer[1] == 0) and > + * that CTS is set before returning, otherwise we wait and try > + * again. The i2c driver also does the CTS check, but the timeouts > + * used there are much too small for this USB driver, so we wait > + * for it here. > + */ > + if (radio->buffer[1] == 0 && (radio->buffer[2] & SI4713_CTS)) { > + memcpy(data, radio->buffer + 2, len); > + return 0; > + } > + if (jiffies > until_jiffies) { > + /* Zero the status value, ensuring CTS isn't set */ > + data[0] = 0; > + return 0; > + } > + msleep(3); > + } > +} > + > +static int si4713_i2c_write(struct si4713_usb_device *radio, char *data, int len) > +{ > + int retval = -EINVAL; > + int i; > + > + if (len > BUFFER_LENGTH - 5) > + return -EINVAL; > + > + for (i = 0; i < ARRAY_SIZE(command_table); i++) { > + if (data[0] == command_table[i].command_id) > + retval = send_command(radio, command_table[i].payload, > + data, len); > + } > + > + return retval < 0 ? retval : 0; > +} > + > +static int si4713_transfer(struct i2c_adapter *i2c_adapter, > + struct i2c_msg *msgs, int num) > +{ > + struct si4713_usb_device *radio = i2c_get_adapdata(i2c_adapter); > + int retval = -EINVAL; > + int i; > + > + if (num <= 0) > + return 0; > + > + for (i = 0; i < num; i++) { > + if (msgs[i].flags & I2C_M_RD) > + retval = si4713_i2c_read(radio, msgs[i].buf, msgs[i].len); > + else > + retval = si4713_i2c_write(radio, msgs[i].buf, msgs[i].len); > + if (retval) > + break; > + } > + > + return retval ? retval : num; > +} > + > +static u32 si4713_functionality(struct i2c_adapter *adapter) > +{ > + return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; > +} > + > +static struct i2c_algorithm si4713_algo = { > + .master_xfer = si4713_transfer, > + .functionality = si4713_functionality, > +}; > + > +/* This name value shows up in the sysfs filename associated > + with this I2C adapter */ > +static struct i2c_adapter si4713_i2c_adapter_template = { > + .name = "si4713-i2c", > + .owner = THIS_MODULE, > + .algo = &si4713_algo, > +}; > + > +int si4713_register_i2c_adapter(struct si4713_usb_device *radio) > +{ > + radio->i2c_adapter = si4713_i2c_adapter_template; > + /* set up sysfs linkage to our parent device */ > + radio->i2c_adapter.dev.parent = &radio->usbdev->dev; > + i2c_set_adapdata(&radio->i2c_adapter, radio); > + > + return i2c_add_adapter(&radio->i2c_adapter); > +} > + > +/* check if the device is present and register with v4l and usb if it is */ > +static int usb_si4713_probe(struct usb_interface *intf, > + const struct usb_device_id *id) > +{ > + struct si4713_usb_device *radio; > + struct i2c_adapter *adapter; > + struct v4l2_subdev *sd; > + int retval = -ENOMEM; > + > + dev_info(&intf->dev, "Si4713 development board discovered: (%04X:%04X)\n", > + id->idVendor, id->idProduct); > + > + /* Initialize local device structure */ > + radio = kzalloc(sizeof(struct si4713_usb_device), GFP_KERNEL); > + if (radio) > + radio->buffer = kmalloc(BUFFER_LENGTH, GFP_KERNEL); > + > + if (!radio || !radio->buffer) { > + dev_err(&intf->dev, "kmalloc for si4713_usb_device failed\n"); > + kfree(radio); > + return -ENOMEM; > + } > + > + mutex_init(&radio->lock); > + > + radio->usbdev = interface_to_usbdev(intf); > + radio->intf = intf; > + usb_set_intfdata(intf, &radio->v4l2_dev); > + > + retval = si4713_start_seq(radio); > + if (retval < 0) > + goto err_v4l2; > + > + retval = v4l2_device_register(&intf->dev, &radio->v4l2_dev); > + if (retval < 0) { > + dev_err(&intf->dev, "couldn't register v4l2_device\n"); > + goto err_v4l2; > + } > + > + retval = si4713_register_i2c_adapter(radio); > + if (retval < 0) { > + dev_err(&intf->dev, "could not register i2c device\n"); > + goto err_i2cdev; > + } > + > + adapter = &radio->i2c_adapter; > + sd = v4l2_i2c_new_subdev_board(&radio->v4l2_dev, adapter, > + &si4713_board_info, NULL); > + radio->v4l2_subdev = sd; > + if (!sd) { > + dev_err(&intf->dev, "cannot get v4l2 subdevice\n"); > + retval = -ENODEV; > + goto del_adapter; > + } > + > + radio->vdev.ctrl_handler = sd->ctrl_handler; > + radio->v4l2_dev.release = usb_si4713_video_device_release; > + strlcpy(radio->vdev.name, radio->v4l2_dev.name, > + sizeof(radio->vdev.name)); > + radio->vdev.v4l2_dev = &radio->v4l2_dev; > + radio->vdev.fops = &usb_si4713_fops; > + radio->vdev.ioctl_ops = &usb_si4713_ioctl_ops; > + radio->vdev.lock = &radio->lock; > + radio->vdev.release = video_device_release_empty; > + radio->vdev.vfl_dir = VFL_DIR_TX; > + > + video_set_drvdata(&radio->vdev, radio); > + set_bit(V4L2_FL_USE_FH_PRIO, &radio->vdev.flags); > + > + retval = video_register_device(&radio->vdev, VFL_TYPE_RADIO, -1); > + if (retval < 0) { > + dev_err(&intf->dev, "could not register video device\n"); > + goto del_adapter; > + } > + > + dev_info(&intf->dev, "V4L2 device registered as %s\n", > + video_device_node_name(&radio->vdev)); > + > + return 0; > + > +del_adapter: > + i2c_del_adapter(adapter); > +err_i2cdev: > + v4l2_device_unregister(&radio->v4l2_dev); > +err_v4l2: > + kfree(radio->buffer); > + kfree(radio); > + return retval; > +} > + > +static void usb_si4713_disconnect(struct usb_interface *intf) > +{ > + struct si4713_usb_device *radio = to_si4713_dev(usb_get_intfdata(intf)); > + > + dev_info(&intf->dev, "Si4713 development board now disconnected\n"); > + > + mutex_lock(&radio->lock); > + usb_set_intfdata(intf, NULL); > + video_unregister_device(&radio->vdev); > + v4l2_device_disconnect(&radio->v4l2_dev); > + mutex_unlock(&radio->lock); > + v4l2_device_put(&radio->v4l2_dev); > +} > + > +/* USB subsystem interface */ > +static struct usb_driver usb_si4713_driver = { > + .name = "radio-usb-si4713", > + .probe = usb_si4713_probe, > + .disconnect = usb_si4713_disconnect, > + .id_table = usb_si4713_usb_device_table, > +}; > + > +module_usb_driver(usb_si4713_driver); > -- > 1.7.9.5 > Signed-off-by: Eduardo Valentin diff --git a/drivers/media/radio/si4713/si4713.c b/drivers/media/radio/si4713/si4713.c index aadecb5..ee53584 100644 --- a/drivers/media/radio/si4713/si4713.c +++ b/drivers/media/radio/si4713/si4713.c @@ -464,7 +464,7 @@ static int si4713_checkrev(struct si4713_device *sdev) v4l2_info(&sdev->sd, "chip found @ 0x%02x (%s)\n", client->addr << 1, client->adapter->name); } else { - v4l2_err(&sdev->sd, "Invalid product number\n"); + v4l2_err(&sdev->sd, "Invalid product number 0x%X\n", resp[1]); rval = -EINVAL; } return rval;