linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/3] A driver for Si476x series of chips
@ 2012-09-13 22:40 Andrey Smirnov
  2012-09-13 22:40 ` [PATCH 1/3] Add a core driver for SI476x MFD Andrey Smirnov
                   ` (3 more replies)
  0 siblings, 4 replies; 13+ messages in thread
From: Andrey Smirnov @ 2012-09-13 22:40 UTC (permalink / raw)
  To: linux-media; +Cc: linux-kernel

This patchset contains a driver for a Silicon Laboratories 476x series
of radio tuners. The driver itself is implemented as an MFD devices
comprised of three parts:
 1. Core device that provides all the other devices with basic
 functionality and locking scheme.
 2. Radio device that translates between V4L2 subsystem requests into
 Core device commands.
 3. Codec device that does similar to the earlier described task, but
 for ALSA SoC subsystem.

This driver has been tested to work in two different sytems:
 1. A custom Tegra-based ARM board(design is based on Harmony board)
 running linux kernel 3.1.10 kernel
 2. A standalone USB-connected board that has a dedicated Cortex M3
 working as a transparent USB to I2C bridge which was connected to a
 off-the-shelf x86-64 laptop running Ubuntu with 3.2.0 kernel.

As far as SubmitChecklist is concerned following criteria should be
satisfied: 2b, 3, 5, 7, 9, 10

Andrey Smirnov (3):
  Add a core driver for SI476x MFD
  Add a V4L2 driver for SI476X MFD
  Add a codec driver for SI476X MFD

 drivers/media/radio/Kconfig        |   17 +
 drivers/media/radio/radio-si476x.c | 1307 +++++++++++++++++++++++++++++++
 drivers/mfd/Kconfig                |   14 +
 drivers/mfd/Makefile               |    3 +
 drivers/mfd/si476x-cmd.c           | 1509 ++++++++++++++++++++++++++++++++++++
 drivers/mfd/si476x-i2c.c           | 1033 ++++++++++++++++++++++++
 drivers/mfd/si476x-prop.c          |  477 ++++++++++++
 include/linux/mfd/si476x-core.h    |  532 +++++++++++++
 include/media/si476x.h             |  461 +++++++++++
 sound/soc/codecs/Kconfig           |    4 +
 sound/soc/codecs/Makefile          |    2 +
 sound/soc/codecs/si476x.c          |  346 +++++++++
 12 files changed, 5705 insertions(+)
 create mode 100644 drivers/media/radio/radio-si476x.c
 create mode 100644 drivers/mfd/si476x-cmd.c
 create mode 100644 drivers/mfd/si476x-i2c.c
 create mode 100644 drivers/mfd/si476x-prop.c
 create mode 100644 include/linux/mfd/si476x-core.h
 create mode 100644 include/media/si476x.h
 create mode 100644 sound/soc/codecs/si476x.c

-- 
1.7.9.5


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH 1/3] Add a core driver for SI476x MFD
  2012-09-13 22:40 [PATCH 0/3] A driver for Si476x series of chips Andrey Smirnov
@ 2012-09-13 22:40 ` Andrey Smirnov
  2012-09-14  6:44   ` Hans Verkuil
  2012-10-01 17:20   ` Mark Brown
  2012-09-13 22:40 ` [PATCH 2/3] Add a V4L2 driver for SI476X MFD Andrey Smirnov
                   ` (2 subsequent siblings)
  3 siblings, 2 replies; 13+ messages in thread
From: Andrey Smirnov @ 2012-09-13 22:40 UTC (permalink / raw)
  To: linux-media; +Cc: linux-kernel

This patch adds a core driver for Silicon Laboratories Si476x series
of AM/FM tuner chips. The driver as a whole is implemented as an MFD device
and this patch adds a core portion of it that provides all the necessary
functionality to the two other drivers that represent radio and audio
codec subsystems of the chip.

Signed-off-by: Andrey Smirnov <andrey.smirnov@convergeddevices.net>
---
 drivers/mfd/Kconfig             |   14 +
 drivers/mfd/Makefile            |    3 +
 drivers/mfd/si476x-cmd.c        | 1509 +++++++++++++++++++++++++++++++++++++++
 drivers/mfd/si476x-i2c.c        | 1033 +++++++++++++++++++++++++++
 drivers/mfd/si476x-prop.c       |  477 +++++++++++++
 include/linux/mfd/si476x-core.h |  522 ++++++++++++++
 include/media/si476x.h          |  455 ++++++++++++
 7 files changed, 4013 insertions(+)
 create mode 100644 drivers/mfd/si476x-cmd.c
 create mode 100644 drivers/mfd/si476x-i2c.c
 create mode 100644 drivers/mfd/si476x-prop.c
 create mode 100644 include/linux/mfd/si476x-core.h
 create mode 100644 include/media/si476x.h

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index b1a1462..3fab06d 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -895,6 +895,20 @@ config MFD_WL1273_CORE
 	  driver connects the radio-wl1273 V4L2 module and the wl1273
 	  audio codec.
 
+config MFD_SI476X_CORE
+	tristate "Support for Silicon Laboratories 4761/64/68 AM/FM radio."
+	depends on I2C
+	select MFD_CORE
+	default n
+	help
+	  This is the core driver for the SI476x series of AM/FM radio. This MFD
+	  driver connects the radio-si476x V4L2 module and the si476x
+	  audio codec.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called si476x-core.
+
+
 config MFD_OMAP_USB_HOST
 	bool "Support OMAP USBHS core driver"
 	depends on USB_EHCI_HCD_OMAP || USB_OHCI_HCD_OMAP3
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 79dd22d..942257b 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -132,3 +132,6 @@ obj-$(CONFIG_MFD_RC5T583)	+= rc5t583.o rc5t583-irq.o
 obj-$(CONFIG_MFD_SEC_CORE)	+= sec-core.o sec-irq.o
 obj-$(CONFIG_MFD_ANATOP)	+= anatop-mfd.o
 obj-$(CONFIG_MFD_LM3533)	+= lm3533-core.o lm3533-ctrlbank.o
+
+si476x-core-objs := si476x-cmd.o si476x-prop.o si476x-i2c.o
+obj-$(CONFIG_MFD_SI476X_CORE)	+= si476x-core.o
diff --git a/drivers/mfd/si476x-cmd.c b/drivers/mfd/si476x-cmd.c
new file mode 100644
index 0000000..defe1f5
--- /dev/null
+++ b/drivers/mfd/si476x-cmd.c
@@ -0,0 +1,1509 @@
+/*
+ * include/media/si476x-cmd.c -- Subroutines implementing command
+ * protocol of si476x series of chips
+ *
+ * Copyright (C) 2012 Innovative Converged Devices(ICD)
+ *
+ * Author: Andrey Smirnov <andrey.smirnov@convergeddevices.net>
+ *
+ * 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 program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ */
+#include <linux/module.h>
+#include <linux/completion.h>
+#include <linux/delay.h>
+#include <linux/atomic.h>
+#include <linux/i2c.h>
+#include <linux/device.h>
+#include <linux/gpio.h>
+#include <linux/videodev2.h>
+
+#include <media/si476x.h>
+#include <linux/mfd/si476x-core.h>
+
+#define msb(x)                  ((u8)((u16) x >> 8))
+#define lsb(x)                  ((u8)((u16) x &  0x00FF))
+
+
+
+#define CMD_POWER_UP				0x01
+#define CMD_POWER_UP_A10_NRESP			1
+#define CMD_POWER_UP_A10_NARGS			5
+
+#define CMD_POWER_UP_A20_NRESP			1
+#define CMD_POWER_UP_A20_NARGS			5
+
+#define POWER_UP_DELAY_MS			110
+
+#define CMD_POWER_DOWN				0x11
+#define CMD_POWER_DOWN_A10_NRESP		1
+
+#define CMD_POWER_DOWN_A20_NRESP		1
+#define CMD_POWER_DOWN_A20_NARGS		1
+
+#define CMD_FUNC_INFO				0x12
+#define CMD_FUNC_INFO_NRESP			7
+
+#define CMD_SET_PROPERTY			0x13
+#define CMD_SET_PROPERTY_NARGS			5
+#define CMD_SET_PROPERTY_NRESP			1
+
+#define CMD_GET_PROPERTY			0x14
+#define CMD_GET_PROPERTY_NARGS			3
+#define CMD_GET_PROPERTY_NRESP			4
+
+#define CMD_AGC_STATUS				0x17
+#define CMD_AGC_STATUS_NRESP_A10		2
+#define CMD_AGC_STATUS_NRESP_A20                6
+
+#define PIN_CFG_BYTE(x) (0x7F & (x))
+#define CMD_DIG_AUDIO_PIN_CFG			0x18
+#define CMD_DIG_AUDIO_PIN_CFG_NARGS		4
+#define CMD_DIG_AUDIO_PIN_CFG_NRESP		5
+
+#define CMD_ZIF_PIN_CFG				0x19
+#define CMD_ZIF_PIN_CFG_NARGS			4
+#define CMD_ZIF_PIN_CFG_NRESP			5
+
+#define CMD_IC_LINK_GPO_CTL_PIN_CFG		0x1A
+#define CMD_IC_LINK_GPO_CTL_PIN_CFG_NARGS	4
+#define CMD_IC_LINK_GPO_CTL_PIN_CFG_NRESP	5
+
+#define CMD_ANA_AUDIO_PIN_CFG			0x1B
+#define CMD_ANA_AUDIO_PIN_CFG_NARGS		1
+#define CMD_ANA_AUDIO_PIN_CFG_NRESP		2
+
+#define CMD_INTB_PIN_CFG			0x1C
+#define CMD_INTB_PIN_CFG_NARGS			2
+#define CMD_INTB_PIN_CFG_A10_NRESP		6
+#define CMD_INTB_PIN_CFG_A20_NRESP		3
+
+#define CMD_FM_TUNE_FREQ			0x30
+#define CMD_FM_TUNE_FREQ_A10_NARGS		5
+#define CMD_FM_TUNE_FREQ_A20_NARGS		3
+#define CMD_FM_TUNE_FREQ_NRESP			1
+
+#define CMD_FM_RSQ_STATUS			0x32
+
+#define CMD_FM_RSQ_STATUS_A10_NARGS		1
+#define CMD_FM_RSQ_STATUS_A10_NRESP		17
+#define CMD_FM_RSQ_STATUS_A30_NARGS		1
+#define CMD_FM_RSQ_STATUS_A30_NRESP		23
+
+
+#define CMD_FM_SEEK_START			0x31
+#define CMD_FM_SEEK_START_NARGS			1
+#define CMD_FM_SEEK_START_NRESP			1
+
+#define CMD_FM_RDS_STATUS			0x36
+#define CMD_FM_RDS_STATUS_NARGS			1
+#define CMD_FM_RDS_STATUS_NRESP			16
+
+#define CMD_FM_RDS_BLOCKCOUNT			0x37
+#define CMD_FM_RDS_BLOCKCOUNT_NARGS		1
+#define CMD_FM_RDS_BLOCKCOUNT_NRESP		8
+
+#define CMD_FM_PHASE_DIVERSITY			0x38
+#define CMD_FM_PHASE_DIVERSITY_NARGS		1
+#define CMD_FM_PHASE_DIVERSITY_NRESP		1
+
+#define CMD_FM_PHASE_DIV_STATUS			0x39
+#define CMD_FM_PHASE_DIV_STATUS_NRESP		2
+
+#define CMD_AM_TUNE_FREQ			0x40
+#define CMD_AM_TUNE_FREQ_NARGS			3
+#define CMD_AM_TUNE_FREQ_NRESP			1
+
+#define CMD_AM_RSQ_STATUS			0x42
+#define CMD_AM_RSQ_STATUS_NARGS			1
+#define CMD_AM_RSQ_STATUS_NRESP			13
+
+#define CMD_AM_SEEK_START			0x41
+#define CMD_AM_SEEK_START_NARGS			1
+#define CMD_AM_SEEK_START_NRESP			1
+
+
+#define CMD_AM_ACF_STATUS			0x45
+#define CMD_AM_ACF_STATUS_NRESP			6
+#define CMD_AM_ACF_STATUS_NARGS			1
+
+#define CMD_FM_ACF_STATUS			0x35
+#define CMD_FM_ACF_STATUS_NRESP			8
+#define CMD_FM_ACF_STATUS_NARGS			1
+
+#define CMD_MAX_ARGS_COUNT			(10)
+
+
+enum si476x_acf_status_report_bits {
+	SI476X_ACF_BLEND_INT	= (1 << 4),
+	SI476X_ACF_HIBLEND_INT	= (1 << 3),
+	SI476X_ACF_HICUT_INT	= (1 << 2),
+	SI476X_ACF_CHBW_INT	= (1 << 1),
+	SI476X_ACF_SOFTMUTE_INT	= (1 << 0),
+
+	SI476X_ACF_SMUTE	= (1 << 0),
+	SI476X_ACF_SMATTN	= 0b11111,
+	SI476X_ACF_PILOT	= (1 << 7),
+	SI476X_ACF_STBLEND	= ~SI476X_ACF_PILOT,
+};
+
+enum si476x_agc_status_report_bits {
+	SI476X_AGC_MXHI		= (1 << 5),
+	SI476X_AGC_MXLO		= (1 << 4),
+	SI476X_AGC_LNAHI	= (1 << 3),
+	SI476X_AGC_LNALO	= (1 << 2),
+};
+
+enum si476x_errors {
+	SI476X_ERR_BAD_COMMAND		= 0x10,
+	SI476X_ERR_BAD_ARG1		= 0x11,
+	SI476X_ERR_BAD_ARG2		= 0x12,
+	SI476X_ERR_BAD_ARG3		= 0x13,
+	SI476X_ERR_BAD_ARG4		= 0x14,
+	SI476X_ERR_BUSY			= 0x18,
+	SI476X_ERR_BAD_INTERNAL_MEMORY  = 0x20,
+	SI476X_ERR_BAD_PATCH		= 0x30,
+	SI476X_ERR_BAD_BOOT_MODE	= 0x31,
+	SI476X_ERR_BAD_PROPERTY		= 0x40,
+};
+
+
+static int si476x_core_parse_and_nag_about_error(struct si476x_core *core)
+{
+	int err;
+	char *cause;
+	u8 buffer[2];
+
+	if (core->revision != SI476X_REVISION_A10) {
+		err = si476x_i2c_xfer(core, SI476X_I2C_RECV,
+				      buffer, sizeof(buffer));
+		if (err == sizeof(buffer)) {
+			switch (buffer[1]) {
+			case SI476X_ERR_BAD_COMMAND:
+				cause = "Bad command";
+				err = -EINVAL;
+				break;
+			case SI476X_ERR_BAD_ARG1:
+				cause = "Bad argument #1";
+				err = -EINVAL;
+				break;
+			case SI476X_ERR_BAD_ARG2:
+				cause = "Bad argument #2";
+				err = -EINVAL;
+				break;
+			case SI476X_ERR_BAD_ARG3:
+				cause = "Bad argument #3";
+				err = -EINVAL;
+				break;
+			case SI476X_ERR_BAD_ARG4:
+				cause = "Bad argument #4";
+				err = -EINVAL;
+				break;
+			case SI476X_ERR_BUSY:
+				cause = "Chip is busy";
+				err = -EBUSY;
+				break;
+			case SI476X_ERR_BAD_INTERNAL_MEMORY:
+				cause = "Bad internal memory";
+				err = -EIO;
+				break;
+			case SI476X_ERR_BAD_PATCH:
+				cause = "Bad patch";
+				err = -EINVAL;
+				break;
+			case SI476X_ERR_BAD_BOOT_MODE:
+				cause = "Bad boot mode";
+				err = -EINVAL;
+				break;
+			case SI476X_ERR_BAD_PROPERTY:
+				cause = "Bad property";
+				err = -EINVAL;
+				break;
+			default:
+				cause = "Unknown";
+				err = -EIO;
+			}
+
+			dev_err(&core->client->dev,
+				"[Chip error status]: %s\n", cause);
+		} else {
+			dev_err(&core->client->dev,
+				"Failed to fetch error code\n");
+			err = (err >= 0) ? -EIO : err;
+		}
+	} else {
+		err = -EIO;
+	}
+
+	return err;
+}
+
+/**
+ * __core_send_command() - sends a command to si476x and waits its
+ * response
+ * @core:    si476x_device structure for the device we are
+ *            communicating with
+ * @command:  command id
+ * @args:     command arguments we are sending
+ * @argn:     actual size of @args
+ * @response: buffer to place the expected response from the device
+ * @respn:    actual size of @response
+ * @usecs:    amount of time to wait before reading the response (in
+ *            usecs)
+ *
+ * Function returns 0 on succsess and negative error code on
+ * failure
+ */
+static int __core_send_command(struct si476x_core *core,
+				    const u8 command,
+				    const u8 args[],
+				    const int argn,
+				    u8 resp[],
+				    const int respn,
+				    const int usecs)
+{
+	struct i2c_client *client = core->client;
+	int err;
+	u8  data[CMD_MAX_ARGS_COUNT + 1];
+
+	if (argn > CMD_MAX_ARGS_COUNT) {
+		err = -ENOMEM;
+		goto exit;
+	}
+
+	if (!client->adapter) {
+		err = -ENODEV;
+		goto exit;
+	}
+
+	/* First send the command and its arguments */
+	data[0] = command;
+	memcpy(&data[1], args, argn);
+	DBG_BUFFER(&client->dev, "Command:\n", data, argn + 1);
+
+	err = si476x_i2c_xfer(core, SI476X_I2C_SEND, (char *) data, argn + 1);
+	if (err != argn + 1) {
+		dev_err(&core->client->dev,
+			"Error while sending command 0x%02x\n",
+			command);
+		err = (err >= 0) ? -EIO : err;
+		goto exit;
+	}
+	/* Set CTS to zero only after the command is send to avoid
+	 * possible racing conditions when working in polling mode */
+	atomic_set(&core->cts, 0);
+
+	if (!wait_event_timeout(core->command,
+				atomic_read(&core->cts),
+				usecs_to_jiffies(usecs) + 1))
+		dev_warn(&core->client->dev,
+			 "(%s) [CMD 0x%02x] Device took too much time to answer.\n",
+			 __func__, command);
+
+	/*
+	  When working in polling mode, for some reason the tuner will
+	  report CTS bit as being set in the first status byte read,
+	  but all the consequtive ones will return zros until the
+	  tuner is actually completed the POWER_UP command. To
+	  workaround that we wait for second CTS to be reported
+	 */
+	if (unlikely(!core->client->irq && command == CMD_POWER_UP)) {
+		if (!wait_event_timeout(core->command,
+					atomic_read(&core->cts),
+					usecs_to_jiffies(usecs) + 1))
+			dev_warn(&core->client->dev,
+				 "(%s) Power up took too much time.\n",
+				 __func__);
+	}
+
+	/* Then get the response */
+	err = si476x_i2c_xfer(core, SI476X_I2C_RECV, resp, respn);
+	if (err != respn) {
+		dev_err(&core->client->dev,
+			"Error while reading response for command 0x%02x\n",
+			command);
+		err = (err >= 0) ? -EIO : err;
+		goto exit;
+	}
+	DBG_BUFFER(&client->dev, "Response:\n", resp, respn);
+
+	err = 0;
+
+	if (resp[0] & SI476X_ERR) {
+		dev_err(&core->client->dev, "Chip set error flag\n");
+		err = si476x_core_parse_and_nag_about_error(core);
+		goto exit;
+	}
+
+	if (!(resp[0] & SI476X_CTS))
+		err = -EBUSY;
+exit:
+	return err;
+}
+
+#define CORE_SEND_COMMAND(core, cmd, args, resp, timeout)		\
+	__core_send_command(core, cmd, args,				\
+			    ARRAY_SIZE(args),				\
+			    resp, ARRAY_SIZE(resp),			\
+			    timeout)
+
+
+static int __cmd_tune_seek_freq(struct si476x_core *core,
+				uint8_t cmd,
+				const uint8_t args[], size_t argn,
+				uint8_t *resp, size_t respn,
+				int (*clear_stcint) (struct si476x_core *core))
+{
+	int err;
+
+	atomic_set(&core->stc, 0);
+	err = __core_send_command(core, cmd, args, argn,
+				  resp, respn,
+				  atomic_read(&core->timeouts.command));
+	if (!err) {
+		if (!wait_event_timeout(core->tuning,
+		atomic_read(&core->stc),
+		usecs_to_jiffies(atomic_read(&core->timeouts.tune)) + 1)) {
+			dev_warn(&core->client->dev,
+				 "%s: Device took too much time "
+				 "to answer (%d usec).\n",
+				 __func__,
+				 atomic_read(&core->timeouts.tune));
+			err = -ETIMEDOUT;
+		} else {
+			err = clear_stcint(core);
+		}
+	}
+
+	return err;
+}
+
+
+/**
+ * si476x_cmd_func_info() - send 'FUNC_INFO' command to the device
+ * @core: device to send the command to
+ * @info:  struct si476x_func_info to fill all the information
+ *         returned by the command
+ *
+ * The command requests the firmware and patch version for currently
+ * loaded firmware (dependent on the function of the device FM/AM/WB)
+ *
+ * Function returns 0 on succsess and negative error code on
+ * failure
+ */
+int si476x_core_cmd_func_info(struct si476x_core *core,
+			      struct si476x_func_info *info)
+{
+	int err;
+	u8  resp[CMD_FUNC_INFO_NRESP];
+
+	err = __core_send_command(core, CMD_FUNC_INFO,
+				  NULL, 0,
+				  resp, ARRAY_SIZE(resp),
+				  atomic_read(&core->timeouts.command));
+
+	info->firmware.major    = resp[1];
+	info->firmware.minor[0] = resp[2];
+	info->firmware.minor[1] = resp[3];
+
+	info->patch_id = ((u16) resp[4] << 8) | resp[5];
+	info->func     = resp[6];
+
+	return err;
+}
+EXPORT_SYMBOL_GPL(si476x_core_cmd_func_info);
+
+/**
+ * si476x_cmd_set_property() - send 'SET_PROPERTY' command to the device
+ * @core:    device to send the command to
+ * @property: property address
+ * @value:    property value
+ *
+ * Function returns 0 on succsess and negative error code on
+ * failure
+ */
+int si476x_core_cmd_set_property(struct si476x_core *core,
+				 u16 property, u16 value)
+{
+	u8       resp[CMD_SET_PROPERTY_NRESP];
+	const u8 args[CMD_SET_PROPERTY_NARGS] = {
+		0x00,
+		msb(property),
+		lsb(property),
+		msb(value),
+		lsb(value),
+	};
+
+	return CORE_SEND_COMMAND(core, CMD_SET_PROPERTY,
+				 args, resp,
+				 atomic_read(&core->timeouts.command));
+}
+EXPORT_SYMBOL_GPL(si476x_core_cmd_set_property);
+
+/**
+ * si476x_cmd_get_property() - send 'GET_PROPERTY' command to the device
+ * @core:    device to send the command to
+ * @property: property address
+ *
+ * Function return the value of property as u16 on success or a
+ * negative error on failure
+ */
+int si476x_core_cmd_get_property(struct si476x_core *core, u16 property)
+{
+	int err;
+	u8       resp[CMD_GET_PROPERTY_NRESP];
+	const u8 args[CMD_GET_PROPERTY_NARGS] = {
+		0x00,
+		msb(property),
+		lsb(property),
+	};
+
+	err = CORE_SEND_COMMAND(core, CMD_GET_PROPERTY,
+				args, resp,
+				atomic_read(&core->timeouts.command));
+	if (err < 0)
+		return err;
+	else
+		return be16_to_cpup((__be16 *)(resp + 2));
+}
+EXPORT_SYMBOL_GPL(si476x_core_cmd_get_property);
+
+/**
+ * si476x_cmd_dig_audio_pin_cfg() - send 'DIG_AUDIO_PIN_CFG' command to
+ * the device
+ * @core: device to send the command to
+ * @dclk:  DCLK pin function configuration:
+ *	   #SI476X_DCLK_NOOP     - do not modify the behaviour
+ *         #SI476X_DCLK_TRISTATE - put the pin in tristate condition,
+ *                                 enable 1MOhm pulldown
+ *         #SI476X_DCLK_DAUDIO   - set the pin to be a part of digital
+ *                                 audio interface
+ * @dfs:   DFS pin function configuration:
+ *         #SI476X_DFS_NOOP      - do not modify the behaviour
+ *         #SI476X_DFS_TRISTATE  - put the pin in tristate condition,
+ *                             enable 1MOhm pulldown
+ *      SI476X_DFS_DAUDIO    - set the pin to be a part of digital
+ *                             audio interface
+ * @dout - DOUT pin function configuration:
+ *      SI476X_DOUT_NOOP       - do not modify the behaviour
+ *      SI476X_DOUT_TRISTATE   - put the pin in tristate condition,
+ *                               enable 1MOhm pulldown
+ *      SI476X_DOUT_I2S_OUTPUT - set this pin to be digital out on I2S
+ *                               port 1
+ *      SI476X_DOUT_I2S_INPUT  - set this pin to be digital in on I2S
+ *                               port 1
+ * @xout - XOUT pin function configuration:
+ *	SI476X_XOUT_NOOP        - do not modify the behaviour
+ *      SI476X_XOUT_TRISTATE    - put the pin in tristate condition,
+ *                                enable 1MOhm pulldown
+ *      SI476X_XOUT_I2S_INPUT   - set this pin to be digital in on I2S
+ *                                port 1
+ *      SI476X_XOUT_MODE_SELECT - set this pin to be the input that
+ *                                selects the mode of the I2S audio
+ *                                combiner (analog or HD)
+ *                                [SI4761/63/65/67 Only]
+ *
+ * Function returns 0 on success and negative error code on failure
+ */
+int si476x_core_cmd_dig_audio_pin_cfg(struct  si476x_core *core,
+				      enum si476x_dclk_config dclk,
+				      enum si476x_dfs_config  dfs,
+				      enum si476x_dout_config dout,
+				      enum si476x_xout_config xout)
+{
+	u8       resp[CMD_DIG_AUDIO_PIN_CFG_NRESP];
+	const u8 args[CMD_DIG_AUDIO_PIN_CFG_NARGS] = {
+		PIN_CFG_BYTE(dclk),
+		PIN_CFG_BYTE(dfs),
+		PIN_CFG_BYTE(dout),
+		PIN_CFG_BYTE(xout),
+	};
+
+	return CORE_SEND_COMMAND(core, CMD_DIG_AUDIO_PIN_CFG,
+				 args, resp,
+				 atomic_read(&core->timeouts.command));
+}
+EXPORT_SYMBOL_GPL(si476x_core_cmd_dig_audio_pin_cfg);
+
+/**
+ * si476x_cmd_zif_pin_cfg - send 'ZIF_PIN_CFG_COMMAND'
+ * @core - device to send the command to
+ * @iqclk - IQCL pin function configuration:
+ *       SI476X_IQCLK_NOOP     - do not modify the behaviour
+ *       SI476X_IQCLK_TRISTATE - put the pin in tristate condition,
+ *                               enable 1MOhm pulldown
+ *       SI476X_IQCLK_IQ       - set pin to be a part of I/Q interace
+ *                               in master mode
+ * @iqfs - IQFS pin function configuration:
+ *       SI476X_IQFS_NOOP     - do not modify the behaviour
+ *       SI476X_IQFS_TRISTATE - put the pin in tristate condition,
+ *                              enable 1MOhm pulldown
+ *       SI476X_IQFS_IQ       - set pin to be a part of I/Q interace
+ *                              in master mode
+ * @iout - IOUT pin function configuration:
+ *       SI476X_IOUT_NOOP     - do not modify the behaviour
+ *       SI476X_IOUT_TRISTATE - put the pin in tristate condition,
+ *                              enable 1MOhm pulldown
+ *       SI476X_IOUT_OUTPUT   - set pin to be I out
+ * @qout - QOUT pin function configuration:
+ *       SI476X_QOUT_NOOP     - do not modify the behaviour
+ *       SI476X_QOUT_TRISTATE - put the pin in tristate condition,
+ *                              enable 1MOhm pulldown
+ *       SI476X_QOUT_OUTPUT   - set pin to be Q out
+ *
+ * Function returns 0 on success and negative error code on failure
+ */
+int si476x_core_cmd_zif_pin_cfg(struct si476x_core *core,
+				enum si476x_iqclk_config iqclk,
+				enum si476x_iqfs_config iqfs,
+				enum si476x_iout_config iout,
+				enum si476x_qout_config qout)
+{
+	u8       resp[CMD_ZIF_PIN_CFG_NRESP];
+	const u8 args[CMD_ZIF_PIN_CFG_NARGS] = {
+		PIN_CFG_BYTE(iqclk),
+		PIN_CFG_BYTE(iqfs),
+		PIN_CFG_BYTE(iout),
+		PIN_CFG_BYTE(qout),
+	};
+
+	return CORE_SEND_COMMAND(core, CMD_ZIF_PIN_CFG,
+				 args, resp,
+				 atomic_read(&core->timeouts.command));
+}
+EXPORT_SYMBOL_GPL(si476x_core_cmd_zif_pin_cfg);
+
+/**
+ * si476x_cmd_ic_link_gpo_ctl_pin_cfg - send
+ * 'IC_LINK_GPIO_CTL_PIN_CFG' comand to the device
+ * @core - device to send the command to
+ * @icin - ICIN pin function configuration:
+ *      SI476X_ICIN_NOOP      - do not modify the behaviour
+ *      SI476X_ICIN_TRISTATE  - put the pin in tristate condition,
+ *                              enable 1MOhm pulldown
+ *      SI476X_ICIN_GPO1_HIGH - set pin to be an output, drive it high
+ *      SI476X_ICIN_GPO1_LOW  - set pin to be an output, drive it low
+ *      SI476X_ICIN_IC_LINK   - set the pin to be a part of Inter-Chip link
+ * @icip - ICIP pin function configuration:
+ *      SI476X_ICIP_NOOP      - do not modify the behaviour
+ *      SI476X_ICIP_TRISTATE  - put the pin in tristate condition,
+ *                              enable 1MOhm pulldown
+ *      SI476X_ICIP_GPO1_HIGH - set pin to be an output, drive it high
+ *      SI476X_ICIP_GPO1_LOW  - set pin to be an output, drive it low
+ *      SI476X_ICIP_IC_LINK   - set the pin to be a part of Inter-Chip link
+ * @icon - ICON pin function configuration:
+ *      SI476X_ICON_NOOP     - do not modify the behaviour
+ *      SI476X_ICON_TRISTATE - put the pin in tristate condition,
+ *                             enable 1MOhm pulldown
+ *      SI476X_ICON_I2S      - set the pin to be a part of audio
+ *                             interface in slave mode (DCLK)
+ *      SI476X_ICON_IC_LINK  - set the pin to be a part of Inter-Chip link
+ * @icop - ICOP pin function configuration:
+ *      SI476X_ICOP_NOOP     - do not modify the behaviour
+ *      SI476X_ICOP_TRISTATE - put the pin in tristate condition,
+ *                             enable 1MOhm pulldown
+ *      SI476X_ICOP_I2S      - set the pin to be a part of audio
+ *                             interface in slave mode (DOUT)
+ *                             [Si4761/63/65/67 Only]
+ *      SI476X_ICOP_IC_LINK  - set the pin to be a part of Inter-Chip link
+ *
+ * Function returns 0 on success and negative error code on failure
+ */
+int si476x_core_cmd_ic_link_gpo_ctl_pin_cfg(struct si476x_core *core,
+					    enum si476x_icin_config icin,
+					    enum si476x_icip_config icip,
+					    enum si476x_icon_config icon,
+					    enum si476x_icop_config icop)
+{
+	u8       resp[CMD_IC_LINK_GPO_CTL_PIN_CFG_NRESP];
+	const u8 args[CMD_IC_LINK_GPO_CTL_PIN_CFG_NARGS] = {
+		PIN_CFG_BYTE(icin),
+		PIN_CFG_BYTE(icip),
+		PIN_CFG_BYTE(icon),
+		PIN_CFG_BYTE(icop),
+	};
+
+	return CORE_SEND_COMMAND(core, CMD_IC_LINK_GPO_CTL_PIN_CFG,
+				 args, resp,
+				 atomic_read(&core->timeouts.command));
+}
+EXPORT_SYMBOL_GPL(si476x_core_cmd_ic_link_gpo_ctl_pin_cfg);
+
+/**
+ * si476x_cmd_ana_audio_pin_cfg - send 'ANA_AUDIO_PIN_CFG' to the
+ * device
+ * @core - device to send the command to
+ * @lrout - LROUT pin function configuration:
+ *       SI476X_LROUT_NOOP     - do not modify the behaviour
+ *       SI476X_LROUT_TRISTATE - put the pin in tristate condition,
+ *                               enable 1MOhm pulldown
+ *       SI476X_LROUT_AUDIO    - set pin to be audio output
+ *       SI476X_LROUT_MPX      - set pin to be MPX output
+ *
+ * Function returns 0 on success and negative error code on failure
+ */
+int si476x_core_cmd_ana_audio_pin_cfg(struct si476x_core *core,
+				      enum si476x_lrout_config lrout)
+{
+	u8       resp[CMD_ANA_AUDIO_PIN_CFG_NRESP];
+	const u8 args[CMD_ANA_AUDIO_PIN_CFG_NARGS] = {
+		PIN_CFG_BYTE(lrout),
+	};
+
+	return CORE_SEND_COMMAND(core, CMD_ANA_AUDIO_PIN_CFG,
+				 args, resp,
+				 atomic_read(&core->timeouts.command));
+}
+EXPORT_SYMBOL_GPL(si476x_core_cmd_ana_audio_pin_cfg);
+
+
+/**
+ * si476x_cmd_intb_pin_cfg - send 'INTB_PIN_CFG' command to the device
+ * @core - device to send the command to
+ * @intb - INTB pin function configuration:
+ *      SI476X_INTB_NOOP     - do not modify the behaviour
+ *      SI476X_INTB_TRISTATE - put the pin in tristate condition,
+ *                             enable 1MOhm pulldown
+ *      SI476X_INTB_DAUDIO   - set pin to be a part of digital
+ *                             audio interface in slave mode
+ *      SI476X_INTB_IRQ      - set pin to be an interrupt request line
+ * @a1 - A1 pin function configuration:
+ *      SI476X_A1_NOOP     - do not modify the behaviour
+ *      SI476X_A1_TRISTATE - put the pin in tristate condition,
+ *                           enable 1MOhm pulldown
+ *      SI476X_A1_IRQ      - set pin to be an interrupt request line
+ *
+ * Function returns 0 on success and negative error code on failure
+ */
+static int si476x_core_cmd_intb_pin_cfg_a10(struct si476x_core *core,
+					    enum si476x_intb_config intb,
+					    enum si476x_a1_config a1)
+{
+	u8       resp[CMD_INTB_PIN_CFG_A10_NRESP];
+	const u8 args[CMD_INTB_PIN_CFG_NARGS] = {
+		PIN_CFG_BYTE(intb),
+		PIN_CFG_BYTE(a1),
+	};
+
+	return CORE_SEND_COMMAND(core, CMD_INTB_PIN_CFG,
+				 args, resp,
+				 atomic_read(&core->timeouts.command));
+}
+
+static int si476x_core_cmd_intb_pin_cfg_a20(struct si476x_core *core,
+					    enum si476x_intb_config intb,
+					    enum si476x_a1_config a1)
+{
+	u8       resp[CMD_INTB_PIN_CFG_A20_NRESP];
+	const u8 args[CMD_INTB_PIN_CFG_NARGS] = {
+		PIN_CFG_BYTE(intb),
+		PIN_CFG_BYTE(a1),
+	};
+
+	return CORE_SEND_COMMAND(core, CMD_INTB_PIN_CFG,
+				 args, resp,
+				 atomic_read(&core->timeouts.command));
+}
+
+
+
+/**
+ * si476x_cmd_am_rsq_status - send 'FM_TUNE_FREQ' command to the
+ * device
+ * @core  - device to send the command to
+ * @rsqack - if set command clears RSQINT, SNRINT, SNRLINT, RSSIHINT,
+ *           RSSSILINT, BLENDINT, MULTHINT and MULTLINT
+ * @attune - when set the values in the status report are the values
+ *           that were calculated at tune
+ * @cancel - abort ongoing seek/tune opertation
+ * @stcack - clear the STCINT bin in status register
+ * @report - all signal quality information retured by the command
+ *           (if NULL then the output of the command is ignored)
+ *
+ * Function returns 0 on success and negative error code on failure
+ */
+int si476x_core_cmd_am_rsq_status(struct si476x_core *core,
+				  struct si476x_rsq_status_args *rsqargs,
+				  struct si476x_rsq_status_report *report)
+{
+	int err;
+	u8       resp[CMD_AM_RSQ_STATUS_NRESP];
+	const u8 args[CMD_AM_RSQ_STATUS_NARGS] = {
+		rsqargs->rsqack << 3 | rsqargs->attune << 2 |
+		rsqargs->cancel << 1 | rsqargs->stcack,
+	};
+
+	err = CORE_SEND_COMMAND(core, CMD_AM_RSQ_STATUS,
+				args, resp,
+				atomic_read(&core->timeouts.command));
+
+	if (report) {
+		report->snrhint		= 0b00001000 & resp[1];
+		report->snrlint		= 0b00000100 & resp[1];
+		report->rssihint	= 0b00000010 & resp[1];
+		report->rssilint	= 0b00000001 & resp[1];
+
+		report->bltf		= 0b10000000 & resp[2];
+		report->snr_ready	= 0b00100000 & resp[2];
+		report->rssiready	= 0b00001000 & resp[2];
+		report->afcrl		= 0b00000010 & resp[2];
+		report->valid		= 0b00000001 & resp[2];
+
+		report->readfreq	= be16_to_cpup((__be16 *)(resp + 3));
+		report->freqoff		= resp[5];
+		report->rssi		= resp[6];
+		report->snr		= resp[7];
+		report->lassi		= resp[9];
+		report->hassi		= resp[10];
+		report->mult		= resp[11];
+		report->dev		= resp[12];
+	}
+
+	return err;
+}
+EXPORT_SYMBOL_GPL(si476x_core_cmd_am_rsq_status);
+
+int si476x_core_cmd_fm_acf_status(struct si476x_core *core,
+			     struct si476x_acf_status_report *report)
+{
+	int err;
+	u8       resp[CMD_FM_ACF_STATUS_NRESP];
+	const u8 args[CMD_FM_ACF_STATUS_NARGS] = {
+		0x0,
+	};
+
+	if (!report)
+		return -EINVAL;
+
+	err = CORE_SEND_COMMAND(core, CMD_FM_ACF_STATUS,
+				args, resp,
+				atomic_read(&core->timeouts.command));
+
+	if (!err) {
+		report->blend_int	= resp[1] & SI476X_ACF_BLEND_INT;
+		report->hblend_int	= resp[1] & SI476X_ACF_HIBLEND_INT;
+		report->hicut_int	= resp[1] & SI476X_ACF_HICUT_INT;
+		report->chbw_int	= resp[1] & SI476X_ACF_CHBW_INT;
+		report->softmute_int	= resp[1] & SI476X_ACF_SOFTMUTE_INT;
+		report->smute		= resp[2] & SI476X_ACF_SMUTE;
+		report->smattn		= resp[3] & SI476X_ACF_SMATTN;
+		report->chbw		= resp[4];
+		report->hicut		= resp[5];
+		report->hiblend		= resp[6];
+		report->pilot		= resp[7] & SI476X_ACF_PILOT;
+		report->stblend		= resp[7] & SI476X_ACF_STBLEND;
+	}
+
+	return err;
+}
+EXPORT_SYMBOL_GPL(si476x_core_cmd_fm_acf_status);
+
+int si476x_core_cmd_am_acf_status(struct si476x_core *core,
+				  struct si476x_acf_status_report *report)
+{
+	int err;
+	u8       resp[CMD_AM_ACF_STATUS_NRESP];
+	const u8 args[CMD_AM_ACF_STATUS_NARGS] = {
+		0x0,
+	};
+
+	if (!report)
+		return -EINVAL;
+
+	err = CORE_SEND_COMMAND(core, CMD_AM_ACF_STATUS,
+				args, resp,
+				atomic_read(&core->timeouts.command));
+
+	if (!err) {
+		report->blend_int	= resp[1] & SI476X_ACF_BLEND_INT;
+		report->hblend_int	= resp[1] & SI476X_ACF_HIBLEND_INT;
+		report->hicut_int	= resp[1] & SI476X_ACF_HICUT_INT;
+		report->chbw_int	= resp[1] & SI476X_ACF_CHBW_INT;
+		report->softmute_int	= resp[1] & SI476X_ACF_SOFTMUTE_INT;
+		report->smute		= resp[2] & SI476X_ACF_SMUTE;
+		report->smattn		= resp[3] & SI476X_ACF_SMATTN;
+		report->chbw		= resp[4];
+		report->hicut		= resp[5];
+	}
+
+	return err;
+}
+EXPORT_SYMBOL_GPL(si476x_core_cmd_am_acf_status);
+
+static inline int __fm_clear_stcint(struct si476x_core *core)
+{
+	struct si476x_rsq_status_args args = {
+		.primary	= false,
+		.rsqack		= false,
+		.attune		= false,
+		.cancel		= false,
+		.stcack		= true,
+	};
+	return si476x_core_cmd_fm_rsq_status(core, &args, NULL);
+}
+
+static inline int __am_clear_stcint(struct si476x_core *core)
+{
+	struct si476x_rsq_status_args args = {
+		.primary	= false,
+		.rsqack		= false,
+		.attune		= false,
+		.cancel		= false,
+		.stcack		= true,
+	};
+	return si476x_core_cmd_am_rsq_status(core,  &args, NULL);
+}
+
+
+
+/**
+ * si476x_cmd_fm_seek_start - send 'FM_SEEK_START' command to the
+ * device
+ * @core  - device to send the command to
+ * @seekup - if set the direction of the search is 'up'
+ * @wrap   - if set seek wraps when hitting band limit
+ *
+ * This function begins search for a valid station. The station is
+ * considered valid when 'FM_VALID_SNR_THRESHOLD' and
+ * 'FM_VALID_RSSI_THRESHOLD' and 'FM_VALID_MAX_TUNE_ERROR' criteria
+ * are met.
+} *
+ * Function returns 0 on success and negative error code on failure
+ */
+int si476x_core_cmd_fm_seek_start(struct si476x_core *core,
+				  bool seekup, bool wrap)
+{
+	u8       resp[CMD_FM_SEEK_START_NRESP];
+	const u8 args[CMD_FM_SEEK_START_NARGS] = {
+		seekup << 3 | wrap << 2,
+	};
+
+	return __cmd_tune_seek_freq(core, CMD_FM_SEEK_START,
+				    args, sizeof(args), resp, sizeof(resp),
+				    __fm_clear_stcint);
+}
+EXPORT_SYMBOL_GPL(si476x_core_cmd_fm_seek_start);
+
+/**
+ * si476x_cmd_fm_rds_status - send 'FM_RDS_STATUS' command to the
+ * device
+ * @core - device to send the command to
+ * @status_only - if set the data is not removed from RDSFIFO,
+ *                RDSFIFOUSED is not decremented and data in all the
+ *                rest RDS data contains the last valid info received
+ * @mtfifo if set the command clears RDS receive FIFO
+ * @intack if set the command clards the RDSINT bit.
+ *
+ * Function returns 0 on success and negative error code on failure
+ */
+int si476x_core_cmd_fm_rds_status(struct si476x_core *core,
+				  bool status_only,
+				  bool mtfifo,
+				  bool intack,
+				  struct si476x_rds_status_report *report)
+{
+	int err;
+	u8       resp[CMD_FM_RDS_STATUS_NRESP];
+	const u8 args[CMD_FM_RDS_STATUS_NARGS] = {
+		status_only << 2 | mtfifo << 1 | intack,
+	};
+
+	err = CORE_SEND_COMMAND(core, CMD_FM_RDS_STATUS,
+				args, resp,
+				atomic_read(&core->timeouts.command));
+
+	if (!err && report) {
+		report->rdstpptyint	= 0b00010000 & resp[1];
+		report->rdspiint	= 0b00001000 & resp[1];
+		report->rdssyncint	= 0b00000010 & resp[1];
+		report->rdsfifoint	= 0b00000001 & resp[1];
+
+		report->tpptyvalid	= 0b00010000 & resp[2];
+		report->pivalid		= 0b00001000 & resp[2];
+		report->rdssync		= 0b00000010 & resp[2];
+		report->rdsfifolost	= 0b00000001 & resp[2];
+
+		report->tp		= 0b00100000 & resp[3];
+		report->pty		= 0b00011111 & resp[3];
+
+		report->pi		= be16_to_cpup((__be16 *)(resp + 4));
+		report->rdsfifoused	= resp[6];
+
+		report->ble[V4L2_RDS_BLOCK_A]	= 0b11000000 & resp[7];
+		report->ble[V4L2_RDS_BLOCK_B]	= 0b00110000 & resp[7];
+		report->ble[V4L2_RDS_BLOCK_C]	= 0b00001100 & resp[7];
+		report->ble[V4L2_RDS_BLOCK_D]	= 0b00000011 & resp[7];
+
+		report->rds[V4L2_RDS_BLOCK_A].block = V4L2_RDS_BLOCK_A;
+		report->rds[V4L2_RDS_BLOCK_A].msb = resp[8];
+		report->rds[V4L2_RDS_BLOCK_A].lsb = resp[9];
+
+		report->rds[V4L2_RDS_BLOCK_B].block = V4L2_RDS_BLOCK_B;
+		report->rds[V4L2_RDS_BLOCK_B].msb = resp[10];
+		report->rds[V4L2_RDS_BLOCK_B].lsb = resp[11];
+
+		report->rds[V4L2_RDS_BLOCK_C].block = V4L2_RDS_BLOCK_C;
+		report->rds[V4L2_RDS_BLOCK_C].msb = resp[12];
+		report->rds[V4L2_RDS_BLOCK_C].lsb = resp[13];
+
+		report->rds[V4L2_RDS_BLOCK_D].block = V4L2_RDS_BLOCK_D;
+		report->rds[V4L2_RDS_BLOCK_D].msb = resp[14];
+		report->rds[V4L2_RDS_BLOCK_D].lsb = resp[15];
+	}
+
+	return err;
+}
+
+int si476x_core_cmd_fm_rds_blockcount(struct si476x_core *core,
+				bool clear,
+				struct si476x_rds_blockcount_report *report)
+{
+	int err;
+	u8       resp[CMD_FM_RDS_BLOCKCOUNT_NRESP];
+	const u8 args[CMD_FM_RDS_BLOCKCOUNT_NARGS] = {
+		clear,
+	};
+
+	if (!report)
+		return -EINVAL;
+
+	err = CORE_SEND_COMMAND(core, CMD_FM_RDS_BLOCKCOUNT,
+				args, resp,
+				atomic_read(&core->timeouts.command));
+
+	if (!err) {
+		report->expected	= be16_to_cpup((__be16 *)(resp + 2));
+		report->received	= be16_to_cpup((__be16 *)(resp + 4));
+		report->uncorrectable	= be16_to_cpup((__be16 *)(resp + 6));
+	}
+
+	return err;
+}
+EXPORT_SYMBOL_GPL(si476x_core_cmd_fm_rds_blockcount);
+
+int si476x_core_cmd_fm_phase_diversity(struct si476x_core *core,
+				       enum si476x_phase_diversity_mode mode)
+{
+	u8       resp[CMD_FM_PHASE_DIVERSITY_NRESP];
+	const u8 args[CMD_FM_PHASE_DIVERSITY_NARGS] = {
+		mode & 0b111,
+	};
+
+	return CORE_SEND_COMMAND(core, CMD_FM_PHASE_DIVERSITY,
+				 args, resp,
+				 atomic_read(&core->timeouts.command));
+}
+EXPORT_SYMBOL_GPL(si476x_core_cmd_fm_phase_diversity);
+/**
+ * si476x_core_cmd_fm_phase_div_status() - get the phase diversity
+ * status
+ *
+ * @core: si476x device
+ *
+ * NOTE caller must hold core lock
+ *
+ * Function returns the value of the status bit in case of success and
+ * negative error code in case of failre.
+ */
+int si476x_core_cmd_fm_phase_div_status(struct si476x_core *core)
+{
+	int err;
+	u8 resp[CMD_FM_PHASE_DIV_STATUS_NRESP];
+
+	err = __core_send_command(core, CMD_FM_PHASE_DIV_STATUS,
+				  NULL, 0,
+				  resp, ARRAY_SIZE(resp),
+				  atomic_read(&core->timeouts.command));
+
+	return (err < 0) ? err : resp[1];
+}
+EXPORT_SYMBOL_GPL(si476x_core_cmd_fm_phase_div_status);
+
+
+/**
+ * si476x_cmd_am_seek_start - send 'FM_SEEK_START' command to the
+ * device
+ * @core  - device to send the command to
+ * @seekup - if set the direction of the search is 'up'
+ * @wrap   - if set seek wraps when hitting band limit
+ *
+ * This function begins search for a valid station. The station is
+ * considered valid when 'FM_VALID_SNR_THRESHOLD' and
+ * 'FM_VALID_RSSI_THRESHOLD' and 'FM_VALID_MAX_TUNE_ERROR' criteria
+ * are met.
+ *
+ * Function returns 0 on success and negative error code on failure
+ */
+int si476x_core_cmd_am_seek_start(struct si476x_core *core,
+				  bool seekup, bool wrap)
+{
+	u8       resp[CMD_AM_SEEK_START_NRESP];
+	const u8 args[CMD_AM_SEEK_START_NARGS] = {
+		seekup << 3 | wrap << 2,
+	};
+
+	return __cmd_tune_seek_freq(core,  CMD_AM_SEEK_START,
+				    args, sizeof(args), resp, sizeof(resp),
+				    __am_clear_stcint);
+}
+EXPORT_SYMBOL_GPL(si476x_core_cmd_am_seek_start);
+
+
+
+static int si476x_core_cmd_power_up_a10(struct si476x_core *core,
+					struct si476x_power_up_args *puargs)
+{
+	u8       resp[CMD_POWER_UP_A10_NRESP];
+	const bool intsel = (core->pinmux.a1 == SI476X_A1_IRQ);
+	const bool ctsen  = (core->client->irq != 0);
+	const u8 args[CMD_POWER_UP_A10_NARGS] = {
+		0xF7,		/* Reserved, always 0xF7 */
+		0x3F & puargs->xcload,	/* First two bits are reserved to be
+				 * zeros */
+		ctsen << 7 | intsel << 6 | 0x07, /* Last five bits
+						   * are reserved to
+						   * be written as 0x7 */
+		puargs->func << 4 | puargs->freq,
+		0x11,		/* Reserved, always 0x11 */
+	};
+
+	return CORE_SEND_COMMAND(core, CMD_POWER_UP,
+				 args, resp,
+				 atomic_read(&core->timeouts.power_up));
+}
+
+static int si476x_core_cmd_power_up_a20(struct si476x_core *core,
+				 struct si476x_power_up_args *puargs)
+{
+	u8       resp[CMD_POWER_UP_A20_NRESP];
+	const bool intsel = (core->pinmux.a1 == SI476X_A1_IRQ);
+	const bool ctsen  = (core->client->irq != 0);
+	const u8 args[CMD_POWER_UP_A20_NARGS] = {
+		puargs->ibias6x << 7 | puargs->xstart,
+		0x3F & puargs->xcload,	/* First two bits are reserved to be
+					 * zeros */
+		ctsen << 7 | intsel << 6 | puargs->fastboot << 5 |
+		puargs->xbiashc << 3 | puargs->xbias,
+		puargs->func << 4 | puargs->freq,
+		0x10 | puargs->xmode,
+	};
+
+	return CORE_SEND_COMMAND(core, CMD_POWER_UP,
+				 args, resp,
+				 atomic_read(&core->timeouts.power_up));
+}
+
+static int si476x_core_cmd_power_down_a10(struct si476x_core *core,
+					  struct si476x_power_down_args *pdargs)
+{
+	u8 resp[CMD_POWER_DOWN_A10_NRESP];
+
+	return __core_send_command(core, CMD_POWER_DOWN,
+				   NULL, 0,
+				   resp, ARRAY_SIZE(resp),
+				   atomic_read(&core->timeouts.command));
+}
+
+static int si476x_core_cmd_power_down_a20(struct si476x_core *core,
+					  struct si476x_power_down_args *pdargs)
+{
+	u8 resp[CMD_POWER_DOWN_A20_NRESP];
+	const u8 args[CMD_POWER_DOWN_A20_NARGS] = {
+		pdargs->xosc,
+	};
+	return CORE_SEND_COMMAND(core, CMD_POWER_DOWN,
+				 args, resp,
+				 atomic_read(&core->timeouts.command));
+}
+
+static int si476x_core_cmd_am_tune_freq_a10(struct si476x_core *core,
+					struct si476x_tune_freq_args *tuneargs)
+{
+
+	const int am_freq = tuneargs->freq;
+	u8       resp[CMD_AM_TUNE_FREQ_NRESP];
+	const u8 args[CMD_AM_TUNE_FREQ_NARGS] = {
+		(tuneargs->hd << 6),
+		msb(am_freq),
+		lsb(am_freq),
+	};
+
+	return __cmd_tune_seek_freq(core, CMD_AM_TUNE_FREQ, args, sizeof(args),
+			       resp, sizeof(resp), __am_clear_stcint);
+}
+
+static int si476x_core_cmd_am_tune_freq_a20(struct si476x_core *core,
+					struct si476x_tune_freq_args *tuneargs)
+{
+	const int am_freq = tuneargs->freq;
+	u8       resp[CMD_AM_TUNE_FREQ_NRESP];
+	const u8 args[CMD_AM_TUNE_FREQ_NARGS] = {
+		(tuneargs->zifsr << 6) | (tuneargs->injside & 0b11),
+		msb(am_freq),
+		lsb(am_freq),
+	};
+
+	return __cmd_tune_seek_freq(core, CMD_AM_TUNE_FREQ, args, sizeof(args),
+			       resp, sizeof(resp), __am_clear_stcint);
+}
+
+static int si476x_core_cmd_fm_rsq_status_a10(struct si476x_core *core,
+					struct si476x_rsq_status_args *rsqargs,
+					struct si476x_rsq_status_report *report)
+{
+	int err;
+	u8       resp[CMD_FM_RSQ_STATUS_A10_NRESP];
+	const u8 args[CMD_FM_RSQ_STATUS_A10_NARGS] = {
+		rsqargs->rsqack << 3 | rsqargs->attune << 2 |
+		rsqargs->cancel << 1 | rsqargs->stcack,
+	};
+
+	err = CORE_SEND_COMMAND(core, CMD_FM_RSQ_STATUS,
+				args, resp,
+				atomic_read(&core->timeouts.command));
+
+	if (report && !err) {
+		report->multhint	= 0b10000000 & resp[1];
+		report->multlint	= 0b01000000 & resp[1];
+		report->snrhint		= 0b00001000 & resp[1];
+		report->snrlint		= 0b00000100 & resp[1];
+		report->rssihint	= 0b00000010 & resp[1];
+		report->rssilint	= 0b00000001 & resp[1];
+
+		report->bltf		= 0b10000000 & resp[2];
+		report->snr_ready	= 0b00100000 & resp[2];
+		report->rssiready	= 0b00001000 & resp[2];
+		report->afcrl		= 0b00000010 & resp[2];
+		report->valid		= 0b00000001 & resp[2];
+
+		report->readfreq	= be16_to_cpup((__be16 *)(resp + 3));
+		report->freqoff		= resp[5];
+		report->rssi		= resp[6];
+		report->snr		= resp[7];
+		report->lassi		= resp[9];
+		report->hassi		= resp[10];
+		report->mult		= resp[11];
+		report->dev		= resp[12];
+		report->readantcap	= be16_to_cpup((__be16 *)(resp + 13));
+		report->assi		= resp[15];
+		report->usn		= resp[16];
+	}
+
+	return err;
+}
+
+static int si476x_core_cmd_fm_rsq_status_a20(struct si476x_core *core,
+					struct si476x_rsq_status_args *rsqargs,
+					struct si476x_rsq_status_report *report)
+{
+	int err;
+	u8       resp[CMD_FM_RSQ_STATUS_A10_NRESP];
+
+	const u8 args[CMD_FM_RSQ_STATUS_A30_NARGS] = {
+		rsqargs->primary << 4 | rsqargs->rsqack << 3 |
+		rsqargs->attune  << 2 | rsqargs->cancel << 1 |
+		rsqargs->stcack,
+	};
+
+	err = CORE_SEND_COMMAND(core, CMD_FM_RSQ_STATUS,
+				args, resp,
+				atomic_read(&core->timeouts.command));
+
+	if (report && !err) {
+		report->multhint	= 0b10000000 & resp[1];
+		report->multlint	= 0b01000000 & resp[1];
+		report->snrhint		= 0b00001000 & resp[1];
+		report->snrlint		= 0b00000100 & resp[1];
+		report->rssihint	= 0b00000010 & resp[1];
+		report->rssilint	= 0b00000001 & resp[1];
+
+		report->bltf		= 0b10000000 & resp[2];
+		report->snr_ready	= 0b00100000 & resp[2];
+		report->rssiready	= 0b00001000 & resp[2];
+		report->afcrl		= 0b00000010 & resp[2];
+		report->valid		= 0b00000001 & resp[2];
+
+		report->readfreq	= be16_to_cpup((__be16 *)(resp + 3));
+		report->freqoff		= resp[5];
+		report->rssi		= resp[6];
+		report->snr		= resp[7];
+		report->lassi		= resp[9];
+		report->hassi		= resp[10];
+		report->mult		= resp[11];
+		report->dev		= resp[12];
+		report->readantcap	= be16_to_cpup((__be16 *)(resp + 13));
+		report->assi		= resp[15];
+		report->usn		= resp[16];
+	}
+
+	return err;
+}
+
+
+static int si476x_core_cmd_fm_rsq_status_a30(struct si476x_core *core,
+					struct si476x_rsq_status_args *rsqargs,
+					struct si476x_rsq_status_report *report)
+{
+	int err;
+	u8       resp[CMD_FM_RSQ_STATUS_A30_NRESP];
+	const u8 args[CMD_FM_RSQ_STATUS_A30_NARGS] = {
+		rsqargs->primary << 4 | rsqargs->rsqack << 3 |
+		rsqargs->attune << 2 | rsqargs->cancel << 1 |
+		rsqargs->stcack,
+	};
+
+	err = CORE_SEND_COMMAND(core, CMD_FM_RSQ_STATUS,
+				args, resp,
+				atomic_read(&core->timeouts.command));
+
+	if (report && !err) {
+		report->multhint	= 0b10000000 & resp[1];
+		report->multlint	= 0b01000000 & resp[1];
+		report->snrhint		= 0b00001000 & resp[1];
+		report->snrlint		= 0b00000100 & resp[1];
+		report->rssihint	= 0b00000010 & resp[1];
+		report->rssilint	= 0b00000001 & resp[1];
+
+		report->bltf		= 0b10000000 & resp[2];
+		report->snr_ready	= 0b00100000 & resp[2];
+		report->rssiready	= 0b00001000 & resp[2];
+		report->injside         = 0b00000100 & resp[2];
+		report->afcrl		= 0b00000010 & resp[2];
+		report->valid		= 0b00000001 & resp[2];
+
+		report->readfreq	= be16_to_cpup((__be16 *)(resp + 3));
+		report->freqoff		= resp[5];
+		report->rssi		= resp[6];
+		report->snr		= resp[7];
+		report->issi		= resp[8];
+		report->lassi		= resp[9];
+		report->hassi		= resp[10];
+		report->mult		= resp[11];
+		report->dev		= resp[12];
+		report->readantcap	= be16_to_cpup((__be16 *)(resp + 13));
+		report->assi		= resp[15];
+		report->usn		= resp[16];
+
+		report->pilotdev	= resp[17];
+		report->rdsdev		= resp[18];
+		report->assidev		= resp[19];
+		report->strongdev	= resp[20];
+		report->rdspi		= be16_to_cpup((__be16 *)(resp + 21));
+	}
+
+	return err;
+}
+
+static int si476x_core_cmd_fm_tune_freq_a10(struct si476x_core *core,
+					struct si476x_tune_freq_args *tuneargs)
+{
+	u8       resp[CMD_FM_TUNE_FREQ_NRESP];
+	const u8 args[CMD_FM_TUNE_FREQ_A10_NARGS] = {
+		(tuneargs->hd << 6) | (tuneargs->tunemode << 4)
+		| (tuneargs->smoothmetrics << 2),
+		msb(tuneargs->freq),
+		lsb(tuneargs->freq),
+		msb(tuneargs->antcap),
+		lsb(tuneargs->antcap)
+	};
+
+	return __cmd_tune_seek_freq(core, CMD_FM_TUNE_FREQ, args, sizeof(args),
+			       resp, sizeof(resp), __fm_clear_stcint);
+}
+
+static int si476x_core_cmd_fm_tune_freq_a20(struct si476x_core *core,
+					struct si476x_tune_freq_args *tuneargs)
+{
+	u8       resp[CMD_FM_TUNE_FREQ_NRESP];
+	const u8 args[CMD_FM_TUNE_FREQ_A20_NARGS] = {
+		(tuneargs->hd << 6) | (tuneargs->tunemode << 4)
+		|  (tuneargs->smoothmetrics << 2) | (tuneargs->injside),
+		msb(tuneargs->freq),
+		lsb(tuneargs->freq),
+	};
+
+	return __cmd_tune_seek_freq(core, CMD_FM_TUNE_FREQ, args, sizeof(args),
+			       resp, sizeof(resp), __fm_clear_stcint);
+}
+
+static int si476x_core_cmd_agc_status_a20(struct si476x_core *core,
+					struct si476x_agc_status_report *report)
+{
+	int err;
+	u8 resp[CMD_AGC_STATUS_NRESP_A20];
+
+	if (!report)
+		return -EINVAL;
+
+	err = __core_send_command(core, CMD_AGC_STATUS,
+				  NULL, 0,
+				  resp, ARRAY_SIZE(resp),
+				  atomic_read(&core->timeouts.command));
+	if (!err) {
+		report->mxhi		= resp[1] & SI476X_AGC_MXHI;
+		report->mxlo		= resp[1] & SI476X_AGC_MXLO;
+		report->lnahi		= resp[1] & SI476X_AGC_LNAHI;
+		report->lnalo		= resp[1] & SI476X_AGC_LNALO;
+		report->fmagc1		= resp[2];
+		report->fmagc2		= resp[3];
+		report->pgagain		= resp[4];
+		report->fmwblang	= resp[5];
+	}
+
+	return err;
+}
+
+static int si476x_core_cmd_agc_status_a10(struct si476x_core *core,
+					struct si476x_agc_status_report *report)
+{
+	int err;
+	u8 resp[CMD_AGC_STATUS_NRESP_A10];
+
+	if (!report)
+		return -EINVAL;
+
+	err = __core_send_command(core, CMD_AGC_STATUS,
+				  NULL, 0,
+				  resp, ARRAY_SIZE(resp),
+				  atomic_read(&core->timeouts.command));
+	if (!err) {
+		report->mxhi		= resp[1] & SI476X_AGC_MXHI;
+		report->mxlo		= resp[1] & SI476X_AGC_MXLO;
+		report->lnahi		= resp[1] & SI476X_AGC_LNAHI;
+		report->lnalo		= resp[1] & SI476X_AGC_LNALO;
+	}
+
+	return err;
+}
+
+static struct {
+	int (*power_up) (struct si476x_core *,
+			 struct si476x_power_up_args *);
+	int (*power_down) (struct si476x_core *,
+			   struct si476x_power_down_args *);
+
+	tune_freq_func_t fm_tune_freq;
+	tune_freq_func_t am_tune_freq;
+
+	int (*fm_rsq_status)(struct si476x_core *,
+			     struct si476x_rsq_status_args *,
+			     struct si476x_rsq_status_report *);
+
+	int (*agc_status)(struct si476x_core *,
+			  struct si476x_agc_status_report *);
+	int (*intb_pin_cfg)(struct si476x_core *core,
+			    enum si476x_intb_config intb,
+			    enum si476x_a1_config a1);
+} si476x_cmds_vtable[] = {
+	[SI476X_REVISION_A10] = {
+		.power_up	= si476x_core_cmd_power_up_a10,
+		.power_down	= si476x_core_cmd_power_down_a10,
+		.fm_tune_freq	= si476x_core_cmd_fm_tune_freq_a10,
+		.am_tune_freq	= si476x_core_cmd_am_tune_freq_a10,
+		.fm_rsq_status	= si476x_core_cmd_fm_rsq_status_a10,
+		.agc_status	= si476x_core_cmd_agc_status_a10,
+		.intb_pin_cfg   = si476x_core_cmd_intb_pin_cfg_a10,
+	},
+	[SI476X_REVISION_A20] = {
+		.power_up	= si476x_core_cmd_power_up_a20,
+		.power_down	= si476x_core_cmd_power_down_a20,
+		.fm_tune_freq	= si476x_core_cmd_fm_tune_freq_a20,
+		.am_tune_freq	= si476x_core_cmd_am_tune_freq_a20,
+		.fm_rsq_status	= si476x_core_cmd_fm_rsq_status_a20,
+		.agc_status	= si476x_core_cmd_agc_status_a20,
+		.intb_pin_cfg   = si476x_core_cmd_intb_pin_cfg_a20,
+	},
+	[SI476X_REVISION_A30] = {
+		.power_up	= si476x_core_cmd_power_up_a20,
+		.power_down	= si476x_core_cmd_power_down_a20,
+		.fm_tune_freq	= si476x_core_cmd_fm_tune_freq_a20,
+		.am_tune_freq	= si476x_core_cmd_am_tune_freq_a20,
+		.fm_rsq_status	= si476x_core_cmd_fm_rsq_status_a30,
+		.agc_status	= si476x_core_cmd_agc_status_a20,
+		.intb_pin_cfg   = si476x_core_cmd_intb_pin_cfg_a20,
+	},
+};
+
+int si476x_core_cmd_power_up(struct si476x_core *core,
+			     struct si476x_power_up_args *args)
+{
+	BUG_ON(core->revision > SI476X_REVISION_A30 ||
+	       core->revision == -1);
+	return si476x_cmds_vtable[core->revision].power_up(core, args);
+}
+EXPORT_SYMBOL_GPL(si476x_core_cmd_power_up);
+
+int si476x_core_cmd_power_down(struct si476x_core *core,
+			       struct si476x_power_down_args *args)
+{
+	BUG_ON(core->revision > SI476X_REVISION_A30 ||
+	       core->revision == -1);
+	return si476x_cmds_vtable[core->revision].power_down(core, args);
+}
+EXPORT_SYMBOL_GPL(si476x_core_cmd_power_down);
+
+int si476x_core_cmd_fm_tune_freq(struct si476x_core *core,
+				 struct si476x_tune_freq_args *args)
+{
+	BUG_ON(core->revision > SI476X_REVISION_A30 ||
+	       core->revision == -1);
+	return si476x_cmds_vtable[core->revision].fm_tune_freq(core, args);
+}
+EXPORT_SYMBOL_GPL(si476x_core_cmd_fm_tune_freq);
+
+int si476x_core_cmd_am_tune_freq(struct si476x_core *core,
+				 struct si476x_tune_freq_args *args)
+{
+	BUG_ON(core->revision > SI476X_REVISION_A30 ||
+	       core->revision == -1);
+	return si476x_cmds_vtable[core->revision].am_tune_freq(core, args);
+}
+EXPORT_SYMBOL_GPL(si476x_core_cmd_am_tune_freq);
+
+int si476x_core_cmd_fm_rsq_status(struct si476x_core *core,
+				  struct si476x_rsq_status_args *args,
+				  struct si476x_rsq_status_report *report)
+
+{
+	BUG_ON(core->revision > SI476X_REVISION_A30 ||
+	       core->revision == -1);
+	return si476x_cmds_vtable[core->revision].fm_rsq_status(core, args,
+								report);
+}
+EXPORT_SYMBOL_GPL(si476x_core_cmd_fm_rsq_status);
+
+int si476x_core_cmd_agc_status(struct si476x_core *core,
+				  struct si476x_agc_status_report *report)
+
+{
+	BUG_ON(core->revision > SI476X_REVISION_A30 ||
+	       core->revision == -1);
+	return si476x_cmds_vtable[core->revision].agc_status(core, report);
+}
+EXPORT_SYMBOL_GPL(si476x_core_cmd_agc_status);
+
+
+int si476x_core_cmd_intb_pin_cfg(struct si476x_core *core,
+			    enum si476x_intb_config intb,
+			    enum si476x_a1_config a1)
+{
+	BUG_ON(core->revision > SI476X_REVISION_A30 ||
+	       core->revision == -1);
+
+	return si476x_cmds_vtable[core->revision].intb_pin_cfg(core, intb, a1);
+}
+EXPORT_SYMBOL_GPL(si476x_core_cmd_intb_pin_cfg);
+
+
+
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Andrey Smirnov <andrey.smirnov@convergeddevices.net>");
+MODULE_DESCRIPTION("API for command exchange for si476x");
diff --git a/drivers/mfd/si476x-i2c.c b/drivers/mfd/si476x-i2c.c
new file mode 100644
index 0000000..d515158
--- /dev/null
+++ b/drivers/mfd/si476x-i2c.c
@@ -0,0 +1,1033 @@
+/*
+ * include/media/si476x-i2c.c -- Core device driver for si476x MFD
+ * device
+ *
+ * Copyright (C) 2012 Innovative Converged Devices(ICD)
+ *
+ * Author: Andrey Smirnov <andrey.smirnov@convergeddevices.net>
+ *
+ * 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 program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ */
+#include <linux/module.h>
+
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <linux/gpio.h>
+#include <linux/regulator/consumer.h>
+#include <linux/i2c.h>
+#include <linux/err.h>
+
+#include <linux/mfd/si476x-core.h>
+
+/* Command Timeouts */
+#define DEFAULT_TIMEOUT				10000
+#define TIMEOUT_TUNE				700000
+#define TIMEOUT_POWER_UP			330000
+
+#define MAX_IO_ERRORS 10
+
+#define SI476X_DRIVER_RDS_FIFO_DEPTH		128
+
+#define SI476X_STATUS_POLL_US 0
+
+/**
+ * si476x_core_config_pinmux() - pin function configuration function
+ *
+ * @core: Core device structure
+ *
+ * Configure the functions of the pins of the radio chip.
+ *
+ * The function returns zero in case of succes or negative error code
+ * otherwise.
+ */
+static int si476x_core_config_pinmux(struct si476x_core *core)
+{
+	int err;
+	dev_dbg(&core->client->dev, "Configuring pinmux\n");
+	err = si476x_core_cmd_dig_audio_pin_cfg(core,
+						core->pinmux.dclk,
+						core->pinmux.dfs,
+						core->pinmux.dout,
+						core->pinmux.xout);
+	if (err < 0) {
+		dev_err(&core->client->dev,
+			"Failed to configure digital audio pins(err = %d)\n",
+			err);
+		return err;
+	}
+
+	err = si476x_core_cmd_zif_pin_cfg(core,
+					  core->pinmux.iqclk,
+					  core->pinmux.iqfs,
+					  core->pinmux.iout,
+					  core->pinmux.qout);
+	if (err < 0) {
+		dev_err(&core->client->dev,
+			"Failed to configure ZIF pins(err = %d)\n",
+			err);
+		return err;
+	}
+
+	err = si476x_core_cmd_ic_link_gpo_ctl_pin_cfg(core,
+						      core->pinmux.icin,
+						      core->pinmux.icip,
+						      core->pinmux.icon,
+						      core->pinmux.icop);
+	if (err < 0) {
+		dev_err(&core->client->dev,
+			"Failed to configure IC-Link/GPO pins(err = %d)\n",
+			err);
+		return err;
+	}
+
+	err = si476x_core_cmd_ana_audio_pin_cfg(core,
+						core->pinmux.lrout);
+	if (err < 0) {
+		dev_err(&core->client->dev,
+			"Failed to configure analog audio pins(err = %d)\n",
+			err);
+		return err;
+	}
+
+	err = si476x_core_cmd_intb_pin_cfg(core,
+					   core->pinmux.intb,
+					   core->pinmux.a1);
+	if (err < 0) {
+		dev_err(&core->client->dev,
+			"Failed to configure interrupt pins(err = %d)\n",
+			err);
+		return err;
+	}
+
+	return 0;
+}
+
+static inline void si476x_schedule_polling_work(struct si476x_core *core)
+{
+	schedule_delayed_work(&core->status_monitor,
+			usecs_to_jiffies(atomic_read(&core->polling_interval)));
+}
+
+/**
+ * si476x_core_start() - early chip startup function
+ * @core: Core device structure
+ * @soft: When set, this flag forces "soft" startup, where "soft"
+ * power down is the one done by sending appropriate command instead
+ * of using reset pin of the tuner
+ *
+ * Perform required startup sequence to correctly power
+ * up the chip and perform initial configuration. It does the
+ * following sequence of actions:
+ *       1. Claims and enables the power supplies VD and VIO1 required
+ *          for I2C interface of the chip operation.
+ *       2. Waits for 100us, pulls the reset line up, enables irq,
+ *          waits for another 100us as it is specified by the
+ *          datasheet.
+ *       3. Sends 'POWER_UP' command to the device with all provided
+ *          information about power-up parameters.
+ *       4. Configures, pin multiplexor, disables digital audio and
+ *          configures interrupt sources.
+ *
+ * The function returns zero in case of succes or negative error code
+ * otherwise.
+ */
+int si476x_core_start(struct si476x_core *core, bool soft)
+{
+	struct i2c_client *client = core->client;
+	int err;
+
+	if (!soft) {
+		if (gpio_is_valid(core->gpio_reset))
+			gpio_set_value_cansleep(core->gpio_reset, 1);
+
+		if (client->irq)
+			enable_irq(client->irq);
+
+		udelay(100);
+
+		if (!client->irq) {
+			atomic_set(&core->is_alive, 1);
+			si476x_schedule_polling_work(core);
+		}
+	} else {
+		if (client->irq)
+			enable_irq(client->irq);
+		else {
+			atomic_set(&core->is_alive, 1);
+			si476x_schedule_polling_work(core);
+		}
+	}
+
+	err = si476x_core_cmd_power_up(core,
+				       &core->power_up_parameters);
+
+	if (err < 0) {
+		dev_err(&core->client->dev,
+			"Power up failure(err = %d)\n",
+			err);
+		goto disable_irq;
+	}
+
+	if (client->irq)
+		atomic_set(&core->is_alive, 1);
+
+	err = si476x_core_config_pinmux(core);
+	if (err < 0) {
+		dev_err(&core->client->dev,
+			"Failed to configure pinmux(err = %d)\n",
+			err);
+		goto disable_irq;
+	}
+
+
+	err = si476x_core_disable_digital_audio(core);
+	if (err < 0) {
+		dev_err(&core->client->dev,
+			"Failed to disable digital audio(err = %d)\n",
+			err);
+		goto disable_irq;
+	}
+
+	if (client->irq) {
+		err = si476x_core_set_int_ctl_enable(core,
+						     SI476X_RDSIEN |
+						     SI476X_STCIEN |
+						     SI476X_CTSIEN);
+		if (err < 0) {
+			dev_err(&core->client->dev,
+				"Failed to configure interrupt sources"
+				"(err = %d)\n", err);
+			goto disable_irq;
+		}
+	}
+
+	if (core->power_up_parameters.func == SI476X_FUNC_FM_RECEIVER &&
+	    core->diversity_mode) {
+		err = si476x_core_cmd_fm_phase_diversity(core,
+							 core->diversity_mode);
+		if (err < 0) {
+			dev_err(&core->client->dev,
+				"Failed to configure diversitymode role"
+				"(err = %d)\n", err);
+			goto disable_irq;
+		}
+	}
+
+	return 0;
+
+disable_irq:
+	if (err == -ENODEV)
+		atomic_set(&core->is_alive, 0);
+
+	if (client->irq)
+		disable_irq(client->irq);
+	else
+		cancel_delayed_work_sync(&core->status_monitor);
+
+	if (gpio_is_valid(core->gpio_reset))
+		gpio_set_value_cansleep(core->gpio_reset, 0);
+
+	return err;
+}
+EXPORT_SYMBOL_GPL(si476x_core_start);
+
+/**
+ * si476x_core_stop() - chip power-down function
+ * @core: Core device structure
+ * @soft: When set, function sends a POWER_DOWN command instead of
+ * bringing reset line low
+ *
+ * Power down the chip by performing following actions:
+ * 1. Disable IRQ or stop the polling worker
+ * 2. Send the POWER_DOWN command if the power down is soft or bring
+ *    reset line low if not.
+ *
+ * The function returns zero in case of succes or negative error code
+ * otherwise.
+ */
+int si476x_core_stop(struct si476x_core *core, bool soft)
+{
+	int err;
+	if (core->client->irq)
+		disable_irq(core->client->irq);
+	else
+		cancel_delayed_work_sync(&core->status_monitor);
+
+	atomic_set(&core->is_alive, 0);
+
+	if (soft) {
+		/* TODO: This probably shoud be a configurable option,
+		 * so it is possible to have the chips keep their
+		 * oscillators running
+		 */
+		struct si476x_power_down_args args = {
+			.xosc = false,
+		};
+		err = si476x_core_cmd_power_down(core, &args);
+	} else {
+		err = 0;
+		if (gpio_is_valid(core->gpio_reset))
+			gpio_set_value_cansleep(core->gpio_reset, 0);
+	}
+
+	return err;
+}
+EXPORT_SYMBOL_GPL(si476x_core_stop);
+
+/**
+ * si476x_core_set_power_state() - set the level at which the power is
+ * supplied for the chip.
+ * @core: Core device structure
+ * @next_state: enum si476x_power_state describing power state to
+ *              switch to.
+ *
+ * Switch on all the required power supplies
+ *
+ * This function returns 0 in case of suvccess and negative error code
+ * otherwise.
+ */
+int si476x_core_set_power_state(struct si476x_core *core,
+				enum si476x_power_state next_state)
+{
+	/*
+	   It is not clear form the datasheet if it is possible to
+	   work with device if not all power domains are operational.
+	   So for now the power-up policy is "full-steam ahead"
+	 */
+	int err = 0;
+
+	if (core->power_state == SI476X_POWER_INCONSISTENT) {
+		dev_err(&core->client->dev,
+			"The device in inconsistent power state\n");
+		return -EINVAL;
+	}
+
+	if (next_state != core->power_state) {
+		switch (next_state) {
+		case SI476X_POWER_UP_FULL:
+			if (core->supplies.va) {
+				err = regulator_enable(core->supplies.va);
+				if (err < 0)
+					break;
+			}
+			if (core->supplies.vio2) {
+				err = regulator_enable(core->supplies.vio2);
+				if (err < 0)
+					goto disable_va;
+			}
+
+			if (core->supplies.vd) {
+				err = regulator_enable(core->supplies.vd);
+				if (err < 0)
+					goto disable_vio2;
+			}
+			if (core->supplies.vio1) {
+				err = regulator_enable(core->supplies.vio1);
+				if (err < 0)
+					goto disable_vd;
+			}
+
+			udelay(100);		/* See startup timing diagram*/
+
+			err = si476x_core_start(core, false);
+			if (err < 0)
+				goto disable_vio1;
+
+			core->power_state = next_state;
+			break;
+
+		case SI476X_POWER_DOWN:
+			core->power_state = next_state;
+			err = si476x_core_stop(core, false);
+			if (err < 0)
+				core->power_state = \
+					SI476X_POWER_INCONSISTENT;
+disable_vio1:
+			if (core->supplies.vio1) {
+				err = regulator_disable(core->supplies.vio1);
+				if (err < 0)
+					core->power_state = \
+						SI476X_POWER_INCONSISTENT;
+			}
+disable_vd:
+			if (core->supplies.vd) {
+				err = regulator_disable(core->supplies.vd);
+				if (err < 0)
+					core->power_state = \
+						SI476X_POWER_INCONSISTENT;
+			}
+disable_vio2:
+			if (core->supplies.vio2) {
+				err = regulator_disable(core->supplies.vio2);
+				if (err < 0)
+					core->power_state = \
+						SI476X_POWER_INCONSISTENT;
+			}
+disable_va:
+			if (core->supplies.va) {
+				err = regulator_disable(core->supplies.va);
+				if (err < 0)
+					core->power_state = \
+						SI476X_POWER_INCONSISTENT;
+			}
+			break;
+		default:
+			BUG();
+		}
+	}
+
+	return err;
+}
+EXPORT_SYMBOL_GPL(si476x_core_set_power_state);
+
+/**
+ * si476x_core_report_drainer_stop() - mark the completion of the RDS
+ * buffer drain porcess by the worker.
+ *
+ * @core: Core device structure
+ */
+static inline void si476x_core_report_drainer_stop(struct si476x_core *core)
+{
+	mutex_lock(&core->rds_drainer_status_lock);
+	core->rds_drainer_is_working = false;
+	mutex_unlock(&core->rds_drainer_status_lock);
+}
+
+/**
+ * si476x_core_start_rds_drainer_once() - start RDS drainer worker if
+ * ther is none working, do nothing otherwise
+ *
+ * @core: Datastructure corresponding to the chip.
+ */
+static inline void si476x_core_start_rds_drainer_once(struct si476x_core *core)
+{
+	mutex_lock(&core->rds_drainer_status_lock);
+	if (!core->rds_drainer_is_working) {
+		core->rds_drainer_is_working = true;
+		schedule_work(&core->rds_fifo_drainer);
+	}
+	mutex_unlock(&core->rds_drainer_status_lock);
+}
+/**
+ * si476x_drain_rds_fifo() - RDS buffer drainer.
+ * @work: struct work_struct being ppassed to the function by the
+ * kernel.
+ *
+ * Drain the contents of the RDS FIFO of
+ */
+static void si476x_drain_rds_fifo(struct work_struct *work)
+{
+	int err;
+
+	struct si476x_core *core = container_of(work, struct si476x_core,
+						rds_fifo_drainer);
+
+	struct si476x_rds_status_report report;
+
+	si476x_core_lock(core);
+	err = si476x_core_cmd_fm_rds_status(core, true, false, false, &report);
+	if (!err) {
+		int i = report.rdsfifoused;
+		dev_dbg(&core->client->dev,
+			"%d elements in RDS FIFO. Draining.\n", i);
+		for (; i > 0; --i) {
+			err = si476x_core_cmd_fm_rds_status(core, false, false,
+							    (i == 1), &report);
+			if (err < 0)
+				goto unlock;
+
+			kfifo_in(&core->rds_fifo, report.rds,
+				 sizeof(report.rds));
+			DBG_BUFFER(&core->client->dev, "RDS data:\n",
+				   report.rds, sizeof(report.rds));
+		}
+		dev_dbg(&core->client->dev, "Drrrrained!\n");
+		wake_up_interruptible(&core->rds_read_queue);
+	}
+
+unlock:
+	si476x_core_unlock(core);
+	si476x_core_report_drainer_stop(core);
+}
+
+/**
+ * si476x_core_pronounce_dead()
+ *
+ * @core: Core device structure
+ *
+ * Mark the device as being dead and wake up all potentially waiting
+ * threads of execution.
+ *
+ */
+static void si476x_core_pronounce_dead(struct si476x_core *core)
+{
+	dev_info(&core->client->dev, "Core device is dead.\n");
+
+	atomic_set(&core->is_alive, 0);
+
+	/* Wake up al possible waiting processes */
+	wake_up_interruptible(&core->rds_read_queue);
+
+	atomic_set(&core->cts, 1);
+	wake_up(&core->command);
+
+	atomic_set(&core->stc, 1);
+	wake_up(&core->tuning);
+}
+
+/**
+ * si476x_i2c_xfer()
+ *
+ * @core: Core device structure
+ * @type: Transfer type
+ * @buf: Transfer buffer for/with data
+ * @count: Transfer buffer size
+ *
+ * Perfrom and I2C transfer(either read or write) and keep a counter
+ * of I/O errors. If the error counter rises above the threshold
+ * pronounce device dead.
+ *
+ * The function returns zero on succes or negative error code on
+ * failure.
+ */
+int si476x_i2c_xfer(struct si476x_core *core,
+		    enum si476x_i2c_type type,
+		    char *buf, int count)
+{
+	static int io_errors_count;
+	int err;
+	if (type == SI476X_I2C_SEND)
+		err = i2c_master_send(core->client, buf, count);
+	else
+		err = i2c_master_recv(core->client, buf, count);
+
+	if (err < 0) {
+		if (io_errors_count++ > MAX_IO_ERRORS)
+			si476x_core_pronounce_dead(core);
+	} else {
+		io_errors_count = 0;
+	}
+
+	return err;
+}
+EXPORT_SYMBOL_GPL(si476x_i2c_xfer);
+
+/**
+ * si476x_get_status()
+ * @core: Core device structure
+ *
+ * Get the status byte of the core device by berforming one byte I2C
+ * read.
+ *
+ * The function returns a status value or a negative error code on
+ * error.
+ */
+static int si476x_get_status(struct si476x_core *core)
+{
+	u8 response;
+	int err = si476x_i2c_xfer(core, SI476X_I2C_RECV,
+				  &response, sizeof(response));
+
+	return (err < 0) ? err : response;
+}
+
+/**
+ * si476x_get_and_signal_status() - IRQ dispatcher
+ * @core: Core device structure
+ *
+ * Dispatch the arrived interrupt request based on the value of the
+ * status byte reported by the tuner.
+ *
+ */
+static void si476x_get_and_signal_status(struct si476x_core *core)
+{
+	int status = si476x_get_status(core);
+	if (status < 0) {
+		dev_err(&core->client->dev, "Failed to get status\n");
+		return;
+	}
+
+	if (status & SI476X_CTS) {
+		/* Unfortunately completions could not be used for
+		 * signalling CTS since this flag cannot be cleared
+		 * in status byte, and therefore once it becomes true
+		 * multiple callse to 'complete' would cause the
+		 * commands following the current one to be completed
+		 * before they actually are */
+		dev_dbg(&core->client->dev, "[interrupt] CTSINT\n");
+		atomic_set(&core->cts, 1);
+		wake_up(&core->command);
+	}
+
+	if (status & SI476X_FM_RDS_INT) {
+		dev_dbg(&core->client->dev, "[interrupt] RDSINT\n");
+		si476x_core_start_rds_drainer_once(core);
+	}
+
+	if (status & SI476X_STC_INT) {
+		dev_dbg(&core->client->dev, "[interrupt] STCINT\n");
+		atomic_set(&core->stc, 1);
+		wake_up(&core->tuning);
+	}
+}
+
+static void si476x_poll_loop(struct work_struct *work)
+{
+	struct si476x_core *core = SI476X_WORK_TO_CORE(work);
+
+	si476x_get_and_signal_status(core);
+
+	if (atomic_read(&core->is_alive))
+		si476x_schedule_polling_work(core);
+}
+/**
+ */
+static irqreturn_t si476x_interrupt(int irq, void *dev)
+{
+	struct si476x_core *core = dev;
+
+	si476x_get_and_signal_status(core);
+
+	return IRQ_HANDLED;
+}
+
+/**
+ * si476x_firmware_version_to_revision()
+ * @core: Core device structure
+ * @major:  Firmware major number
+ * @minor1: Firmware first minor number
+ * @minor2: Firmware second minor number
+ *
+ * Convert a chip's firmware version number into an offset that later
+ * will be used to as offset in "vtable" of tuner functions
+ *
+ * This function returns a positive offset in case of success and a -1
+ * in case of failure.
+ */
+static inline int si476x_firmware_version_to_revision(struct si476x_core *core,
+						      int func, int major,
+						      int minor1, int minor2)
+{
+	switch (func) {
+	case SI476X_FUNC_FM_RECEIVER:
+		switch (major) {
+		case 5:
+			return SI476X_REVISION_A10;
+		case 8:
+			return SI476X_REVISION_A20;
+		case 10:
+			return SI476X_REVISION_A30;
+		default:
+			goto unknown_revision;
+		}
+	case SI476X_FUNC_AM_RECEIVER:
+		switch (major) {
+		case 5:
+			return SI476X_REVISION_A10;
+		case 7:
+			return SI476X_REVISION_A20;
+		case 9:
+			return SI476X_REVISION_A30;
+		default:
+			goto unknown_revision;
+		}
+	case SI476X_FUNC_WB_RECEIVER:
+		switch (major) {
+		case 3:
+			return SI476X_REVISION_A10;
+		case 5:
+			return SI476X_REVISION_A20;
+		case 7:
+			return SI476X_REVISION_A30;
+		default:
+			goto unknown_revision;
+		}
+	case SI476X_FUNC_BOOTLOADER:
+	default:		/* FALLTHROUG */
+		BUG();
+		return -1;
+	}
+
+unknown_revision:
+	dev_err(&core->client->dev,
+		"Unsupported version of the firmware: %d.%d.%d, "
+		"reverting to A10 comptible functions\n",
+		major, minor1, minor2);
+
+	return SI476X_REVISION_A10;
+}
+
+/**
+ * si476x_get_revision_info()
+ * @core: Core device structure
+ *
+ * Get the firmware version number of the device. It is done in
+ * following three steps:
+ *    1. Power-up the device
+ *    2. Send the 'FUNC_INFO' command
+ *    3. Powering the device down.
+ *
+ * The function return zero on success and a negative error code on
+ * failure.
+ */
+static int si476x_get_revision_info(struct si476x_core *core)
+{
+	int rval;
+	struct si476x_func_info info;
+
+	si476x_core_lock(core);
+	rval = si476x_core_set_power_state(core,
+					   SI476X_POWER_UP_FULL);
+	if (!rval) {
+		rval = si476x_core_cmd_func_info(core, &info);
+		if (!rval)
+			core->revision = \
+				si476x_firmware_version_to_revision(core,
+						    info.func,
+						    info.firmware.major,
+						    info.firmware.minor[0],
+						    info.firmware.minor[1]);
+		si476x_core_set_power_state(core,
+					    SI476X_POWER_DOWN);
+	}
+
+	si476x_core_unlock(core);
+
+	return rval;
+}
+
+#define ATOMIC_CORE_DEV_ATTR(__attr_name, __field_name)			\
+	static ssize_t __attr_name##_show(struct device *dev,		\
+					  struct device_attribute *attr, \
+					  char *buf)			\
+	{								\
+		struct i2c_client  *client;				\
+		struct si476x_core *core;				\
+									\
+		client = container_of(dev, struct i2c_client, dev);	\
+		core   = i2c_get_clientdata(client);			\
+									\
+		return sprintf(buf, "%u", atomic_read(&core->__field_name)); \
+	}								\
+	static ssize_t __attr_name##_store(struct device *dev,		\
+					   struct device_attribute *attr, \
+					   const char *buf, size_t count) \
+	{								\
+		unsigned int delay;					\
+									\
+		struct i2c_client  *client;				\
+		struct si476x_core *core;				\
+									\
+		if (sscanf(buf, "%u", &delay) != 1)			\
+			return -EINVAL;					\
+									\
+		client = container_of(dev, struct i2c_client, dev);	\
+		core   = i2c_get_clientdata(client);			\
+									\
+		atomic_set(&core->__field_name, delay);			\
+		return count;						\
+	}								\
+	static DEVICE_ATTR(__attr_name, S_IWUSR|S_IRUGO,		\
+			   __attr_name##_show, __attr_name##_store)
+
+
+ATOMIC_CORE_DEV_ATTR(polling_interval_us, polling_interval);
+ATOMIC_CORE_DEV_ATTR(tune_timeout_us, timeouts.tune);
+ATOMIC_CORE_DEV_ATTR(command_timeout_us, timeouts.command);
+ATOMIC_CORE_DEV_ATTR(power_up_timeout_us, timeouts.power_up);
+
+static struct attribute *si476x_core_attrs[] = {
+	&dev_attr_polling_interval_us.attr,
+	&dev_attr_tune_timeout_us.attr,
+	&dev_attr_command_timeout_us.attr,
+	&dev_attr_power_up_timeout_us.attr,
+	NULL
+};
+
+static struct attribute_group si476x_core_attr_group = {
+	.attrs = si476x_core_attrs,
+};
+
+
+static int __devinit si476x_core_probe(struct i2c_client *client,
+				       const struct i2c_device_id *id)
+{
+	int rval;
+	struct si476x_core          *core;
+	struct si476x_platform_data *pdata;
+	struct mfd_cell *cell;
+	int              cell_num;
+
+	core = kzalloc(sizeof(*core), GFP_KERNEL);
+	if (!core) {
+		pr_err("si476x-core: failed to allocate " \
+		       "'struct si476x_core'\n");
+		return -ENOMEM;
+	}
+
+	core->client = client;
+	i2c_set_clientdata(client, core);
+
+	atomic_set(&core->is_alive, 0);
+	core->power_state = SI476X_POWER_DOWN;
+
+	pdata = client->dev.platform_data;
+	if (pdata) {
+		memcpy(&core->power_up_parameters,
+		       &pdata->power_up_parameters,
+		       sizeof(core->power_up_parameters));
+
+		core->gpio_reset = -1;
+		if (gpio_is_valid(pdata->gpio_reset)) {
+			rval = gpio_request(pdata->gpio_reset, "si476x reset");
+			if (rval) {
+				dev_err(&client->dev,
+					"Failed to request gpio: %d\n", rval);
+				goto free_core;
+			}
+			core->gpio_reset = pdata->gpio_reset;
+			gpio_direction_output(core->gpio_reset, 0);
+		}
+
+		core->diversity_mode = pdata->diversity_mode;
+		memcpy(&core->pinmux, &pdata->pinmux,
+		       sizeof(struct si476x_pinmux));
+	} else {
+		dev_err(&client->dev, "No platform data provided\n");
+		rval = -EINVAL;
+		goto free_core;
+	}
+
+	core->supplies.vio1 = regulator_get(&client->dev, "vio1");
+	if (IS_ERR_OR_NULL(core->supplies.vio1)) {
+		dev_info(&client->dev, "No vio1 regulator found\n");
+		core->supplies.vio1 = NULL;
+	}
+
+	core->supplies.vd = regulator_get(&client->dev, "vd");
+	if (IS_ERR_OR_NULL(core->supplies.vd)) {
+		dev_info(&client->dev, "No vd regulator found" "\n");
+		core->supplies.vd = NULL;
+	}
+
+	core->supplies.va = regulator_get(&client->dev, "va");
+	if (IS_ERR_OR_NULL(core->supplies.va)) {
+		dev_info(&client->dev, "No va regulator found\n");
+		core->supplies.va = NULL;
+	}
+
+	core->supplies.vio2 = regulator_get(&client->dev, "vio2");
+	if (IS_ERR_OR_NULL(core->supplies.vio2)) {
+		dev_info(&client->dev, "No vio2 regulator found\n");
+		core->supplies.vio2 = NULL;
+	}
+
+	mutex_init(&core->cmd_lock);
+	init_waitqueue_head(&core->command);
+	init_waitqueue_head(&core->tuning);
+
+	rval = kfifo_alloc(&core->rds_fifo,
+			   SI476X_DRIVER_RDS_FIFO_DEPTH * \
+			   sizeof(struct v4l2_rds_data),
+			   GFP_KERNEL);
+	if (rval) {
+		dev_err(&client->dev, "Could not alloate the FIFO\n");
+		goto put_reg;
+	}
+	mutex_init(&core->rds_drainer_status_lock);
+	init_waitqueue_head(&core->rds_read_queue);
+	INIT_WORK(&core->rds_fifo_drainer, si476x_drain_rds_fifo);
+
+	atomic_set(&core->polling_interval, SI476X_STATUS_POLL_US);
+
+	atomic_set(&core->timeouts.tune, TIMEOUT_TUNE);
+	atomic_set(&core->timeouts.power_up, TIMEOUT_POWER_UP);
+	atomic_set(&core->timeouts.command, DEFAULT_TIMEOUT);
+
+
+	rval = sysfs_create_group(&client->dev.kobj, &si476x_core_attr_group);
+	if (rval < 0) {
+		dev_err(&client->dev, "Failed to create sysfs attributes\n");
+		goto free_kfifo;
+	}
+
+	if (client->irq) {
+		rval = request_threaded_irq(client->irq, NULL, si476x_interrupt,
+					    IRQF_TRIGGER_FALLING,
+					    client->name, core);
+		if (rval < 0) {
+			dev_err(&client->dev, "Could not request IRQ %d\n",
+				client->irq);
+			goto free_sysfs;
+		}
+		disable_irq(client->irq);
+		dev_dbg(&client->dev, "IRQ requested.\n");
+
+		core->rds_fifo_depth = 20;
+	} else {
+		INIT_DELAYED_WORK(&core->status_monitor,
+				  si476x_poll_loop);
+		dev_info(&client->dev,
+			 "No IRQ number specified, will use polling\n");
+
+		core->rds_fifo_depth = 5;
+	}
+
+	core->chip_id = id->driver_data;
+
+	rval = si476x_get_revision_info(core);
+	if (rval < 0) {
+		rval = -ENODEV;
+		goto free_irq;
+	}
+
+	cell_num = 0;
+
+	cell = &core->cells[SI476X_RADIO_CELL];
+	cell->name          = "si476x-radio";
+	cell->platform_data = &core;
+	cell->pdata_size    = sizeof(core);
+	cell_num++;
+
+	if (core->chip_id < 5                           &&
+	    core->pinmux.dclk == SI476X_DCLK_DAUDIO     &&
+	    core->pinmux.dfs  == SI476X_DFS_DAUDIO      &&
+	    core->pinmux.dout == SI476X_DOUT_I2S_OUTPUT &&
+	    core->pinmux.xout == SI476X_XOUT_TRISTATE) {
+		cell = &core->cells[SI476X_CODEC_CELL];
+		cell->name          = "si476x-codec";
+		cell->platform_data = &core;
+		cell->pdata_size    = sizeof(core);
+		cell_num++;
+	}
+
+	kref_init(&core->kref);
+	rval = mfd_add_devices(&client->dev,
+			       (client->adapter->nr << 8) + client->addr,
+			       core->cells, cell_num, NULL, 0);
+	if (!rval)
+		return 0;
+
+
+free_irq:
+	if (client->irq)
+		free_irq(client->irq, core);
+free_sysfs:
+	sysfs_remove_group(&client->dev.kobj, &si476x_core_attr_group);
+free_kfifo:
+	kfifo_free(&core->rds_fifo);
+
+put_reg:
+	if (core->supplies.vio2)
+		regulator_put(core->supplies.vio2);
+	if (core->supplies.va)
+		regulator_put(core->supplies.va);
+	if (core->supplies.vd)
+		regulator_put(core->supplies.vd);
+	if (core->supplies.vio1)
+		regulator_put(core->supplies.vio1);
+	if (gpio_is_valid(core->gpio_reset))
+		gpio_free(core->gpio_reset);
+free_core:
+	kfree(core);
+	return rval;
+}
+
+static void si476x_core_delete(struct kref *kref)
+{
+	struct si476x_core *core = kref_to_si476x_core(kref);
+
+	kfifo_free(&core->rds_fifo);
+	kfree(core);
+}
+
+void si476x_core_get(struct si476x_core *core)
+{
+	kref_get(&core->kref);
+}
+EXPORT_SYMBOL_GPL(si476x_core_get);
+
+void si476x_core_put(struct si476x_core *core)
+{
+	kref_put(&core->kref, si476x_core_delete);
+}
+EXPORT_SYMBOL_GPL(si476x_core_put);
+
+static int si476x_core_remove(struct i2c_client *client)
+{
+	struct si476x_core *core = i2c_get_clientdata(client);
+
+	si476x_core_pronounce_dead(core);
+
+	mfd_remove_devices(&client->dev);
+
+	if (client->irq) {
+		disable_irq(client->irq);
+		free_irq(client->irq, core);
+	} else {
+		cancel_delayed_work_sync(&core->status_monitor);
+	}
+
+	sysfs_remove_group(&client->dev.kobj, &si476x_core_attr_group);
+
+	if (core->supplies.vio2)
+		regulator_put(core->supplies.vio2);
+	if (core->supplies.va)
+		regulator_put(core->supplies.va);
+	if (core->supplies.vd)
+		regulator_put(core->supplies.vd);
+	if (core->supplies.vio1)
+		regulator_put(core->supplies.vio1);
+
+	if (gpio_is_valid(core->gpio_reset))
+		gpio_free(core->gpio_reset);
+
+	si476x_core_put(core);
+
+	return 0;
+}
+
+
+static const struct i2c_device_id si476x_id[] = {
+	{ "si4761", 1 },
+	{ "si4764", 4 },
+	{ "si4768", 8 },
+	{ },
+};
+MODULE_DEVICE_TABLE(i2c, si476x_id);
+
+static struct i2c_driver si476x_core_driver = {
+	.driver		= {
+		.name	= "si476x-core",
+		.owner  = THIS_MODULE,
+	},
+	.probe		= si476x_core_probe,
+	.remove         = __devexit_p(si476x_core_remove),
+	.id_table       = si476x_id,
+};
+
+static int __init si476x_core_init(void)
+{
+	return i2c_add_driver(&si476x_core_driver);
+}
+
+static void __exit si476x_core_exit(void)
+{
+	i2c_del_driver(&si476x_core_driver);
+}
+late_initcall(si476x_core_init);
+module_exit(si476x_core_exit);
+
+
+MODULE_AUTHOR("Andrey Smirnov <andrey.smirnov@convergeddevices.net>");
+MODULE_DESCRIPTION("Si4761/64/68 AM/FM MFD core device driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/mfd/si476x-prop.c b/drivers/mfd/si476x-prop.c
new file mode 100644
index 0000000..d633c08
--- /dev/null
+++ b/drivers/mfd/si476x-prop.c
@@ -0,0 +1,477 @@
+/*
+ * include/media/si476x-prop.c -- Subroutines to manipulate with
+ * properties of si476x chips
+ *
+ * Copyright (C) 2012 Innovative Converged Devices(ICD)
+ *
+ * Author: Andrey Smirnov <andrey.smirnov@convergeddevices.net>
+ *
+ * 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 program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ */
+#include <linux/module.h>
+
+#include <media/si476x.h>
+#include <linux/mfd/si476x-core.h>
+
+
+enum si476x_common_receiver_properties {
+	SI476X_PROP_INT_CTL_ENABLE			= 0x0000,
+	SI476X_PROP_DIGITAL_IO_INPUT_SAMPLE_RATE	= 0x0200,
+	SI476X_PROP_DIGITAL_IO_INPUT_FORMAT		= 0x0201,
+	SI476X_PROP_DIGITAL_IO_OUTPUT_SAMPLE_RATE	= 0x0202,
+	SI476X_PROP_DIGITAL_IO_OUTPUT_FORMAT		= 0x0203,
+
+	SI476X_PROP_AUDIO_ANALOG_VOLUME			= 0x0300,
+	SI476X_PROP_AUDIO_MUTE				= 0x0301,
+
+	SI476X_PROP_ZIF_OUTPUT_CFG			= 0x0600,
+
+	SI476X_PROP_SEEK_BAND_BOTTOM			= 0x1100,
+	SI476X_PROP_SEEK_BAND_TOP			= 0x1101,
+	SI476X_PROP_SEEK_FREQUENCY_SPACING		= 0x1102,
+
+	SI476X_PROP_VALID_MAX_TUNE_ERROR		= 0x2000,
+	SI476X_PROP_VALID_SNR_THRESHOLD			= 0x2003,
+
+	SI476X_PROP_VALID_RSSI_THRESHOLD		= 0x2004,
+};
+
+enum si476x_am_receiver_properties {
+	SI476X_PROP_AUDIO_PWR_LINE_FILTER		= 0x0303,
+};
+
+enum si476x_fm_receiver_properties {
+	SI476X_PROP_AUDIO_DEEMPHASIS				= 0x0302,
+
+	SI476X_PROP_FM_VALID_RSSI_TIME				= 0x2001,
+	SI476X_PROP_FM_VALID_SNR_TIME				= 0x2002,
+	SI476X_PROP_FM_VALID_AF_TIME				= 0x2007,
+
+	SI476X_PROP_FM_RDS_INTERRUPT_SOURCE			= 0x4000,
+	SI476X_PROP_FM_RDS_INTERRUPT_FIFO_COUNT			= 0x4001,
+	SI476X_PROP_FM_RDS_CONFIG				= 0x4002,
+};
+
+struct si476x_property_range {
+	u16 low, high;
+};
+
+static bool __element_is_in_array(u16 element, const u16 array[], size_t size)
+{
+	int i;
+
+	for (i = 0; i < size; i++)
+		if (element == array[i])
+			return true;
+
+	return false;
+}
+
+static bool __element_is_in_range(u16 element,
+				  const struct si476x_property_range range[],
+				  size_t size)
+{
+	int i;
+
+	for (i = 0; i < size; i++)
+		if (element <= range[i].high && element >= range[i].low)
+			return true;
+
+	return false;
+}
+
+static bool si476x_core_is_valid_property_a10(struct si476x_core *core,
+					      u16 property)
+{
+	static const u16 valid_properties[] = {
+		0x0000,
+		0x0500, 0x0501,
+		0x0600,
+		0x0709, 0x070C, 0x070D, 0x70E, 0x710,
+		0x718,		/* FIXME: Magic property */
+		0x1207, 0x1208,
+		0x2007,
+		0x2300,
+	};
+
+	static const struct si476x_property_range valid_ranges[] = {
+		{ 0x0200, 0x0203 },
+		{ 0x0300, 0x0303 },
+		{ 0x0400, 0x0404 },
+		{ 0x0700, 0x0707 },
+		{ 0x1100, 0x1102 },
+		{ 0x1200, 0x1204 },
+		{ 0x1300, 0x1306 },
+		{ 0x2000, 0x2005 },
+		{ 0x2100, 0x2104 },
+		{ 0x2106, 0x2106 },
+		{ 0x2200, 0x220E },
+		{ 0x3100, 0x3104 },
+		{ 0x3207, 0x320F },
+		{ 0x3300, 0x3304 },
+		{ 0x3500, 0x3517 },
+		{ 0x3600, 0x3617 },
+		{ 0x3700, 0x3717 },
+		{ 0x4000, 0x4003 },
+	};
+
+	return	__element_is_in_range(property, valid_ranges,
+				     ARRAY_SIZE(valid_ranges)) ||
+		__element_is_in_array(property, valid_properties,
+				      ARRAY_SIZE(valid_properties));
+}
+
+static bool si476x_core_is_valid_property_a20(struct si476x_core *core,
+					      u16 property)
+{
+	static const u16 valid_properties[] = {
+		0x071B,
+		0x1006,
+		0x2210,
+		0x3401,
+	};
+
+	static const struct si476x_property_range valid_ranges[] = {
+		{ 0x2215, 0x2219 },
+	};
+
+	return	si476x_core_is_valid_property_a10(core, property) ||
+		__element_is_in_range(property, valid_ranges,
+				      ARRAY_SIZE(valid_ranges))  ||
+		__element_is_in_array(property, valid_properties,
+				      ARRAY_SIZE(valid_properties));
+}
+
+static bool si476x_core_is_valid_property_a30(struct si476x_core *core,
+					      u16 property)
+{
+	static const u16 valid_properties[] = {
+		0x071C, 0x071D,
+		0x1007, 0x1008,
+		0x220F, 0x2214,
+		0x2301,
+		0x3105, 0x3106,
+		0x3402,
+	};
+
+	static const struct si476x_property_range valid_ranges[] = {
+		{ 0x0405, 0x0411 },
+		{ 0x2008, 0x200B },
+		{ 0x2220, 0x2223 },
+		{ 0x3100, 0x3106 },
+	};
+
+	return	si476x_core_is_valid_property_a20(core, property) ||
+		__element_is_in_range(property, valid_ranges,
+				      ARRAY_SIZE(valid_ranges)) ||
+		__element_is_in_array(property, valid_properties,
+				      ARRAY_SIZE(valid_properties));
+}
+
+typedef bool (*valid_property_pred_t) (struct si476x_core *, u16);
+
+bool si476x_core_is_valid_property(struct si476x_core *core, u16 property)
+{
+	static const valid_property_pred_t is_valid_property[] = {
+		[SI476X_REVISION_A10] = si476x_core_is_valid_property_a10,
+		[SI476X_REVISION_A20] = si476x_core_is_valid_property_a20,
+		[SI476X_REVISION_A30] = si476x_core_is_valid_property_a30,
+	};
+
+	BUG_ON(core->revision > SI476X_REVISION_A30 ||
+	       core->revision == -1);
+	return is_valid_property[core->revision](core, property);
+}
+EXPORT_SYMBOL_GPL(si476x_core_is_valid_property);
+
+bool si476x_core_is_readonly_property(struct si476x_core *core, u16 property)
+{
+	BUG_ON(core->revision > SI476X_REVISION_A30 ||
+	       core->revision == -1);
+
+	switch (core->revision) {
+	case SI476X_REVISION_A10:
+		return (property == 0x3200);
+	case SI476X_REVISION_A20:
+		return (property == 0x1006 ||
+			property == 0x2210 ||
+			property == 0x3200);
+	case SI476X_REVISION_A30:
+		return false;
+	}
+
+	return false;
+}
+EXPORT_SYMBOL_GPL(si476x_core_is_readonly_property);
+
+int si476x_core_set_int_ctl_enable(struct si476x_core *core,
+				   enum si476x_interrupt_flags flags)
+{
+	return si476x_core_cmd_set_property(core,
+					    SI476X_PROP_INT_CTL_ENABLE, flags);
+}
+EXPORT_SYMBOL_GPL(si476x_core_set_int_ctl_enable);
+
+
+int si476x_core_set_audio_pwr_line_filter(struct si476x_core *core,
+					bool enable,
+					enum si476x_power_grid_type power_grid,
+					int harmonics_count)
+{
+	const u16 value = (enable << 9) | (power_grid << 8) | harmonics_count;
+
+	return si476x_core_cmd_set_property(core,
+					    SI476X_PROP_AUDIO_PWR_LINE_FILTER,
+					    value);
+}
+EXPORT_SYMBOL_GPL(si476x_core_set_audio_pwr_line_filter);
+
+int si476x_core_get_audio_pwr_line_filter(struct si476x_core *core)
+{
+	return si476x_core_cmd_get_property(core,
+					    SI476X_PROP_AUDIO_PWR_LINE_FILTER);
+}
+EXPORT_SYMBOL_GPL(si476x_core_get_audio_pwr_line_filter);
+
+int si476x_core_set_frequency_spacing(struct si476x_core *core, int spacing)
+{
+	/* FIXME: Magic numbers */
+	if (0 < spacing && spacing <= 310000)
+		return si476x_core_cmd_set_property(core,
+					SI476X_PROP_SEEK_FREQUENCY_SPACING,
+					hz_to_si476x(core, spacing));
+	else
+		return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(si476x_core_set_frequency_spacing);
+
+int si476x_core_get_frequency_spacing(struct si476x_core *core)
+{
+	int value;
+	value = si476x_core_cmd_get_property(core,
+					SI476X_PROP_SEEK_FREQUENCY_SPACING);
+	if (value >= 0)
+		value = si476x_to_hz(core, value);
+
+	return value;
+}
+EXPORT_SYMBOL_GPL(si476x_core_get_frequency_spacing);
+
+int si476x_core_set_seek_band_top(struct si476x_core *core,
+				  int top)
+{
+	return si476x_core_cmd_set_property(core,
+					    SI476X_PROP_SEEK_BAND_TOP,
+					    hz_to_si476x(core, top));
+}
+EXPORT_SYMBOL_GPL(si476x_core_set_seek_band_top);
+
+int si476x_core_get_seek_band_top(struct si476x_core *core)
+{
+	int value;
+	value = si476x_core_cmd_get_property(core,
+					     SI476X_PROP_SEEK_BAND_TOP);
+	if (value >= 0)
+		value = si476x_to_hz(core, value);
+
+	return value;
+}
+EXPORT_SYMBOL_GPL(si476x_core_get_seek_band_top);
+
+int si476x_core_set_seek_band_bottom(struct si476x_core *core,
+				     int bottom)
+{
+	return si476x_core_cmd_set_property(core,
+					   SI476X_PROP_SEEK_BAND_BOTTOM,
+					    hz_to_si476x(core, bottom));
+}
+EXPORT_SYMBOL_GPL(si476x_core_set_seek_band_bottom);
+
+int si476x_core_get_seek_band_bottom(struct si476x_core *core)
+{
+	int value;
+	value = si476x_core_cmd_get_property(core,
+					     SI476X_PROP_SEEK_BAND_BOTTOM);
+	if (value >= 0)
+		value = si476x_to_hz(core, value);
+
+	return value;
+}
+EXPORT_SYMBOL_GPL(si476x_core_get_seek_band_bottom);
+
+int si476x_core_set_audio_deemphasis(struct si476x_core *core,
+				     int deemphasis)
+{
+	return si476x_core_cmd_set_property(core,
+					    SI476X_PROP_AUDIO_DEEMPHASIS,
+					    deemphasis);
+}
+EXPORT_SYMBOL_GPL(si476x_core_set_audio_deemphasis);
+
+int si476x_core_get_audio_deemphasis(struct si476x_core *core)
+{
+	int value;
+	value = si476x_core_cmd_get_property(core,
+					     SI476X_PROP_AUDIO_DEEMPHASIS);
+	if (value >= 0)
+		value = si476x_to_hz(core, value);
+
+	return value;
+}
+EXPORT_SYMBOL_GPL(si476x_core_get_audio_deemphasis);
+
+int si476x_core_set_fm_rds_interrupt_fifo_count(struct si476x_core *core,
+						int count)
+{
+	return si476x_core_cmd_set_property(core,
+				       SI476X_PROP_FM_RDS_INTERRUPT_FIFO_COUNT,
+				       count);
+}
+EXPORT_SYMBOL_GPL(si476x_core_set_fm_rds_interrupt_fifo_count);
+
+int si476x_core_set_rds_interrupt_source(struct si476x_core *core,
+				    enum si476x_rdsint_sources sources)
+{
+	return si476x_core_cmd_set_property(core,
+				       SI476X_PROP_FM_RDS_INTERRUPT_SOURCE,
+				       sources);
+}
+EXPORT_SYMBOL_GPL(si476x_core_set_rds_interrupt_source);
+
+int si476x_core_set_digital_io_input_sample_rate(struct si476x_core *core,
+					    u16 rate)
+{
+	return si476x_core_cmd_set_property(core,
+				SI476X_PROP_DIGITAL_IO_INPUT_SAMPLE_RATE,
+				rate);
+}
+EXPORT_SYMBOL_GPL(si476x_core_set_digital_io_input_sample_rate);
+
+int si476x_core_disable_digital_audio(struct si476x_core *core)
+{
+	return si476x_core_set_digital_io_input_sample_rate(core, 0);
+}
+EXPORT_SYMBOL_GPL(si476x_core_disable_digital_audio);
+
+int si476x_core_set_valid_snr_threshold(struct si476x_core *core, int threshold)
+{
+	return si476x_core_cmd_set_property(core,
+					    SI476X_PROP_VALID_SNR_THRESHOLD,
+					    threshold);
+
+}
+EXPORT_SYMBOL_GPL(si476x_core_set_valid_snr_threshold);
+
+int si476x_core_get_valid_snr_threshold(struct si476x_core *core)
+{
+	return si476x_core_cmd_get_property(core,
+					    SI476X_PROP_VALID_SNR_THRESHOLD);
+}
+EXPORT_SYMBOL_GPL(si476x_core_get_valid_snr_threshold);
+
+int si476x_core_set_valid_rssi_threshold(struct si476x_core *core,
+					 int threshold)
+{
+	return si476x_core_cmd_set_property(core,
+					    SI476X_PROP_VALID_RSSI_THRESHOLD,
+					    threshold);
+}
+EXPORT_SYMBOL_GPL(si476x_core_set_valid_rssi_threshold);
+
+int si476x_core_get_valid_rssi_threshold(struct si476x_core *core)
+{
+	return si476x_core_cmd_get_property(core,
+					    SI476X_PROP_VALID_RSSI_THRESHOLD);
+}
+EXPORT_SYMBOL_GPL(si476x_core_get_valid_rssi_threshold);
+
+int si476x_core_set_valid_max_tune_error(struct si476x_core *core, int value)
+{
+	return si476x_core_cmd_set_property(core,
+					    SI476X_PROP_VALID_MAX_TUNE_ERROR,
+					    value);
+}
+EXPORT_SYMBOL_GPL(si476x_core_set_valid_max_tune_error);
+
+int si476x_core_get_valid_max_tune_error(struct si476x_core *core)
+{
+	return si476x_core_cmd_get_property(core,
+					    SI476X_PROP_VALID_MAX_TUNE_ERROR);
+}
+EXPORT_SYMBOL_GPL(si476x_core_get_valid_max_tune_error);
+
+
+#define SI476X_RDSEN 0x1
+
+int si476x_core_get_rds_reception(struct si476x_core *core)
+{
+	int property = si476x_core_cmd_get_property(core,
+						    SI476X_PROP_FM_RDS_CONFIG);
+
+	return (property < 0) ? property : (property & SI476X_RDSEN);
+}
+EXPORT_SYMBOL_GPL(si476x_core_get_rds_reception);
+
+static int __set_rdsen(struct si476x_core *core, bool rdsen)
+{
+	int property = si476x_core_cmd_get_property(core,
+					   SI476X_PROP_FM_RDS_CONFIG);
+	if (property >= 0) {
+		property = (rdsen) ?
+			(property | SI476X_RDSEN) :
+			(property & ~SI476X_RDSEN);
+
+		return si476x_core_cmd_set_property(core,
+						    SI476X_PROP_FM_RDS_CONFIG,
+						    property);
+	} else {
+		return property;
+	}
+}
+
+int si476x_core_set_rds_reception(struct si476x_core *core, int enable)
+{
+	int err;
+
+	if (enable) {
+		err = si476x_core_set_fm_rds_interrupt_fifo_count(core,
+							core->rds_fifo_depth);
+		if (err < 0) {
+			dev_err(&core->client->dev, "Failed to set RDS FIFO " \
+				"count\n");
+			goto exit;
+		}
+
+		err = si476x_core_set_rds_interrupt_source(core,
+							   SI476X_RDSRECV);
+		if (err < 0) {
+			dev_err(&core->client->dev,
+				"Failed to set RDS interrupt sources\n");
+			goto exit;
+		}
+
+		/* Drain RDS FIFO befor enabling RDS processing */
+		err = si476x_core_cmd_fm_rds_status(core, false,
+						    true, true, NULL);
+		if (err < 0) {
+			dev_err(&core->client->dev,
+				"Failed to drain RDS queue\n");
+			goto exit;
+		}
+
+		err = __set_rdsen(core, true);
+	} else {
+		err = __set_rdsen(core, false);
+	}
+
+exit:
+	return err;
+}
+EXPORT_SYMBOL_GPL(si476x_core_set_rds_reception);
diff --git a/include/linux/mfd/si476x-core.h b/include/linux/mfd/si476x-core.h
new file mode 100644
index 0000000..e810bf6
--- /dev/null
+++ b/include/linux/mfd/si476x-core.h
@@ -0,0 +1,522 @@
+/*
+ * include/media/si476x-core.h -- Common definitions for si476x core
+ * device
+ *
+ * Copyright (C) 2012 Innovative Converged Devices(ICD)
+ *
+ * Author: Andrey Smirnov <andrey.smirnov@convergeddevices.net>
+ *
+ * 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 program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ */
+
+#ifndef SI476X_CORE_H
+#define SI476X_CORE_H
+
+#include <linux/kfifo.h>
+#include <linux/atomic.h>
+#include <linux/i2c.h>
+#include <linux/mutex.h>
+#include <linux/mfd/core.h>
+#include <linux/videodev2.h>
+
+#include <media/si476x.h>
+
+#ifdef DEBUG
+#define DBG_BUFFER(device, header, buffer, bcount)			\
+	do {								\
+		dev_info((device), header);				\
+		print_hex_dump_bytes("",				\
+				     DUMP_PREFIX_OFFSET,		\
+				     buffer, bcount);			\
+	} while (0)
+#else
+#define DBG_BUFFER(device, header, buffer, bcount)			\
+	do {} while (0)
+#endif
+
+
+enum si476x_mfd_cells {
+	SI476X_RADIO_CELL = 0,
+	SI476X_CODEC_CELL,
+	SI476X_MFD_CELLS,
+};
+
+
+/**
+ * enum si476x_power_state - possible power state of the si476x
+ * device.
+ *
+ * @SI476X_POWER_DOWN: In this state all regulators are turned off
+ * and the reset line is pulled low. The device is completely
+ * inactive.
+ * @SI476X_POWER_UP_FULL: In this state all the power regualtors are
+ * turned on, reset line pulled high, IRQ line is enabled(polling is
+ * active for polling use scenario) and device is turned on with
+ * POWER_UP command. The device is ready to be used.
+ * @SI476X_POWER_INCONSISTENT: This state indicates that previous
+ * power down was inconsisten meaning some of he regulators wer not
+ * turned down and thus the consequent use of the device, without
+ * power-cycling it is impossible.
+ */
+enum si476x_power_state {
+	SI476X_POWER_DOWN		= 0,
+	SI476X_POWER_UP_FULL		= 1,
+	SI476X_POWER_INCONSISTENT	= 2,
+};
+
+/**
+ * struct si476x_core - internal data structure representing the
+ * underlying "core" device which all the MFD cell-devices use.
+ *
+ * @client: Actual I2C client used to transfer commands to the chip.
+ * @chip_id: Last digit of the chip model(E.g. "1" for SI4761)
+ * @cells: MFD cell devices created by this driver.
+ * @cmd_lock: Mutex used to serialize all the requests to the core
+ * device. This filed should not be used directly. Instead
+ * si476x_core_lock()/si476x_core_unlock() should be used to get
+ * exclusive access to the "core" device.
+ * @users: Active users counter(Used by the radio cell)
+ * @rds_read_queue: Wait queue used to wait for RDS data.
+ * @rds_fifo: FIFO in which all the RDS data received from the chip is
+ * placed.
+ * @rds_fifo_drainer: Worker that drains on-chip RDS FIFO.
+ * @rds_drainer_is_working: Flag used for launching only one instance
+ * of the @rds_fifo_drainer.
+ * @rds_drainer_status_lock: Lock used to guard access to the
+ * @rds_drainer_is_working variable.
+ * @command: Wait queue for wainting on the command comapletion.
+ * @cts: Clear To Send flag set upon receiving first status with CTS
+ * set.
+ * @tuning: Wait queue used for wainting for tune/seek comand
+ * completion.
+ * @stc: Similar to @cts, but for the STC bit of the status value.
+ * @power_up_parameters: Parameters used as argument for POWER_UP
+ * command when the device is started.
+ * @state: Current power state of the device.
+ * @supplues: Structure containing handles to all power supplies used
+ * by the device (NULL ones are ignored).
+ * @gpio_reset: GPIO pin connectet to the RSTB pin of the chip.
+ * @pinmux: Chip's configurable pins configuration.
+ * @diversity_mode: Chips role when functioning in diversity mode.
+ * @status_monitor: Polling worker used in polling use case scenarion
+ * (when IRQ is not avalible).
+ * @revision: Chip's running firmware revision number(Used for correct
+ * command set support).
+ */
+
+struct si476x_core {
+	struct i2c_client *client;
+	int chip_id;
+	struct mfd_cell cells[SI476X_MFD_CELLS];
+
+	struct mutex cmd_lock; /* for serializing fm radio operations */
+	atomic_t users;
+
+	wait_queue_head_t  rds_read_queue;
+	struct kfifo       rds_fifo;
+	struct work_struct rds_fifo_drainer;
+	bool               rds_drainer_is_working;
+	struct mutex       rds_drainer_status_lock;
+
+
+	wait_queue_head_t command;
+	atomic_t          cts;
+
+	wait_queue_head_t tuning;
+	atomic_t          stc;
+
+	struct si476x_power_up_args power_up_parameters;
+
+	enum si476x_power_state power_state;
+
+	struct {
+		struct regulator *vio1;
+		struct regulator *vd;
+		struct regulator *va;
+		struct regulator *vio2;
+	} supplies;
+
+	int gpio_reset;
+
+	struct si476x_pinmux pinmux;
+	enum si476x_phase_diversity_mode diversity_mode;
+
+	atomic_t is_alive;
+
+	struct delayed_work status_monitor;
+#define SI476X_WORK_TO_CORE(w) container_of(to_delayed_work(w),	\
+					    struct si476x_core,	\
+					    status_monitor)
+
+	int revision;
+
+	int rds_fifo_depth;
+
+	struct {
+		atomic_t tune;
+		atomic_t power_up;
+		atomic_t command;
+	} timeouts;
+
+	atomic_t polling_interval;
+
+	struct kref kref;
+};
+
+static inline struct si476x_core *kref_to_si476x_core(struct kref *d)
+{
+	return container_of(d, struct si476x_core, kref);
+}
+
+
+/**
+ * si476x_core_lock() - lock the core device to get an exclusive acces
+ * to it.
+ */
+static inline void si476x_core_lock(struct si476x_core *core)
+{
+	mutex_lock(&core->cmd_lock);
+}
+
+/**
+ * si476x_core_unlock() - unlock the core device to relinquish an
+ * exclusive acces to it.
+ */
+static inline void si476x_core_unlock(struct si476x_core *core)
+{
+	mutex_unlock(&core->cmd_lock);
+}
+
+void si476x_core_get(struct si476x_core *core);
+void si476x_core_put(struct si476x_core *core);
+
+
+/* *_TUNE_FREQ family of commands accept frequency in multiples of
+    10kHz */
+static inline u16 hz_to_si476x(struct si476x_core *core, int freq)
+{
+	u16 result;
+
+	switch (core->power_up_parameters.func) {
+	default:
+	case SI476X_FUNC_FM_RECEIVER:
+		result = freq / 10000;
+		break;
+	case SI476X_FUNC_AM_RECEIVER:
+		result = freq / 1000;
+		break;
+	}
+
+	return result;
+}
+
+static inline int si476x_to_hz(struct si476x_core *core, u16 freq)
+{
+	int result;
+
+	switch (core->power_up_parameters.func) {
+	default:
+	case SI476X_FUNC_FM_RECEIVER:
+		result = freq * 10000;
+		break;
+	case SI476X_FUNC_AM_RECEIVER:
+		result = freq * 1000;
+		break;
+	}
+
+	return result;
+}
+
+/* Since the V4L2_TUNER_CAP_LOW flag is supplied, V4L2 subsystem
+ * mesures frequency in 62.5 Hz units */
+
+static inline int hz_to_v4l2(int freq)
+{
+	return (freq * 10) / 625;
+}
+
+static inline int v4l2_to_hz(int freq)
+{
+	return (freq * 625) / 10;
+}
+
+static inline u16 v4l2_to_si476x(struct si476x_core *core, int freq)
+{
+	return hz_to_si476x(core, v4l2_to_hz(freq));
+}
+
+static inline int si476x_to_v4l2(struct si476x_core *core, u16 freq)
+{
+	return hz_to_v4l2(si476x_to_hz(core, freq));
+}
+
+
+
+/**
+ * struct si476x_func_info - structure containing result of the
+ * FUNC_INFO command.
+ *
+ * @firmware.major: Firmare major number.
+ * @firmware.minor[...]: Firmare minor numbers.
+ * @patch_id:
+ * @func: Mode tuner is working in.
+ */
+struct si476x_func_info {
+	struct {
+		u8 major, minor[2];
+	} firmware;
+	u16 patch_id;
+	enum si476x_func func;
+};
+
+/**
+ * struct si476x_power_down_args - structure used to pass parameters
+ * to POWER_DOWN command
+ *
+ * @xosc: true - Power down, but leav oscillator running.
+ *        false - Full power down.
+ */
+struct si476x_power_down_args {
+	bool xosc;
+};
+
+/**
+ * enum si476x_tunemode - enum representing possible tune modes for
+ * the chip.
+ * @SI476X_TM_VALIDATED_NORMAL_TUNE: Unconditionally stay on the new
+ * channel after tune, tune status is valid.
+ * @SI476X_TM_INVALIDATED_FAST_TUNE: Unconditionally stay in the new
+ * channel after tune, tune status invalid.
+ * @SI476X_TM_VALIDATED_AF_TUNE: Jump back to previous channel if
+ * metric thresholds are not met.
+ * @SI476X_TM_VALIDATED_AF_CHECK: Unconditionally jump back to the
+ * previous channel.
+ */
+enum si476x_tunemode {
+	SI476X_TM_VALIDATED_NORMAL_TUNE = 0,
+	SI476X_TM_INVALIDATED_FAST_TUNE = 1,
+	SI476X_TM_VALIDATED_AF_TUNE     = 2,
+	SI476X_TM_VALIDATED_AF_CHECK    = 3,
+};
+
+/**
+ * enum si476x_smoothmetrics - enum containing the possible setting fo
+ * audio transitioning of the chip
+ * @SI476X_SM_INITIALIZE_AUDIO: Initialize audio state to match this
+ * new channel
+ * @SI476X_SM_TRANSITION_AUDIO: Transition audio state from previous
+ * channel values to the new values
+ */
+enum si476x_smoothmetrics {
+	SI476X_SM_INITIALIZE_AUDIO = 0,
+	SI476X_SM_TRANSITION_AUDIO = 1,
+};
+
+/**
+ * struct si476x_rds_status_report - the structure representing the
+ * response to 'FM_RD_STATUS' command
+ * @rdstpptyint: Traffic program flag(TP) and/or program type(PTY)
+ * code has changed.
+ * @rdspiint: Program indentifiaction(PI) code has changed.
+ * @rdssyncint: RDS synchronization has changed.
+ * @rdsfifoint: RDS was received and the RDS FIFO has at least
+ * 'FM_RDS_INTERRUPT_FIFO_COUNT' elements in it.
+ * @tpptyvalid: TP flag and PTY code are valid falg.
+ * @pivalid: PI code is valid flag.
+ * @rdssync: RDS is currently synchronized.
+ * @rdsfifolost: On or more RDS groups have been lost/discarded flag.
+ * @tp: Current channel's TP flag.
+ * @pty: Current channel's PTY code.
+ * @pi: Current channel's PI code.
+ * @rdsfifoused: Number of blocks remaining in the RDS FIFO (0 if
+ * empty).
+ */
+struct si476x_rds_status_report {
+	bool rdstpptyint, rdspiint, rdssyncint, rdsfifoint;
+	bool tpptyvalid, pivalid, rdssync, rdsfifolost;
+	bool tp;
+
+	u8 pty;
+	u16 pi;
+
+	u8 rdsfifoused;
+	u8 ble[4];
+
+	struct v4l2_rds_data rds[4];
+};
+
+struct si476x_rsq_status_args {
+	bool primary;
+	bool rsqack;
+	bool attune;
+	bool cancel;
+	bool stcack;
+};
+
+enum si476x_injside {
+	SI476X_INJSIDE_AUTO	= 0,
+	SI476X_INJSIDE_LOW	= 1,
+	SI476X_INJSIDE_HIGH	= 2,
+};
+
+struct si476x_tune_freq_args {
+	bool zifsr;
+	bool hd;
+	enum si476x_injside injside;
+	int freq;
+	enum si476x_tunemode tunemode;
+	enum si476x_smoothmetrics smoothmetrics;
+	int antcap;
+};
+
+int si476x_core_stop(struct si476x_core *, bool);
+int si476x_core_start(struct si476x_core *, bool);
+int si476x_core_set_power_state(struct si476x_core *, enum si476x_power_state);
+int si476x_core_cmd_func_info(struct si476x_core *, struct si476x_func_info *);
+int si476x_core_cmd_set_property(struct si476x_core *, u16, u16);
+int si476x_core_cmd_get_property(struct si476x_core *, u16);
+int si476x_core_cmd_dig_audio_pin_cfg(struct si476x_core *,
+				      enum si476x_dclk_config,
+				      enum si476x_dfs_config,
+				      enum si476x_dout_config,
+				      enum si476x_xout_config);
+int si476x_core_cmd_zif_pin_cfg(struct si476x_core *,
+				enum si476x_iqclk_config,
+				enum si476x_iqfs_config,
+				enum si476x_iout_config,
+				enum si476x_qout_config);
+int si476x_core_cmd_ic_link_gpo_ctl_pin_cfg(struct si476x_core *,
+					    enum si476x_icin_config,
+					    enum si476x_icip_config,
+					    enum si476x_icon_config,
+					    enum si476x_icop_config);
+int si476x_core_cmd_ana_audio_pin_cfg(struct si476x_core *,
+				      enum si476x_lrout_config);
+int si476x_core_cmd_intb_pin_cfg(struct si476x_core *, enum si476x_intb_config,
+				 enum si476x_a1_config);
+int si476x_core_cmd_fm_seek_start(struct si476x_core *, bool, bool);
+int si476x_core_cmd_am_seek_start(struct si476x_core *, bool, bool);
+int si476x_core_cmd_fm_rds_status(struct si476x_core *, bool, bool, bool,
+				  struct si476x_rds_status_report *);
+int si476x_core_cmd_fm_rds_blockcount(struct si476x_core *, bool,
+				      struct si476x_rds_blockcount_report *);
+int si476x_core_cmd_fm_tune_freq(struct si476x_core *,
+				 struct si476x_tune_freq_args *);
+int si476x_core_cmd_am_tune_freq(struct si476x_core *,
+				 struct si476x_tune_freq_args *);
+int si476x_core_cmd_am_rsq_status(struct si476x_core *,
+				  struct si476x_rsq_status_args *,
+				  struct si476x_rsq_status_report *);
+int si476x_core_cmd_fm_rsq_status(struct si476x_core *,
+				  struct si476x_rsq_status_args *,
+				  struct si476x_rsq_status_report *);
+int si476x_core_cmd_power_up(struct si476x_core *,
+			     struct si476x_power_up_args *);
+int si476x_core_cmd_power_down(struct si476x_core *,
+			       struct si476x_power_down_args *);
+int si476x_core_cmd_fm_phase_div_status(struct si476x_core *);
+int si476x_core_cmd_fm_phase_diversity(struct si476x_core *,
+				       enum si476x_phase_diversity_mode);
+
+int si476x_core_cmd_fm_acf_status(struct si476x_core *,
+				  struct si476x_acf_status_report *);
+int si476x_core_cmd_am_acf_status(struct si476x_core *,
+				  struct si476x_acf_status_report *);
+int si476x_core_cmd_agc_status(struct si476x_core *,
+			       struct si476x_agc_status_report *);
+
+enum si476x_power_grid_type {
+	SI476X_POWER_GRID_50HZ = 0,
+	SI476X_POWER_GRID_60HZ,
+};
+
+/* Properties  */
+
+enum si476x_interrupt_flags {
+	SI476X_STCIEN = (1 << 0),
+	SI476X_ACFIEN = (1 << 1),
+	SI476X_RDSIEN = (1 << 2),
+	SI476X_RSQIEN = (1 << 3),
+
+	SI476X_ERRIEN = (1 << 6),
+	SI476X_CTSIEN = (1 << 7),
+
+	SI476X_STCREP = (1 << 8),
+	SI476X_ACFREP = (1 << 9),
+	SI476X_RDSREP = (1 << 10),
+	SI476X_RSQREP = (1 << 11),
+};
+
+enum si476x_rdsint_sources {
+	SI476X_RDSTPPTY = (1 << 4),
+	SI476X_RDSPI    = (1 << 3),
+	SI476X_RDSSYNC	= (1 << 1),
+	SI476X_RDSRECV	= (1 << 0),
+};
+
+enum si476x_status_response_bits {
+	SI476X_CTS	  = (1 << 7),
+	SI476X_ERR	  = (1 << 6),
+	/* Status response for WB receiver */
+	SI476X_WB_ASQ_INT = (1 << 4),
+	SI476X_RSQ_INT    = (1 << 3),
+	/* Status response for FM receiver */
+	SI476X_FM_RDS_INT = (1 << 2),
+	SI476X_ACF_INT    = (1 << 1),
+	SI476X_STC_INT    = (1 << 0),
+};
+
+bool si476x_core_is_valid_property(struct si476x_core *, u16);
+bool si476x_core_is_readonly_property(struct si476x_core *, u16);
+int si476x_core_set_int_ctl_enable(struct si476x_core *,
+				   enum si476x_interrupt_flags);
+
+int si476x_core_set_frequency_spacing(struct si476x_core *, int);
+int si476x_core_set_seek_band_top(struct si476x_core *, int);
+int si476x_core_set_seek_band_bottom(struct si476x_core *, int);
+int si476x_core_set_audio_deemphasis(struct si476x_core *, int);
+int si476x_core_set_rds_reception(struct si476x_core *, int);
+int si476x_core_set_audio_pwr_line_filter(struct si476x_core *, bool,
+					  enum si476x_power_grid_type, int);
+
+int si476x_core_set_valid_snr_threshold(struct si476x_core *, int);
+int si476x_core_set_valid_rssi_threshold(struct si476x_core *, int);
+int si476x_core_set_valid_max_tune_error(struct si476x_core *, int);
+
+int si476x_core_get_frequency_spacing(struct si476x_core *);
+int si476x_core_get_seek_band_top(struct si476x_core *);
+int si476x_core_get_seek_band_bottom(struct si476x_core *);
+int si476x_core_get_audio_deemphasis(struct si476x_core *);
+int si476x_core_get_rds_reception(struct si476x_core *);
+int si476x_core_get_audio_pwr_line_filter(struct si476x_core *);
+
+int si476x_core_get_valid_snr_threshold(struct si476x_core *);
+int si476x_core_get_valid_rssi_threshold(struct si476x_core *);
+int si476x_core_get_valid_max_tune_error(struct si476x_core *);
+
+int si476x_core_set_fm_rds_interrupt_fifo_count(struct si476x_core *, int);
+int si476x_core_set_rds_interrupt_source(struct si476x_core *,
+					 enum si476x_rdsint_sources);
+int si476x_core_set_digital_io_input_sample_rate(struct si476x_core *, u16);
+int si476x_core_disable_digital_audio(struct si476x_core *);
+
+typedef int (*tune_freq_func_t) (struct si476x_core *,
+				 struct si476x_tune_freq_args *);
+
+enum si476x_i2c_type {
+	SI476X_I2C_SEND,
+	SI476X_I2C_RECV
+};
+
+int si476x_i2c_xfer(struct si476x_core *,
+		    enum si476x_i2c_type,
+		    char *, int);
+#endif	/* SI476X_CORE_H */
diff --git a/include/media/si476x.h b/include/media/si476x.h
new file mode 100644
index 0000000..5595f25
--- /dev/null
+++ b/include/media/si476x.h
@@ -0,0 +1,455 @@
+/*
+ * include/media/si476x.h -- Common definitions for si476x driver
+ *
+ * Copyright (C) 2012 Innovative Converged Devices(ICD)
+ *
+ * Author: Andrey Smirnov <andrey.smirnov@convergeddevices.net>
+ *
+ * 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 program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ */
+
+#ifndef SI476X_H
+#define SI476X_H
+
+#include <linux/types.h>
+#include <linux/videodev2.h>
+
+struct si476x_device;
+
+/* It is possible to select one of the four adresses using pins A0
+ * and A1 on SI476x */
+#define SI476X_I2C_ADDR_1	0x60
+#define SI476X_I2C_ADDR_2	0x61
+#define SI476X_I2C_ADDR_3	0x62
+#define SI476X_I2C_ADDR_4	0x63
+
+enum si476x_iqclk_config {
+	SI476X_IQCLK_NOOP = 0,
+	SI476X_IQCLK_TRISTATE = 1,
+	SI476X_IQCLK_IQ = 21,
+};
+enum si476x_iqfs_config {
+	SI476X_IQFS_NOOP = 0,
+	SI476X_IQFS_TRISTATE = 1,
+	SI476X_IQFS_IQ = 21,
+};
+enum si476x_iout_config {
+	SI476X_IOUT_NOOP = 0,
+	SI476X_IOUT_TRISTATE = 1,
+	SI476X_IOUT_OUTPUT = 22,
+};
+enum si476x_qout_config {
+	SI476X_QOUT_NOOP = 0,
+	SI476X_QOUT_TRISTATE = 1,
+	SI476X_QOUT_OUTPUT = 22,
+};
+
+enum si476x_dclk_config {
+	SI476X_DCLK_NOOP      = 0,
+	SI476X_DCLK_TRISTATE  = 1,
+	SI476X_DCLK_DAUDIO    = 10,
+};
+
+enum si476x_dfs_config {
+	SI476X_DFS_NOOP      = 0,
+	SI476X_DFS_TRISTATE  = 1,
+	SI476X_DFS_DAUDIO    = 10,
+};
+
+enum si476x_dout_config {
+	SI476X_DOUT_NOOP       = 0,
+	SI476X_DOUT_TRISTATE   = 1,
+	SI476X_DOUT_I2S_OUTPUT = 12,
+	SI476X_DOUT_I2S_INPUT  = 13,
+};
+
+enum si476x_xout_config {
+	SI476X_XOUT_NOOP        = 0,
+	SI476X_XOUT_TRISTATE    = 1,
+	SI476X_XOUT_I2S_INPUT   = 13,
+	SI476X_XOUT_MODE_SELECT = 23,
+};
+
+
+enum si476x_icin_config {
+	SI476X_ICIN_NOOP	= 0,
+	SI476X_ICIN_TRISTATE	= 1,
+	SI476X_ICIN_GPO1_HIGH	= 2,
+	SI476X_ICIN_GPO1_LOW	= 3,
+	SI476X_ICIN_IC_LINK	= 30,
+};
+
+enum si476x_icip_config {
+	SI476X_ICIP_NOOP	= 0,
+	SI476X_ICIP_TRISTATE	= 1,
+	SI476X_ICIP_GPO2_HIGH	= 2,
+	SI476X_ICIP_GPO2_LOW	= 3,
+	SI476X_ICIP_IC_LINK	= 30,
+};
+
+enum si476x_icon_config {
+	SI476X_ICON_NOOP	= 0,
+	SI476X_ICON_TRISTATE	= 1,
+	SI476X_ICON_I2S		= 10,
+	SI476X_ICON_IC_LINK	= 30,
+};
+
+enum si476x_icop_config {
+	SI476X_ICOP_NOOP	= 0,
+	SI476X_ICOP_TRISTATE	= 1,
+	SI476X_ICOP_I2S		= 10,
+	SI476X_ICOP_IC_LINK	= 30,
+};
+
+
+enum si476x_lrout_config {
+	SI476X_LROUT_NOOP	= 0,
+	SI476X_LROUT_TRISTATE	= 1,
+	SI476X_LROUT_AUDIO	= 2,
+	SI476X_LROUT_MPX	= 3,
+};
+
+
+enum si476x_intb_config {
+	SI476X_INTB_NOOP     = 0,
+	SI476X_INTB_TRISTATE = 1,
+	SI476X_INTB_DAUDIO   = 10,
+	SI476X_INTB_IRQ      = 40,
+};
+
+enum si476x_a1_config {
+	SI476X_A1_NOOP     = 0,
+	SI476X_A1_TRISTATE = 1,
+	SI476X_A1_IRQ      = 40,
+};
+
+enum si476x_part_revisions {
+	SI476X_REVISION_A10 = 0,
+	SI476X_REVISION_A20 = 1,
+	SI476X_REVISION_A30 = 2,
+};
+
+struct si476x_pinmux {
+	enum si476x_dclk_config  dclk;
+	enum si476x_dfs_config   dfs;
+	enum si476x_dout_config  dout;
+	enum si476x_xout_config  xout;
+
+	enum si476x_iqclk_config iqclk;
+	enum si476x_iqfs_config  iqfs;
+	enum si476x_iout_config  iout;
+	enum si476x_qout_config  qout;
+
+	enum si476x_icin_config  icin;
+	enum si476x_icip_config  icip;
+	enum si476x_icon_config  icon;
+	enum si476x_icop_config  icop;
+
+	enum si476x_lrout_config lrout;
+
+	enum si476x_intb_config  intb;
+	enum si476x_a1_config    a1;
+};
+
+/**
+ * enum si476x_phase_diversity_mode - possbile phase diversity modes
+ * for SI4764/5/6/7 chips.
+ *
+ * @SI476X_PHDIV_DISABLED:		Phase diversity feature is
+ *					disabled.
+ * @SI476X_PHDIV_PRIMARY_COMBINING:	Tuner works as a primary tuner
+ *					in combination with a
+ *					secondary one.
+ * @SI476X_PHDIV_PRIMARY_ANTENNA:	Tuner works as a primary tuner
+ *					using only its own antenna.
+ * @SI476X_PHDIV_SECONDARY_ANTENNA:	Tuner works as a primary tuner
+ *					usning seconary tuner's antenna.
+ * @SI476X_PHDIV_SECONDARY_COMBINING:	Tuner works as a secondary
+ *					tuner in combination with the
+ *					primary one.
+ */
+enum si476x_phase_diversity_mode {
+	SI476X_PHDIV_DISABLED			= 0,
+	SI476X_PHDIV_PRIMARY_COMBINING		= 1,
+	SI476X_PHDIV_PRIMARY_ANTENNA		= 2,
+	SI476X_PHDIV_SECONDARY_ANTENNA		= 3,
+	SI476X_PHDIV_SECONDARY_COMBINING	= 5,
+};
+
+
+enum si476x_ibias6x {
+	SI476X_IBIAS6X_OTHER			= 0,
+	SI476X_IBIAS6X_RCVR1_NON_4MHZ_CLK	= 1,
+};
+
+enum si476x_xstart {
+	SI476X_XSTART_MULTIPLE_TUNER	= 0x11,
+	SI476X_XSTART_NORMAL		= 0x77,
+};
+
+enum si476x_freq {
+	SI476X_FREQ_4_MHZ		= 0,
+	SI476X_FREQ_37P209375_MHZ	= 1,
+	SI476X_FREQ_36P4_MHZ		= 2,
+	SI476X_FREQ_37P8_MHZ		=  3,
+};
+
+enum si476x_xmode {
+	SI476X_XMODE_CRYSTAL_RCVR1	= 1,
+	SI476X_XMODE_EXT_CLOCK		= 2,
+	SI476X_XMODE_CRYSTAL_RCVR2_3	= 3,
+};
+
+enum si476x_xbiashc {
+	SI476X_XBIASHC_SINGLE_RECEIVER = 0,
+	SI476X_XBIASHC_MULTIPLE_RECEIVER = 1,
+};
+
+enum si476x_xbias {
+	SI476X_XBIAS_RCVR2_3	= 0,
+	SI476X_XBIAS_4MHZ_RCVR1 = 3,
+	SI476X_XBIAS_RCVR1	= 7,
+};
+
+enum si476x_func {
+	SI476X_FUNC_BOOTLOADER	= 0,
+	SI476X_FUNC_FM_RECEIVER = 1,
+	SI476X_FUNC_AM_RECEIVER = 2,
+	SI476X_FUNC_WB_RECEIVER = 3,
+};
+
+
+/**
+ * @xcload: Selects the amount of additional on-chip capacitance to
+ *          be connected between XTAL1 and gnd and between XTAL2 and
+ *          GND. One half of the capacitance value shown here is the
+ *          additional load capacitance presented to the xtal. The
+ *          minimum step size is 0.277 pF. Recommended value is 0x28
+ *          but it will be layout dependent. Range is 0–0x3F i.e.
+ *          (0–16.33 pF)
+ * @ctsien: enable CTSINT(interrupt request when CTS condition
+ *          arises) when set
+ * @intsel: when set A1 pin becomes the interrupt pin; otherwise,
+ *          INTB is the interrupt pin
+ * @func:   selects the boot function of the device. I.e.
+ *          SI476X_BOOTLOADER  - Boot loader
+ *          SI476X_FM_RECEIVER - FM receiver
+ *          SI476X_AM_RECEIVER - AM receiver
+ *          SI476X_WB_RECEIVER - Weatherband receiver
+ * @freq:   oscillator's crystal frequency:
+ *          SI476X_XTAL_37P209375_MHZ - 37.209375 Mhz
+ *          SI476X_XTAL_36P4_MHZ      - 36.4 Mhz
+ *          SI476X_XTAL_37P8_MHZ      - 37.8 Mhz
+ */
+struct si476x_power_up_args {
+	enum si476x_ibias6x ibias6x;
+	enum si476x_xstart  xstart;
+	u8   xcload;
+	bool fastboot;
+	enum si476x_xbiashc xbiashc;
+	enum si476x_xbias   xbias;
+	enum si476x_func    func;
+	enum si476x_freq    freq;
+	enum si476x_xmode   xmode;
+};
+
+
+enum si476x_ctrl_id {
+	SI476X_CID_RSSI_THRESHOLD = V4L2_CID_PRIVATE_BASE,
+	SI476X_CID_SNR_THRESHOLD,
+	SI476X_CID_MAX_TUNE_ERROR,
+	SI476X_CID_SEEK_SPACING,
+	SI476X_CID_SEEK_BAND_TOP,
+	SI476X_CID_SEEK_BAND_BOTTOM,
+	SI476X_CID_RDS_RECEPTION,
+	SI476X_CID_DEEMPHASIS,
+
+	SI476X_CID_HARMONICS_COUNT,
+	SI476X_CID_GRID_FREQUENCY,
+};
+
+/*
+ * Platform dependent definition
+ */
+struct si476x_platform_data {
+	int gpio_reset; /* < 0 if not used */
+
+	struct si476x_power_up_args power_up_parameters;
+	enum si476x_phase_diversity_mode diversity_mode;
+
+	struct si476x_pinmux pinmux;
+};
+
+/**
+ * struct si476x_rsq_status - structure containing received signal
+ * quality
+ * @multhint:   Multipath Detect High.
+ *              true  - Indicatedes that the value is below
+ *                      FM_RSQ_MULTIPATH_HIGH_THRESHOLD
+ *              false - Indicatedes that the value is above
+ *                      FM_RSQ_MULTIPATH_HIGH_THRESHOLD
+ * @multlint:   Multipath Detect Low.
+ *              true  - Indicatedes that the value is below
+ *                      FM_RSQ_MULTIPATH_LOW_THRESHOLD
+ *              false - Indicatedes that the value is above
+ *                      FM_RSQ_MULTIPATH_LOW_THRESHOLD
+ * @snrhint:    SNR Detect High.
+ *              true  - Indicatedes that the value is below
+ *                      FM_RSQ_SNR_HIGH_THRESHOLD
+ *              false - Indicatedes that the value is above
+ *                      FM_RSQ_SNR_HIGH_THRESHOLD
+ * @snrlint:    SNR Detect Low.
+ *              true  - Indicatedes that the value is below
+ *                      FM_RSQ_SNR_LOW_THRESHOLD
+ *              false - Indicatedes that the value is above
+ *                      FM_RSQ_SNR_LOW_THRESHOLD
+ * @rssihint:   RSSI Detect High.
+ *              true  - Indicatedes that the value is below
+ *                      FM_RSQ_RSSI_HIGH_THRESHOLD
+ *              false - Indicatedes that the value is above
+ *                      FM_RSQ_RSSI_HIGH_THRESHOLD
+ * @rssilint:   RSSI Detect Low.
+ *              true  - Indicatedes that the value is below
+ *                      FM_RSQ_RSSI_LOW_THRESHOLD
+ *              false - Indicatedes that the value is above
+ *                      FM_RSQ_RSSI_LOW_THRESHOLD
+ * @bltf:       Band Limit.
+ *              Set if seek command hits the band limit or wrapped to
+ *              the original frequency.
+ * @snr_ready:  SNR measurement in progress.
+ * @rssiready:  RSSI measurement in progress.
+ * @afcrl:      Set if FREQOFF >= MAX_TUNE_ERROR
+ * @valid:      Set if the channel is valid
+ *               rssi < FM_VALID_RSSI_THRESHOLD
+ *               snr  < FM_VALID_SNR_THRESHOLD
+ *               tune_error < FM_VALID_MAX_TUNE_ERROR
+ * @readfreq:   Current tuned frequency.
+ * @freqoff:    Signed frequency offset.
+ * @rssi:       Received Signal Strength Indicator(dBuV).
+ * @snr:        RF SNR Indicator(dB).
+ * @lassi:
+ * @hassi:      Low/High side Adjacent(100 kHz) Channel Strength Indicator
+ * @mult:       Multipath indicator
+ * @dev:        Who knows? But values may vary.
+ * @readantcap: Antenna tuning capacity value.
+ * @assi:       Adjacent Channel(+/- 200kHz) Strength Indicator
+ * @usn:        Ultrasonic Noise Inticator in -DBFS
+ */
+struct si476x_rsq_status_report {
+	__u8 multhint, multlint;
+	__u8 snrhint,  snrlint;
+	__u8 rssihint, rssilint;
+	__u8 bltf;
+	__u8 snr_ready;
+	__u8 rssiready;
+	__u8 injside;
+	__u8 afcrl;
+	__u8 valid;
+
+	__u16 readfreq;
+	__s8  freqoff;
+	__s8  rssi;
+	__s8  snr;
+	__s8  issi;
+	__s8  lassi, hassi;
+	__s8  mult;
+	__u8  dev;
+	__u16 readantcap;
+	__s8  assi;
+	__s8  usn;
+
+	__u8 pilotdev;
+	__u8 rdsdev;
+	__u8 assidev;
+	__u8 strongdev;
+	__u16 rdspi;
+};
+
+/**
+ * si476x_acf_status_report - ACF report results
+ *
+ * @blend_int: If set, indicates that stereo separation has crossed
+ * below the blend threshold as set by FM_ACF_BLEND_THRESHOLD
+ * @hblend_int: If set, indicates that HiBlend cutoff frequency is
+ * lower than threshold as set by FM_ACF_HBLEND_THRESHOLD
+ * @hicut_int:  If set, indicates that HiCut cutoff frequency is lower
+ * than the threshold set by ACF_
+
+ */
+struct si476x_acf_status_report {
+	__u8 blend_int;
+	__u8 hblend_int;
+	__u8 hicut_int;
+	__u8 chbw_int;
+	__u8 softmute_int;
+	__u8 smute;
+	__u8 smattn;
+	__u8 chbw;
+	__u8 hicut;
+	__u8 hiblend;
+	__u8 pilot;
+	__u8 stblend;
+};
+
+enum si476x_fmagc {
+	SI476X_FMAGC_10K_OHM	= 0,
+	SI476X_FMAGC_800_OHM	= 1,
+	SI476X_FMAGC_400_OHM	= 2,
+	SI476X_FMAGC_200_OHM	= 4,
+	SI476X_FMAGC_100_OHM	= 8,
+	SI476X_FMAGC_50_OHM	= 16,
+	SI476X_FMAGC_25_OHM	= 32,
+	SI476X_FMAGC_12P5_OHM	= 64,
+	SI476X_FMAGC_6P25_OHM	= 128,
+};
+
+struct si476x_agc_status_report {
+	__u8 mxhi;
+	__u8 mxlo;
+	__u8 lnahi;
+	__u8 lnalo;
+	__u8 fmagc1;
+	__u8 fmagc2;
+	__u8 pgagain;
+	__u8 fmwblang;
+};
+
+struct si476x_rds_blockcount_report {
+	__u16 expected;
+	__u16 received;
+	__u16 uncorrectable;
+};
+
+#define SI476X_PHDIV_STATUS_LINK_LOCKED(status) (0b10000000 & (status))
+#define SI476X_PHDIV_STATS_MODE(status) (0b111 & (status))
+
+#define SI476X_IOC_GET_RSQ		_IOWR('V', BASE_VIDIOC_PRIVATE + 0, \
+					      struct si476x_rsq_status_report)
+
+#define SI476X_IOC_SET_PHDIV_MODE	_IOW('V', BASE_VIDIOC_PRIVATE + 1, \
+					     enum si476x_phase_diversity_mode)
+
+#define SI476X_IOC_GET_PHDIV_STATUS	_IOWR('V', BASE_VIDIOC_PRIVATE + 2, \
+					      int)
+
+#define SI476X_IOC_GET_RSQ_PRIMARY	_IOWR('V', BASE_VIDIOC_PRIVATE + 3, \
+					      struct si476x_rsq_status_report)
+
+#define SI476X_IOC_GET_ACF		_IOWR('V', BASE_VIDIOC_PRIVATE + 4, \
+					      struct si476x_acf_status_report)
+
+#define SI476X_IOC_GET_AGC		_IOWR('V', BASE_VIDIOC_PRIVATE + 5, \
+					      struct si476x_agc_status_report)
+
+#define SI476X_IOC_GET_RDS_BLKCNT	_IOWR('V', BASE_VIDIOC_PRIVATE + 6, \
+					    struct si476x_rds_blockcount_report)
+
+#endif /* SI476X_H*/
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 2/3] Add a V4L2 driver for SI476X MFD
  2012-09-13 22:40 [PATCH 0/3] A driver for Si476x series of chips Andrey Smirnov
  2012-09-13 22:40 ` [PATCH 1/3] Add a core driver for SI476x MFD Andrey Smirnov
@ 2012-09-13 22:40 ` Andrey Smirnov
  2012-09-14  7:17   ` Hans Verkuil
  2012-09-13 22:40 ` [PATCH 3/3] Add a codec " Andrey Smirnov
  2012-09-25 11:39 ` [PATCH 0/3] A driver for Si476x series of chips Mauro Carvalho Chehab
  3 siblings, 1 reply; 13+ messages in thread
From: Andrey Smirnov @ 2012-09-13 22:40 UTC (permalink / raw)
  To: linux-media; +Cc: linux-kernel

This commit adds a driver that exposes all the radio related
functionality of the Si476x series of chips via the V4L2 subsystem.

Signed-off-by: Andrey Smirnov <andrey.smirnov@convergeddevices.net>
---
 drivers/media/radio/Kconfig        |   17 +
 drivers/media/radio/radio-si476x.c | 1307 ++++++++++++++++++++++++++++++++++++
 2 files changed, 1324 insertions(+)
 create mode 100644 drivers/media/radio/radio-si476x.c

diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index 8090b87..3c79d09 100644
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -16,6 +16,23 @@ config RADIO_SI470X
 	bool "Silicon Labs Si470x FM Radio Receiver support"
 	depends on VIDEO_V4L2
 
+config RADIO_SI476X
+	tristate "Silicon Laboratories Si476x I2C FM Radio"
+	depends on I2C && VIDEO_V4L2
+	select MFD_CORE
+	select MFD_SI476X_CORE
+	select SND_SOC_SI476X
+	---help---
+	  Choose Y here if you have this FM radio chip.
+
+	  In order to control your radio card, you will need to use programs
+	  that are compatible with the Video For Linux 2 API.  Information on
+	  this API and pointers to "v4l2" programs may be found at
+	  <file:Documentation/video4linux/API.html>.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called radio-si476x.
+
 source "drivers/media/radio/si470x/Kconfig"
 
 config USB_MR800
diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
new file mode 100644
index 0000000..f313005
--- /dev/null
+++ b/drivers/media/radio/radio-si476x.c
@@ -0,0 +1,1307 @@
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/slab.h>
+#include <linux/atomic.h>
+#include <media/v4l2-common.h>
+#include <media/v4l2-ctrls.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-ioctl.h>
+
+#include <linux/mfd/si476x-core.h>
+
+#define FM_FREQ_RANGE_LOW   64000000
+#define FM_FREQ_RANGE_HIGH 108000000
+
+#define AM_FREQ_RANGE_LOW    520000
+#define AM_FREQ_RANGE_HIGH 30000000
+
+#define PWRLINEFLTR (1 << 8)
+
+#define FREQ_MUL (10000000 / 625)
+
+#define DRIVER_NAME "si476x-radio"
+#define DRIVER_CARD "SI476x AM/FM Receiver"
+
+static const char * const deemphasis[] = {
+	"75 us",
+	"50 us",
+};
+
+static const char * const grid_frequency[] = {
+	"50 Hz",
+	"60 Hz",
+};
+
+#define PRIVATE_CTL_IDX(x) (x - V4L2_CID_PRIVATE_BASE)
+
+static const struct v4l2_queryctrl si476x_ctrls[] = {
+	/*
+	   Tuning parameters
+	   'max tune errors' is shared for both AM/FM mode of operation
+	*/
+	{
+		.id		= SI476X_CID_RSSI_THRESHOLD,
+		.type		= V4L2_CTRL_TYPE_INTEGER,
+		.name		= "valid rssi threshold",
+		.minimum	= -128,
+		.maximum	= 127,
+		.step		= 1,
+	},
+	{
+		.id		= SI476X_CID_SNR_THRESHOLD,
+		.type		= V4L2_CTRL_TYPE_INTEGER,
+		.name		= "valid snr threshold",
+		.minimum	= -128,
+		.maximum	= 127,
+		.step		= 1,
+	},
+	{
+		.id		= SI476X_CID_MAX_TUNE_ERROR,
+		.type		= V4L2_CTRL_TYPE_INTEGER,
+		.name		= "max tune errors",
+		.minimum	= 0,
+		.maximum	= 126 * 2,
+		.step		= 2,
+	},
+	/*
+	   Region specific parameters
+	*/
+	{
+		.id		= SI476X_CID_GRID_FREQUENCY,
+		.type		= V4L2_CTRL_TYPE_MENU,
+		.name		= "power grid frequency",
+		.minimum	= 0,
+		.maximum	= ARRAY_SIZE(grid_frequency) - 1,
+		.step		= 1,
+	},
+	{
+		.id		= SI476X_CID_HARMONICS_COUNT,
+		.type		= V4L2_CTRL_TYPE_INTEGER,
+		.name		= "# of harmonics to reject",
+		.minimum	= 0,
+		.maximum	= 20,
+		.step		= 1,
+	},
+	{
+		.id		= SI476X_CID_SEEK_SPACING,
+		.type		= V4L2_CTRL_TYPE_INTEGER,
+		.name		= "seek frequency spacing",
+		.minimum	= 0,
+		.maximum	= 0xFFFF,
+		.step		= 1,
+	},
+	{
+		.id		= SI476X_CID_SEEK_BAND_TOP,
+		.type		= V4L2_CTRL_TYPE_INTEGER,
+		.name		= "seek band top",
+		.minimum	= 0,
+		.maximum	= 0xFFFF,
+		.step		= 1,
+	},
+	{
+		.id		= SI476X_CID_SEEK_BAND_BOTTOM,
+		.type		= V4L2_CTRL_TYPE_INTEGER,
+		.name		= "seek band bottom",
+		.minimum	= 0,
+		.maximum	= 0xFFFF,
+		.step		= 1,
+	},
+	{
+		.id		= SI476X_CID_DEEMPHASIS,
+		.type		= V4L2_CTRL_TYPE_MENU,
+		.name		= "de-emphassis",
+		.minimum	= 0,
+		.maximum	= ARRAY_SIZE(deemphasis) - 1,
+		.step		= 1,
+		.default_value	= 0,
+	},
+	{
+		.id		= SI476X_CID_RDS_RECEPTION,
+		.type		= V4L2_CTRL_TYPE_BOOLEAN,
+		.name		= "rds",
+		.minimum	= 0,
+		.maximum	= 1,
+	},
+};
+
+struct si476x_radio;
+
+/**
+ * struct si476x_radio_ops - vtable of tuner functions
+ *
+ * This table holds pointers to functions implementing particular
+ * operations depending on the mode in which the tuner chip was
+ * configured to start in. If the function is not supported
+ * corresponding element is set to #NULL.
+ *
+ * @tune_freq: Tune chip to a specific frequency
+ * @seek_start: Star station seeking
+ * @rsq_status: Get Recieved Signal Quality(RSQ) status
+ * @rds_blckcnt: Get recived RDS blocks count
+ * @phase_diversity: Change phase diversity mode of the tuner
+ * @phase_div_status: Get phase diversity mode status
+ * @acf_status: Get the status of Automatically Controlled
+ * Features(ACF)
+ * @agc_status: Get Automatic Gain Control(AGC) status
+ */
+struct si476x_radio_ops {
+	int (*tune_freq)(struct si476x_core *, struct si476x_tune_freq_args *);
+	int (*seek_start)(struct si476x_core *, bool, bool);
+	int (*rsq_status)(struct si476x_core *, struct si476x_rsq_status_args *,
+			  struct si476x_rsq_status_report *);
+	int (*rds_blckcnt)(struct si476x_core *, bool,
+			   struct si476x_rds_blockcount_report *);
+
+	int (*phase_diversity)(struct si476x_core *,
+			       enum si476x_phase_diversity_mode);
+	int (*phase_div_status)(struct si476x_core *);
+	int (*acf_status)(struct si476x_core *,
+			  struct si476x_acf_status_report *);
+	int (*agc_status)(struct si476x_core *,
+			  struct si476x_agc_status_report *);
+};
+
+/**
+ * struct si476x_radio - radio device
+ *
+ * @core: Pointer to underlying core device
+ * @videodev: Pointer to video device created by V4L2 subsystem
+ * @ops: Vtable of functions. See struct si476x_radio_ops for details
+ * @kref: Reference counter
+ * @core_lock: An r/w semaphore to brebvent the deletion of underlying
+ * core structure is the radio device is being used
+ */
+struct si476x_radio {
+	struct si476x_core  *core;
+	struct video_device *videodev;
+
+	/* This field should not be accesses unless core lock is held */
+	const struct si476x_radio_ops *ops;
+
+	struct kref kref;
+	struct rw_semaphore core_lock;
+};
+static inline struct si476x_radio *kref_to_si476x_radio(struct kref *ref)
+{
+	return container_of(ref, struct si476x_radio, kref);
+}
+
+static void si476x_radio_delete(struct kref *kref);
+static inline void si476x_radio_get(struct si476x_radio *radio)
+{
+	kref_get(&radio->kref);
+}
+
+static inline void si476x_radio_put(struct si476x_radio *radio)
+{
+	kref_put(&radio->kref, si476x_radio_delete);
+}
+
+
+static int si476x_radio_initialize_mode(struct si476x_radio *);
+
+/*
+ * si476x_vidioc_querycap - query device capabilities
+ */
+static int si476x_querycap(struct file *file, void *priv,
+			   struct v4l2_capability *capability)
+{
+	strlcpy(capability->driver, DRIVER_NAME, sizeof(capability->driver));
+	strlcpy(capability->card,   DRIVER_CARD, sizeof(capability->card));
+	capability->capabilities = V4L2_CAP_HW_FREQ_SEEK |
+		V4L2_CAP_TUNER | V4L2_CAP_RADIO;
+
+	return 0;
+}
+
+static int si476x_queryctrl(struct file *file, void *priv,
+			    struct v4l2_queryctrl *qc)
+{
+	int retval;
+
+	/* search video control */
+	switch (qc->id) {
+	case SI476X_CID_RSSI_THRESHOLD:
+	case SI476X_CID_SNR_THRESHOLD:
+	case SI476X_CID_MAX_TUNE_ERROR:
+	case SI476X_CID_SEEK_SPACING:
+	case SI476X_CID_SEEK_BAND_TOP:
+	case SI476X_CID_SEEK_BAND_BOTTOM:
+	case SI476X_CID_RDS_RECEPTION:
+	case SI476X_CID_HARMONICS_COUNT:
+	case SI476X_CID_GRID_FREQUENCY:
+	case SI476X_CID_DEEMPHASIS:
+		memcpy(qc, &si476x_ctrls[PRIVATE_CTL_IDX(qc->id)],
+		       sizeof(*qc));
+		retval = 0;
+		break;
+	default:
+		retval = -EINVAL;
+		break;
+	}
+
+	return retval;
+}
+
+static int si476x_querymenu(struct file *file, void *fh,
+			    struct v4l2_querymenu *m)
+{
+	switch (m->id) {
+	case SI476X_CID_GRID_FREQUENCY:
+		if (m->index > ARRAY_SIZE(grid_frequency) - 1)
+			return -EINVAL;
+		strncpy(m->name, grid_frequency[m->index], sizeof(m->name));
+		break;
+	case SI476X_CID_DEEMPHASIS:
+		if (m->index > ARRAY_SIZE(deemphasis) - 1)
+			return -EINVAL;
+		strncpy(m->name, deemphasis[m->index], sizeof(m->name));
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+/* si4713_g_ctrl - get the value of a control */
+static int si476x_g_ctrl(struct file *file, void *priv,
+			 struct v4l2_control *ctrl)
+{
+	int retval;
+	struct si476x_radio *radio = video_drvdata(file);
+
+	down_read(&radio->core_lock);
+
+	if (!radio->core) {
+		retval = -ENODEV;
+		goto up_semaphore;
+	}
+
+	si476x_core_lock(radio->core);
+
+	switch (ctrl->id) {
+	case SI476X_CID_RSSI_THRESHOLD:
+		retval = si476x_core_get_valid_rssi_threshold(radio->core);
+		break;
+	case SI476X_CID_SNR_THRESHOLD:
+		retval = si476x_core_get_valid_snr_threshold(radio->core);
+		break;
+	case SI476X_CID_MAX_TUNE_ERROR:
+		retval = si476x_core_get_valid_max_tune_error(radio->core);
+		break;
+	case SI476X_CID_SEEK_SPACING:
+		retval = si476x_core_get_frequency_spacing(radio->core);
+		break;
+	case SI476X_CID_SEEK_BAND_TOP:
+		retval = si476x_core_get_seek_band_top(radio->core);
+		break;
+	case SI476X_CID_SEEK_BAND_BOTTOM:
+		retval = si476x_core_get_seek_band_bottom(radio->core);
+		break;
+	case SI476X_CID_RDS_RECEPTION:
+		retval = si476x_core_get_rds_reception(radio->core);
+		break;
+	case SI476X_CID_DEEMPHASIS:
+		retval = si476x_core_get_audio_deemphasis(radio->core);
+		break;
+	case SI476X_CID_HARMONICS_COUNT:
+		retval = si476x_core_get_audio_pwr_line_filter(radio->core);
+		break;
+	case SI476X_CID_GRID_FREQUENCY:
+		retval = si476x_core_get_audio_pwr_line_filter(radio->core);
+		break;
+	default:
+		retval = -EINVAL;
+		break;
+	}
+
+	if (retval >= 0) {
+		if (ctrl->id == SI476X_CID_HARMONICS_COUNT)
+			ctrl->value = retval & 0x0F;
+		else if (ctrl->id == SI476X_CID_GRID_FREQUENCY)
+			ctrl->value = !!(PWRLINEFLTR & retval);
+		else
+			ctrl->value = retval;
+
+		retval = 0;
+	}
+	si476x_core_unlock(radio->core);
+
+up_semaphore:
+	up_read(&radio->core_lock);
+	return retval;
+}
+
+/* si4713_s_ctrl - set the value of a control */
+static int si476x_s_ctrl(struct file *file, void *priv,
+			 struct v4l2_control *ctrl)
+{
+	int old_value, retval, count;
+	struct si476x_radio *radio = video_drvdata(file);
+
+	down_read(&radio->core_lock);
+
+	if (!radio->core) {
+		retval = -ENODEV;
+		goto up_semaphore;
+	}
+
+	si476x_core_lock(radio->core);
+
+	switch (ctrl->id) {
+	case SI476X_CID_RSSI_THRESHOLD:
+		retval = si476x_core_set_valid_rssi_threshold(radio->core,
+							      ctrl->value);
+		break;
+	case SI476X_CID_SNR_THRESHOLD:
+		retval = si476x_core_set_valid_snr_threshold(radio->core,
+							     ctrl->value);
+		break;
+	case SI476X_CID_MAX_TUNE_ERROR:
+		retval = si476x_core_set_valid_max_tune_error(radio->core,
+							      ctrl->value);
+		break;
+	case SI476X_CID_SEEK_SPACING:
+		retval = si476x_core_set_frequency_spacing(radio->core,
+							   ctrl->value);
+		break;
+	case SI476X_CID_SEEK_BAND_TOP:
+		retval = si476x_core_set_seek_band_top(radio->core,
+						       ctrl->value);
+		break;
+	case SI476X_CID_SEEK_BAND_BOTTOM:
+		retval = si476x_core_set_seek_band_bottom(radio->core,
+							  ctrl->value);
+		break;
+	case SI476X_CID_RDS_RECEPTION:
+		retval = si476x_core_set_rds_reception(radio->core,
+						       ctrl->value);
+		break;
+	case SI476X_CID_DEEMPHASIS:
+		retval = si476x_core_set_audio_deemphasis(radio->core,
+							  ctrl->value);
+		break;
+	case SI476X_CID_HARMONICS_COUNT:
+		old_value = si476x_core_get_audio_pwr_line_filter(radio->core);
+		if (old_value < 0) {
+			retval = old_value;
+			break;
+		}
+
+		retval = si476x_core_set_audio_pwr_line_filter(radio->core,
+					(ctrl->value > 0) ? true : false,
+					!!(PWRLINEFLTR & old_value),
+					ctrl->value);
+		break;
+	case SI476X_CID_GRID_FREQUENCY:
+		old_value = si476x_core_get_audio_pwr_line_filter(radio->core);
+		if (old_value < 0) {
+			retval = old_value;
+			break;
+		}
+		count  = old_value & 0x0F;
+
+		retval = si476x_core_set_audio_pwr_line_filter(radio->core,
+						(count > 0) ? true : false,
+						ctrl->value,
+						count);
+		break;
+	default:
+		retval = -EINVAL;
+		break;
+	}
+
+	si476x_core_unlock(radio->core);
+
+up_semaphore:
+	up_read(&radio->core_lock);
+	return retval;
+}
+
+static int si476x_g_tuner(struct file *file, void *priv,
+			  struct v4l2_tuner *tuner)
+{
+	int err;
+	struct si476x_rsq_status_report report;
+	struct si476x_radio *radio = video_drvdata(file);
+
+	if (tuner->index != 0) {
+		err = -EINVAL;
+		goto exit;
+	}
+
+	down_read(&radio->core_lock);
+
+	if (!radio->core) {
+		err = -ENODEV;
+		goto up_semaphore;
+	}
+
+	tuner->type       = V4L2_TUNER_RADIO;
+	tuner->capability = V4L2_TUNER_CAP_LOW; /* Measure frequncies
+						 * in multiples of
+						 * 62.5 Hz */
+	if (radio->core->chip_id < 5) { /* Si4760/61/62/63/64 */
+		strlcpy(tuner->name, "AM/FM", sizeof(tuner->name));
+
+		tuner->capability |=  V4L2_TUNER_CAP_STEREO
+			| V4L2_TUNER_CAP_RDS
+			| V4L2_TUNER_CAP_RDS_BLOCK_IO;
+
+		tuner->rangelow  = 520 * FREQ_MUL / 1000;
+
+		tuner->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
+		tuner->audmode = V4L2_TUNER_MODE_STEREO;
+	} else {  /* Si4768/69 */
+		strlcpy(tuner->name, "FM", sizeof(tuner->name));
+		tuner->rangelow  = 64 * FREQ_MUL;
+		tuner->capability |= V4L2_TUNER_CAP_RDS
+			| V4L2_TUNER_CAP_RDS_BLOCK_IO;
+	}
+
+	tuner->rxsubchans |= V4L2_TUNER_SUB_RDS;
+
+
+	if (radio->core->diversity_mode == SI476X_PHDIV_SECONDARY_ANTENNA ||
+	    radio->core->diversity_mode == SI476X_PHDIV_SECONDARY_COMBINING) {
+		strlcpy(tuner->name, "FM (secondary)", sizeof(tuner->name));
+		tuner->capability = 0;
+		tuner->rxsubchans = 0;
+		tuner->audmode    = 0;
+	}
+
+	if (radio->core->diversity_mode == SI476X_PHDIV_PRIMARY_ANTENNA ||
+	    radio->core->diversity_mode == SI476X_PHDIV_PRIMARY_COMBINING)
+		strlcpy(tuner->name, "AM/FM (primary)", sizeof(tuner->name));
+
+	tuner->rangehigh = 108 * FREQ_MUL;
+	tuner->afc = 1;
+
+	si476x_core_lock(radio->core);
+	{
+		struct si476x_rsq_status_args args = {
+			.primary	= false,
+			.rsqack		= false,
+			.attune		= false,
+			.cancel		= false,
+			.stcack		= false,
+		};
+		if (radio->ops->rsq_status) {
+			err = radio->ops->rsq_status(radio->core,
+						     &args, &report);
+			if (err < 0) {
+				tuner->signal = 0;
+			} else {
+				/*
+				  tuner->signal value range: 0x0000 .. 0xFFFF,
+				  report.rssi: -128 .. 127
+				*/
+				tuner->signal = (report.rssi + 128) * 257;
+			}
+		} else {
+			tuner->signal = 0;
+			err = -EINVAL;
+		}
+	}
+	si476x_core_unlock(radio->core);
+
+up_semaphore:
+	up_read(&radio->core_lock);
+exit:
+	return err;
+}
+
+/**
+ * The switching between AM/FM mode of the tuner is implemented as
+ * swtiching between tow audio stream of the V4L2 tuner. SO each AM/FM
+ * capabel chips reports two audio streams "AM Radio" and "FM Radio".
+ * Selectio=ng one or the other would put hte tuner in an appropriate
+ * mode.
+ */
+
+static int si476x_enumaudio(struct file *file, void *fh,
+			    struct v4l2_audio *audio)
+{
+	int err;
+	struct si476x_radio *radio = video_drvdata(file);
+
+	down_read(&radio->core_lock);
+
+	if (!radio->core) {
+		err = -ENODEV;
+		goto up_semaphore;
+	}
+
+	if (radio->core->chip_id >= 5) {
+		err = -EINVAL;
+		goto up_semaphore;
+	}
+
+	err = 0;
+	switch (audio->index) {
+	case 0:
+		strcpy(audio->name, "FM Radio");
+		audio->capability = V4L2_AUDCAP_STEREO;
+		audio->mode = 0;
+		break;
+	case 1:
+		strcpy(audio->name, "AM Radio");
+		audio->capability = 0;
+		audio->mode = 0;
+		break;
+	default:
+		err = -EINVAL;
+	}
+
+up_semaphore:
+	up_read(&radio->core_lock);
+	return err;
+}
+
+static int si476x_g_audio(struct file *file, void *priv,
+			  struct v4l2_audio *audio)
+{
+	int err;
+	struct si476x_radio *radio = video_drvdata(file);
+
+	down_read(&radio->core_lock);
+
+	if (!radio->core) {
+		err = -ENODEV;
+		goto up_semaphore;
+	}
+
+	if (radio->core->chip_id >= 5) {
+		err = -EINVAL;
+		goto up_semaphore;
+	}
+
+	si476x_core_lock(radio->core);
+	err = 0;
+	switch (radio->core->power_up_parameters.func) {
+	case SI476X_FUNC_FM_RECEIVER:
+		audio->index = 0;
+		strcpy(audio->name, "FM Radio");
+		audio->capability = V4L2_AUDCAP_STEREO;
+		break;
+	case SI476X_FUNC_AM_RECEIVER:
+		audio->index = 1;
+		strcpy(audio->name, "AM Radio");
+		audio->capability = 0;
+		break;
+	default:
+		err = -EINVAL;
+		goto unlock;
+	}
+	audio->mode = 0;
+unlock:
+	si476x_core_unlock(radio->core);
+up_semaphore:
+	up_read(&radio->core_lock);
+	return err;
+}
+
+static int si476x_s_audio(struct file *file, void *priv,
+			  struct v4l2_audio *audio)
+{
+	int err;
+	struct si476x_radio *radio = video_drvdata(file);
+
+	down_read(&radio->core_lock);
+
+	if (!radio->core) {
+		err = -ENODEV;
+		goto up_semaphore;
+	}
+
+	if (radio->core->chip_id >= 5 || audio->index > 1) {
+		err = -EINVAL;
+		goto up_semaphore;
+	}
+
+	si476x_core_lock(radio->core);
+
+	/*
+	   Since power/up down is a very time consuming operation,
+	   try to avoid doing it if the requested mode matches the one
+	   the tuner is in
+	*/
+	if ((audio->index == 0 &&
+	     radio->core->power_up_parameters.func
+	     == SI476X_FUNC_FM_RECEIVER) ||
+	    (audio->index == 1 &&
+	     radio->core->power_up_parameters.func
+	     == SI476X_FUNC_AM_RECEIVER)) {
+		err = 0;
+		goto unlock;
+	}
+
+	err = si476x_core_stop(radio->core, true);
+	if (err < 0)
+		goto unlock;
+
+	switch (audio->index) {
+	case 0:
+		radio->core->power_up_parameters.func = SI476X_FUNC_FM_RECEIVER;
+		break;
+	case 1:
+		radio->core->power_up_parameters.func = SI476X_FUNC_AM_RECEIVER;
+		break;
+	}
+
+	err = si476x_core_start(radio->core, true);
+	if (!err)
+		err = si476x_radio_initialize_mode(radio);
+
+unlock:
+	si476x_core_unlock(radio->core);
+up_semaphore:
+	up_read(&radio->core_lock);
+	return err;
+}
+
+static int si476x_g_frequency(struct file *file, void *priv,
+			      struct v4l2_frequency *f)
+{
+	int err;
+	struct si476x_radio *radio = video_drvdata(file);
+
+	down_read(&radio->core_lock);
+
+	if (!radio->core) {
+		err = -ENODEV;
+		goto up_semaphore;
+	}
+
+	si476x_core_lock(radio->core);
+
+	f->type = V4L2_TUNER_RADIO;
+	if (radio->ops->rsq_status) {
+		struct si476x_rsq_status_report report;
+		struct si476x_rsq_status_args   args = {
+			.primary	= false,
+			.rsqack		= false,
+			.attune		= true,
+			.cancel		= false,
+			.stcack		= false,
+		};
+
+		err = radio->ops->rsq_status(radio->core, &args, &report);
+		if (!err)
+			f->frequency = si476x_to_v4l2(radio->core,
+						      report.readfreq);
+	} else {
+		err = -EINVAL;
+	}
+
+	si476x_core_unlock(radio->core);
+up_semaphore:
+	up_read(&radio->core_lock);
+	return err;
+}
+
+static int si476x_s_frequency(struct file *file, void *priv,
+			      struct v4l2_frequency *f)
+{
+	int err;
+	struct si476x_radio *radio = video_drvdata(file);
+
+	down_read(&radio->core_lock);
+
+	if (!radio->core) {
+		err = -ENODEV;
+		goto up_semaphore;
+	}
+	si476x_core_lock(radio->core);
+
+	switch (radio->core->power_up_parameters.func) {
+	case SI476X_FUNC_FM_RECEIVER:
+		/* FIXME change teh constants to use Hz */
+		if (v4l2_to_hz(f->frequency) < FM_FREQ_RANGE_LOW ||
+		    v4l2_to_hz(f->frequency) > FM_FREQ_RANGE_HIGH) {
+			err = -EDOM;
+			goto unlock;
+		}
+		break;
+	case SI476X_FUNC_AM_RECEIVER:
+		if (v4l2_to_hz(f->frequency) < AM_FREQ_RANGE_LOW ||
+		    v4l2_to_hz(f->frequency) > AM_FREQ_RANGE_HIGH) {
+			err = -EDOM;
+			goto unlock;
+		}
+		break;
+	case SI476X_FUNC_WB_RECEIVER:
+	case SI476X_FUNC_BOOTLOADER:
+		break;
+	}
+
+	if (radio->ops->tune_freq) {
+		struct si476x_tune_freq_args args = {
+			.zifsr		= false,
+			.hd		= false,
+			.injside	= SI476X_INJSIDE_AUTO,
+			.freq		= v4l2_to_si476x(radio->core,
+							 f->frequency),
+			.tunemode	= SI476X_SM_INITIALIZE_AUDIO,
+			.smoothmetrics	= SI476X_TM_VALIDATED_NORMAL_TUNE,
+			.antcap		= 0,
+		};
+		err = radio->ops->tune_freq(radio->core, &args);
+	} else {
+		err = -ENOTSUPP;
+	}
+
+unlock:
+	si476x_core_unlock(radio->core);
+
+up_semaphore:
+	up_read(&radio->core_lock);
+	return err;
+}
+
+static int si476x_s_hw_freq_seek(struct file *file, void *priv,
+				 struct v4l2_hw_freq_seek *seek)
+{
+	int err;
+	struct si476x_radio *radio = video_drvdata(file);
+
+	down_read(&radio->core_lock);
+
+	if (!radio->core) {
+		err = -ENODEV;
+		goto up_semaphore;
+	}
+	/* FIXME: Add seek->spacing support */
+	si476x_core_lock(radio->core);
+	if (radio->ops->seek_start)
+		err = radio->ops->seek_start(radio->core,
+					     seek->seek_upward,
+					     seek->wrap_around);
+	else
+		err = -ENOTSUPP;
+	si476x_core_unlock(radio->core);
+
+up_semaphore:
+	up_read(&radio->core_lock);
+	return err;
+}
+
+static int __g_register(struct file *file, void *fh,
+			     struct v4l2_dbg_register *reg)
+{
+	struct si476x_radio *radio = video_drvdata(file);
+
+	if (si476x_core_is_valid_property(radio->core, reg->reg)) {
+		reg->size = 2;
+		reg->val  = si476x_core_cmd_get_property(radio->core, reg->reg);
+		return (reg->val < 0) ? reg->val : 0;
+	} else {
+		return -EINVAL;
+	}
+}
+
+static int __s_register(struct file *file, void *fh,
+			struct v4l2_dbg_register *reg)
+{
+	int err;
+	struct si476x_radio *radio = video_drvdata(file);
+
+	if (si476x_core_is_valid_property(radio->core, reg->reg) &&
+	   !si476x_core_is_readonly_property(radio->core, reg->reg)) {
+		err = si476x_core_cmd_set_property(radio->core,
+						   reg->reg, reg->val);
+	} else {
+		err = -EINVAL;
+	}
+
+	return err;
+}
+
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+static int si476x_g_register(struct file *file, void *fh,
+			     struct v4l2_dbg_register *reg)
+{
+	int err;
+	struct si476x_radio *radio = video_drvdata(file);
+
+	down_read(&radio->core_lock);
+
+	if (!radio->core) {
+		err = -ENODEV;
+	} else {
+		si476x_core_lock(radio->core);
+		err = __g_register(file, fh, reg);
+		si476x_core_unlock(radio->core);
+	}
+
+	up_read(&radio->core_lock);
+	return err;
+}
+
+static int si476x_s_register(struct file *file, void *fh,
+			     struct v4l2_dbg_register *reg)
+{
+
+	int err;
+	struct si476x_radio *radio = video_drvdata(file);
+
+	down_read(&radio->core_lock);
+
+	if (!radio->core) {
+		err = -ENODEV;
+	} else {
+		si476x_core_lock(radio->core);
+		err = __s_register(file, fh, reg);
+		si476x_core_unlock(radio->core);
+	}
+
+	up_read(&radio->core_lock);
+	return err;
+}
+#endif
+
+static long si476x_default(struct file *file, void *fh,
+			   bool valid_prio, int cmd, void *arg)
+{
+	long rval;
+	struct si476x_rsq_status_args args = {
+		.primary	= false,
+		.rsqack		= false,
+		.attune		= false,
+		.cancel		= false,
+		.stcack		= false,
+	};
+	struct si476x_radio *radio  = video_drvdata(file);
+
+	down_read(&radio->core_lock);
+	if (!radio->core) {
+		rval = -ENODEV;
+		goto up_semaphore;
+	}
+
+	si476x_core_lock(radio->core);
+	switch (cmd) {
+	case SI476X_IOC_GET_RSQ_PRIMARY:
+		args.primary = true;
+	case SI476X_IOC_GET_RSQ: /* FALLTHROUG */
+		if (radio->ops->rsq_status)
+			rval = radio->ops->rsq_status(radio->core, &args,
+				(struct si476x_rsq_status_report *) arg);
+		else
+			rval = -ENOTTY;
+		break;
+	case SI476X_IOC_SET_PHDIV_MODE:
+		if (radio->ops->phase_diversity)
+			rval = radio->ops->phase_diversity(radio->core,
+				*((enum si476x_phase_diversity_mode *) arg));
+		else
+			rval = -ENOTTY;
+		break;
+	case SI476X_IOC_GET_PHDIV_STATUS:
+		if (radio->ops->phase_div_status) {
+			rval = radio->ops->phase_div_status(radio->core);
+			if (rval >= 0) {
+				*((int *)arg) = rval;
+				rval = 0;
+			}
+		} else {
+			rval = -ENOTTY;
+		}
+		break;
+	case SI476X_IOC_GET_ACF:
+		if (radio->ops->acf_status)
+			rval = radio->ops->acf_status(radio->core,
+				(struct si476x_acf_status_report *)arg);
+		else
+			rval = -ENOTTY;
+		break;
+	case SI476X_IOC_GET_AGC:
+		if (radio->ops->agc_status)
+			rval = radio->ops->agc_status(radio->core,
+				(struct si476x_agc_status_report *)arg);
+		else
+			rval = -ENOTTY;
+		break;
+	case SI476X_IOC_GET_RDS_BLKCNT:
+		if (radio->ops->rds_blckcnt)
+			rval = radio->ops->rds_blckcnt(radio->core, true,
+				(struct si476x_rds_blockcount_report *)arg);
+		else
+			rval = -ENOTTY;
+		break;
+#ifndef CONFIG_VIDEO_ADV_DEBUG
+	case VIDIOC_DBG_G_REGISTER:
+		rval = __g_register(file, fh, arg);
+		break;
+	case VIDIOC_DBG_S_REGISTER:
+		rval = __s_register(file, fh, arg);
+		break;
+#endif
+	default:
+		/* nothing */
+		rval = -ENOTTY;
+		break;
+	}
+
+	si476x_core_unlock(radio->core);
+up_semaphore:
+	up_read(&radio->core_lock);
+	return rval;
+}
+
+static int si476x_radio_fops_open(struct file *file)
+{
+	int err;
+	struct si476x_radio *radio = video_drvdata(file);
+
+	si476x_radio_get(radio);
+
+	down_read(&radio->core_lock);
+
+	if (!radio->core) {
+		err = -ENODEV;
+		goto up_semaphore;
+	}
+
+	if (atomic_inc_return(&radio->core->users) == 1) {
+		si476x_core_lock(radio->core);
+		err = si476x_core_set_power_state(radio->core,
+						     SI476X_POWER_UP_FULL);
+		if (err < 0)
+			goto done;
+
+		err = si476x_radio_initialize_mode(radio);
+		if (err < 0)
+			goto power_down;
+
+		si476x_core_unlock(radio->core);
+	} else {
+		err = 0;
+	}
+
+	up_read(&radio->core_lock);
+	return err;
+
+power_down:
+	si476x_core_set_power_state(radio->core,
+				    SI476X_POWER_DOWN);
+done:
+	si476x_core_unlock(radio->core);
+	atomic_dec(&radio->core->users);
+up_semaphore:
+	up_read(&radio->core_lock);
+	si476x_radio_put(radio);
+	return err;
+}
+
+static int si476x_radio_fops_release(struct file *file)
+{
+	int err;
+	struct si476x_radio *radio = video_drvdata(file);
+
+	down_read(&radio->core_lock);
+
+	if (!radio->core) {
+		err = -ENODEV;
+		goto up_semaphore;
+	}
+
+	if (atomic_dec_and_test(&radio->core->users)) {
+		err = si476x_core_set_power_state(radio->core,
+						  SI476X_POWER_DOWN);
+	} else {
+		err = 0;
+	}
+
+up_semaphore:
+	up_read(&radio->core_lock);
+	si476x_radio_put(radio);
+	return err;
+}
+
+static ssize_t si476x_radio_fops_read(struct file *file, char __user *buf,
+				      size_t count, loff_t *ppos)
+{
+	ssize_t      rval;
+	size_t       fifo_len;
+	unsigned int copied;
+
+	struct si476x_radio *radio = video_drvdata(file);
+
+	down_read(&radio->core_lock);
+
+	if (!radio->core) {
+		rval = -ENODEV;
+		goto up_semaphore;
+	}
+
+	/* block if no new data available */
+	if (kfifo_is_empty(&radio->core->rds_fifo)) {
+		if (file->f_flags & O_NONBLOCK) {
+			rval = -EWOULDBLOCK;
+			goto up_semaphore;
+		}
+		rval = wait_event_interruptible(radio->core->rds_read_queue,
+				(!kfifo_is_empty(&radio->core->rds_fifo) ||
+				 !atomic_read(&radio->core->is_alive)));
+		if (rval < 0) {
+			rval = -EINTR;
+			goto up_semaphore;
+		}
+		if (!atomic_read(&radio->core->is_alive)) {
+			rval = -ENODEV;
+			goto up_semaphore;
+		}
+	}
+
+	fifo_len = kfifo_len(&radio->core->rds_fifo);
+
+	if (kfifo_to_user(&radio->core->rds_fifo, buf,
+			  min(fifo_len, count),
+			  &copied) != 0) {
+		dev_warn(&radio->videodev->dev,
+			 "Error durnig FIFO to userspace copy\n");
+		rval = -EIO;
+	} else {
+		rval = (ssize_t)copied;
+	}
+
+up_semaphore:
+	up_read(&radio->core_lock);
+	return rval;
+}
+
+
+static unsigned int si476x_radio_fops_poll(struct file *file,
+				struct poll_table_struct *pts)
+{
+	int err;
+	struct si476x_radio *radio = video_drvdata(file);
+
+	down_read(&radio->core_lock);
+	if (!radio->core) {
+		err = POLLHUP;
+		goto up_semaphore;
+	}
+
+	if (atomic_read(&radio->core->is_alive))
+		poll_wait(file, &radio->core->rds_read_queue, pts);
+
+	if (!atomic_read(&radio->core->is_alive))
+		err = POLLHUP;
+
+	if (!kfifo_is_empty(&radio->core->rds_fifo))
+		err = POLLIN | POLLRDNORM;
+
+up_semaphore:
+	up_read(&radio->core_lock);
+	return err;
+}
+
+static const struct v4l2_file_operations si476x_fops = {
+	.owner			= THIS_MODULE,
+	.read			= si476x_radio_fops_read,
+	.poll			= si476x_radio_fops_poll,
+	.unlocked_ioctl		= video_ioctl2,
+	.open			= si476x_radio_fops_open,
+	.release		= si476x_radio_fops_release,
+};
+
+static const struct v4l2_ioctl_ops si4761_ioctl_ops = {
+	.vidioc_querycap	= si476x_querycap,
+	.vidioc_queryctrl	= si476x_queryctrl,
+	.vidioc_querymenu       = si476x_querymenu,
+	.vidioc_g_ctrl		= si476x_g_ctrl,
+	.vidioc_s_ctrl		= si476x_s_ctrl,
+	.vidioc_g_audio		= si476x_g_audio,
+	.vidioc_s_audio		= si476x_s_audio,
+	.vidioc_enumaudio	= si476x_enumaudio,
+	.vidioc_g_tuner		= si476x_g_tuner,
+
+	.vidioc_g_frequency	= si476x_g_frequency,
+	.vidioc_s_frequency	= si476x_s_frequency,
+	.vidioc_s_hw_freq_seek	= si476x_s_hw_freq_seek,
+
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+	.vidioc_g_register      = si476x_g_register,
+	.vidioc_s_register      = si476x_s_register,
+#endif
+	.vidioc_default         = si476x_default,
+};
+
+
+static const struct video_device si476x_viddev_template = {
+	.fops			= &si476x_fops,
+	.name			= DRIVER_NAME,
+	.release		= video_device_release,
+};
+
+
+static int si476x_radio_initialize_mode(struct si476x_radio *radio)
+{
+	static const struct si476x_radio_ops fm_ops = {
+		.tune_freq		= si476x_core_cmd_fm_tune_freq,
+		.seek_start		= si476x_core_cmd_fm_seek_start,
+		.rsq_status		= si476x_core_cmd_fm_rsq_status,
+		.rds_blckcnt		= si476x_core_cmd_fm_rds_blockcount,
+		.phase_diversity	= si476x_core_cmd_fm_phase_diversity,
+		.phase_div_status	= si476x_core_cmd_fm_phase_div_status,
+		.acf_status		= si476x_core_cmd_fm_acf_status,
+		.agc_status		= si476x_core_cmd_agc_status,
+	};
+
+	static const struct si476x_radio_ops am_ops = {
+		.tune_freq		= si476x_core_cmd_am_tune_freq,
+		.seek_start		= si476x_core_cmd_am_seek_start,
+		.rsq_status		= si476x_core_cmd_am_rsq_status,
+		.rds_blckcnt		= NULL,
+		.phase_diversity	= NULL,
+		.phase_div_status	= NULL,
+		.acf_status		= si476x_core_cmd_am_acf_status,
+		.agc_status		= NULL,
+	};
+
+	static const struct si476x_radio_ops none_ops = {
+		.tune_freq		= NULL,
+		.seek_start		= NULL,
+		.rsq_status		= NULL,
+		.rds_blckcnt		= NULL,
+		.phase_diversity	= NULL,
+		.phase_div_status	= NULL,
+		.acf_status		= NULL,
+		.agc_status		= NULL,
+	};
+
+	struct si476x_func_info info;
+	int retval;
+
+	retval = si476x_core_cmd_func_info(radio->core, &info);
+	if (retval < 0)
+		return retval;
+
+	switch (info.func) {
+	case SI476X_FUNC_FM_RECEIVER:
+		radio->ops = &fm_ops;
+		break;
+	case SI476X_FUNC_AM_RECEIVER:
+		radio->ops = &am_ops;
+		break;
+	default:
+		WARN(1, "Unexpected tuner function value\n"); /* FALLTHROUGH */
+	case SI476X_FUNC_WB_RECEIVER: /* FALLTHROUGH */
+	case SI476X_FUNC_BOOTLOADER:
+		radio->ops = &none_ops;
+		break;
+	}
+
+	return retval;
+}
+
+static int __devinit si476x_radio_probe(struct platform_device *pdev)
+{
+	int rval;
+	struct si476x_core **core = pdev->dev.platform_data;
+	struct si476x_radio *radio;
+
+	if (!core) {
+		dev_err(&pdev->dev, "No platform data.\n");
+		rval = -EINVAL;
+		goto exit;
+	}
+
+	radio = kzalloc(sizeof(*radio), GFP_KERNEL);
+	if (!radio) {
+		rval = -ENOMEM;
+		goto exit;
+	}
+
+	radio->core = *core;
+	si476x_core_get(radio->core);
+
+	radio->videodev = video_device_alloc();
+	if (!radio->videodev) {
+		dev_err(&pdev->dev, "Failed to alloc video device.\n");
+		rval = -ENOMEM;
+		goto free_radio;
+	}
+
+	memcpy(radio->videodev, &si476x_viddev_template,
+	       sizeof(struct video_device));
+	radio->videodev->ioctl_ops = &si4761_ioctl_ops;
+
+	/* tie this device to some physical hardware */
+	radio->videodev->parent = &pdev->dev;
+
+	video_set_drvdata(radio->videodev, radio);
+	platform_set_drvdata(pdev, radio);
+
+	/* register video device */
+	rval = video_register_device(radio->videodev, VFL_TYPE_RADIO, -1);
+
+	if (rval) {
+		dev_err(&pdev->dev, "Could not register video device\n");
+	} else {
+		init_rwsem(&radio->core_lock);
+		kref_init(&radio->kref);
+		/* si476x_debugfs_init(radio, id->name); */
+		return 0;
+	}
+
+free_radio:
+	kfree(radio);
+exit:
+	return rval;
+}
+
+static void si476x_radio_delete(struct kref *kref)
+{
+	struct si476x_radio *radio = kref_to_si476x_radio(kref);
+	kfree(radio);
+}
+
+
+static int si476x_radio_remove(struct platform_device *pdev)
+{
+	struct si476x_radio *radio = platform_get_drvdata(pdev);
+
+
+	video_unregister_device(radio->videodev);
+
+	down_write(&radio->core_lock);
+	si476x_core_put(radio->core);
+	radio->core = NULL;
+	up_write(&radio->core_lock);
+
+	si476x_radio_put(radio);
+
+	return 0;
+}
+
+MODULE_ALIAS("platform:si476x-radio");
+
+static struct platform_driver si476x_radio_driver = {
+	.probe		= si476x_radio_probe,
+	.remove		= __devexit_p(si476x_radio_remove),
+	.driver		= {
+		.name	= DRIVER_NAME,
+		.owner	= THIS_MODULE,
+	},
+};
+
+static int __init si476x_module_init(void)
+{
+	return platform_driver_register(&si476x_radio_driver);
+}
+module_init(si476x_module_init);
+
+static void __exit si476x_module_exit(void)
+{
+	platform_driver_unregister(&si476x_radio_driver);
+}
+module_exit(si476x_module_exit);
+
+MODULE_AUTHOR("Andrey Smirnov <andrey.smirnov@convergeddevices.net>");
+MODULE_DESCRIPTION("Driver for Si4761/64/68 AM/FM Radio MFD Cell");
+MODULE_LICENSE("GPL");
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 3/3] Add a codec driver for SI476X MFD
  2012-09-13 22:40 [PATCH 0/3] A driver for Si476x series of chips Andrey Smirnov
  2012-09-13 22:40 ` [PATCH 1/3] Add a core driver for SI476x MFD Andrey Smirnov
  2012-09-13 22:40 ` [PATCH 2/3] Add a V4L2 driver for SI476X MFD Andrey Smirnov
@ 2012-09-13 22:40 ` Andrey Smirnov
  2012-10-01 17:29   ` Mark Brown
  2012-09-25 11:39 ` [PATCH 0/3] A driver for Si476x series of chips Mauro Carvalho Chehab
  3 siblings, 1 reply; 13+ messages in thread
From: Andrey Smirnov @ 2012-09-13 22:40 UTC (permalink / raw)
  To: linux-media; +Cc: linux-kernel

This commit add a sound codec driver for Silicon Laboratories 476x
series of AM/FM radio chips.

Signed-off-by: Andrey Smirnov <andrey.smirnov@convergeddevices.net>
---
 sound/soc/codecs/Kconfig  |    4 +
 sound/soc/codecs/Makefile |    2 +
 sound/soc/codecs/si476x.c |  346 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 352 insertions(+)
 create mode 100644 sound/soc/codecs/si476x.c

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 9f8e859..71ab390 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -70,6 +70,7 @@ config SND_SOC_ALL_CODECS
 	select SND_SOC_UDA134X
 	select SND_SOC_UDA1380 if I2C
 	select SND_SOC_WL1273 if MFD_WL1273_CORE
+	select SND_SOC_SI476X if MFD_SI476X_CORE
 	select SND_SOC_WM1250_EV1 if I2C
 	select SND_SOC_WM2000 if I2C
 	select SND_SOC_WM2200 if I2C
@@ -326,6 +327,9 @@ config SND_SOC_UDA1380
 config SND_SOC_WL1273
 	tristate
 
+config SND_SOC_SI476X
+	tristate
+
 config SND_SOC_WM1250_EV1
 	tristate
 
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 34148bb..aecf09b 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -61,6 +61,7 @@ snd-soc-twl6040-objs := twl6040.o
 snd-soc-uda134x-objs := uda134x.o
 snd-soc-uda1380-objs := uda1380.o
 snd-soc-wl1273-objs := wl1273.o
+snd-soc-si476x-objs := si476x.o
 snd-soc-wm1250-ev1-objs := wm1250-ev1.o
 snd-soc-wm2000-objs := wm2000.o
 snd-soc-wm2200-objs := wm2200.o
@@ -177,6 +178,7 @@ obj-$(CONFIG_SND_SOC_TWL6040)	+= snd-soc-twl6040.o
 obj-$(CONFIG_SND_SOC_UDA134X)	+= snd-soc-uda134x.o
 obj-$(CONFIG_SND_SOC_UDA1380)	+= snd-soc-uda1380.o
 obj-$(CONFIG_SND_SOC_WL1273)	+= snd-soc-wl1273.o
+obj-$(CONFIG_SND_SOC_SI476X)	+= snd-soc-si476x.o
 obj-$(CONFIG_SND_SOC_WM1250_EV1) += snd-soc-wm1250-ev1.o
 obj-$(CONFIG_SND_SOC_WM2000)	+= snd-soc-wm2000.o
 obj-$(CONFIG_SND_SOC_WM2200)	+= snd-soc-wm2200.o
diff --git a/sound/soc/codecs/si476x.c b/sound/soc/codecs/si476x.c
new file mode 100644
index 0000000..beea2ca
--- /dev/null
+++ b/sound/soc/codecs/si476x.c
@@ -0,0 +1,346 @@
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/initval.h>
+
+#include <linux/mfd/si476x-core.h>
+
+#define SI476X_AUDIO_VOLUME			0x0300
+#define SI476X_AUDIO_MUTE			0x0301
+#define SI476X_DIGITAL_IO_OUTPUT_FORMAT		0x0203
+#define SI476X_DIGITAL_IO_OUTPUT_SAMPLE_RATE	0x0202
+
+#define SI476X_DIGITAL_IO_OUTPUT_WIDTH_MASK	~((0b111 << 11) | (0b111 << 8))
+#define SI476X_DIGITAL_IO_OUTPUT_FORMAT_MASK	~(0b1111110)
+
+
+/* codec private data */
+struct si476x_codec {
+	struct si476x_core *core;
+};
+
+static unsigned int si476x_codec_read(struct snd_soc_codec *codec,
+				      unsigned int reg)
+{
+	int err;
+	struct si476x_codec *si476x = snd_soc_codec_get_drvdata(codec);
+	struct si476x_core  *core   = si476x->core;
+
+	si476x_core_lock(core);
+	err = si476x_core_cmd_get_property(core, reg);
+	si476x_core_unlock(core);
+
+	return err;
+}
+
+static int si476x_codec_write(struct snd_soc_codec *codec,
+			      unsigned int reg, unsigned int val)
+{
+	int err;
+	struct si476x_codec *si476x = snd_soc_codec_get_drvdata(codec);
+	struct si476x_core  *core   = si476x->core;
+
+	si476x_core_lock(core);
+	err = si476x_core_cmd_set_property(core, reg, val);
+	si476x_core_unlock(core);
+
+	return err;
+}
+
+
+
+static int si476x_codec_set_daudio_params(struct snd_soc_codec *codec,
+					  int width, int rate)
+{
+	int err;
+	u16 digital_io_output_format = \
+		snd_soc_read(codec,
+			     SI476X_DIGITAL_IO_OUTPUT_FORMAT);
+
+	if ((rate < 32000) || (rate > 48000)) {
+		dev_dbg(codec->dev, "Rate: %d is not supported\n", rate);
+		return -EINVAL;
+	}
+
+	err = snd_soc_write(codec, SI476X_DIGITAL_IO_OUTPUT_SAMPLE_RATE,
+			    rate);
+	if (err < 0) {
+		dev_err(codec->dev, "Failed to set sample rate\n");
+		return err;
+	}
+
+	digital_io_output_format &= SI476X_DIGITAL_IO_OUTPUT_WIDTH_MASK;
+	digital_io_output_format |= (width << 11) | (width << 8);
+
+	return snd_soc_write(codec, SI476X_DIGITAL_IO_OUTPUT_FORMAT,
+			     digital_io_output_format);
+}
+
+static int si476x_codec_volume_get(struct snd_kcontrol *kcontrol,
+				   struct snd_ctl_elem_value *ucontrol)
+{
+	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+
+	ucontrol->value.integer.value[0] =
+		snd_soc_read(codec, SI476X_AUDIO_VOLUME);
+	return 0;
+}
+
+static int si476x_codec_volume_put(struct snd_kcontrol *kcontrol,
+				   struct snd_ctl_elem_value *ucontrol)
+{
+
+	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+
+	snd_soc_write(codec, SI476X_AUDIO_VOLUME,
+		      ucontrol->value.integer.value[0]);
+	return 1;
+}
+
+#define SI476X_MAX_VOLUME 63
+
+static const struct snd_kcontrol_new si476x_controls[] = {
+	SOC_SINGLE_EXT("Analog Volume", 0, 0, SI476X_MAX_VOLUME, 0,
+		       si476x_codec_volume_get, si476x_codec_volume_put),
+};
+
+enum si476x_daudio_formats {
+	SI476X_DAUDIO_MODE_I2S     = (0x0 << 1),
+	SI476X_DAUDIO_MODE_DSP_A   = (0x6 << 1),
+	SI476X_DAUDIO_MODE_DSP_B   = (0x7 << 1),
+	SI476X_DAUDIO_MODE_LEFT_J  = (0x8 << 1),
+	SI476X_DAUDIO_MODE_RIGHT_J = (0x9 << 1),
+
+	SI476X_DAUDIO_MODE_IB = (1 << 5),
+	SI476X_DAUDIO_MODE_IF = (1 << 6),
+};
+
+static int si476x_codec_set_dai_fmt(struct snd_soc_dai *codec_dai,
+				    unsigned int fmt)
+{
+	struct snd_soc_codec *codec  = codec_dai->codec;
+	u16 digital_io_output_format = \
+		snd_soc_read(codec,
+			     SI476X_DIGITAL_IO_OUTPUT_FORMAT);
+
+	if ((fmt & SND_SOC_DAIFMT_MASTER_MASK) != SND_SOC_DAIFMT_CBS_CFS)
+		return -EINVAL;
+
+	digital_io_output_format &= SI476X_DIGITAL_IO_OUTPUT_FORMAT_MASK;
+
+	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+	case SND_SOC_DAIFMT_DSP_A:
+		digital_io_output_format |= SI476X_DAUDIO_MODE_DSP_A;
+		break;
+	case SND_SOC_DAIFMT_DSP_B:
+		digital_io_output_format |= SI476X_DAUDIO_MODE_DSP_B;
+		break;
+	case SND_SOC_DAIFMT_I2S:
+		digital_io_output_format |= SI476X_DAUDIO_MODE_I2S;
+		break;
+	case SND_SOC_DAIFMT_RIGHT_J:
+		digital_io_output_format |= SI476X_DAUDIO_MODE_RIGHT_J;
+		break;
+	case SND_SOC_DAIFMT_LEFT_J:
+		digital_io_output_format |= SI476X_DAUDIO_MODE_LEFT_J;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	/* Clock inversion */
+	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+	case SND_SOC_DAIFMT_DSP_A:
+	case SND_SOC_DAIFMT_DSP_B:
+		/* frame inversion not valid for DSP modes */
+		switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+		case SND_SOC_DAIFMT_NB_NF:
+			break;
+		case SND_SOC_DAIFMT_IB_NF:
+			digital_io_output_format |= SI476X_DAUDIO_MODE_IB;
+			break;
+		default:
+			return -EINVAL;
+		}
+		break;
+	case SND_SOC_DAIFMT_I2S:
+	case SND_SOC_DAIFMT_RIGHT_J:
+	case SND_SOC_DAIFMT_LEFT_J:
+		switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+		case SND_SOC_DAIFMT_NB_NF:
+			break;
+		case SND_SOC_DAIFMT_IB_IF:
+			digital_io_output_format |= SI476X_DAUDIO_MODE_IB |
+				SI476X_DAUDIO_MODE_IF;
+			break;
+		case SND_SOC_DAIFMT_IB_NF:
+			digital_io_output_format |= SI476X_DAUDIO_MODE_IB;
+			break;
+		case SND_SOC_DAIFMT_NB_IF:
+			digital_io_output_format |= SI476X_DAUDIO_MODE_IF;
+			break;
+		default:
+			return -EINVAL;
+		}
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return snd_soc_write(codec, SI476X_DIGITAL_IO_OUTPUT_FORMAT,
+			     digital_io_output_format);
+}
+
+static int si476x_codec_digital_mute(struct snd_soc_dai *codec_dai, int mute)
+{
+	if (mute)
+		snd_soc_write(codec_dai->codec, SI476X_AUDIO_MUTE, 0x3);
+
+	return 0;
+}
+
+
+enum si476x_pcm_format {
+	SI476X_PCM_FORMAT_S8		= 2,
+	SI476X_PCM_FORMAT_S16_LE	= 4,
+	SI476X_PCM_FORMAT_S20_3LE	= 5,
+	SI476X_PCM_FORMAT_S24_LE	= 6,
+};
+
+static int si476x_codec_hw_params(struct snd_pcm_substream *substream,
+				  struct snd_pcm_hw_params *params,
+				  struct snd_soc_dai *dai)
+{
+	int rate, width, err;
+
+	struct snd_soc_pcm_runtime *rtd    = substream->private_data;
+
+	rate = params_rate(params);
+
+	switch (params_format(params)) {
+	case SNDRV_PCM_FORMAT_S8:
+		width = SI476X_PCM_FORMAT_S8;
+	case SNDRV_PCM_FORMAT_S16_LE:
+		width = SI476X_PCM_FORMAT_S16_LE;
+		break;
+	case SNDRV_PCM_FORMAT_S20_3LE:
+		width = SI476X_PCM_FORMAT_S20_3LE;
+		break;
+	case SNDRV_PCM_FORMAT_S24_LE:
+		width = SI476X_PCM_FORMAT_S24_LE;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	err = si476x_codec_set_daudio_params(rtd->codec, width, rate);
+
+	return err;
+}
+
+
+
+static int si476x_codec_probe(struct snd_soc_codec *codec)
+{
+	struct si476x_core **core = codec->dev->platform_data;
+	struct si476x_codec *si476x;
+
+	if (!core) {
+		dev_err(codec->dev, "Platform data is missing.\n");
+		return -EINVAL;
+	}
+
+	si476x = kzalloc(sizeof(*si476x), GFP_KERNEL);
+	if (si476x == NULL) {
+		dev_err(codec->dev, "Cannot allocate memory.\n");
+		return -ENOMEM;
+	}
+
+	si476x->core = *core;
+
+	snd_soc_codec_set_drvdata(codec, si476x);
+
+	return 0;
+}
+
+static int si476x_codec_remove(struct snd_soc_codec *codec)
+{
+	struct si476x_codec *si476x = snd_soc_codec_get_drvdata(codec);
+
+	kfree(si476x);
+
+	return 0;
+}
+
+static struct snd_soc_dai_ops si476x_dai_ops = {
+	.hw_params	= si476x_codec_hw_params,
+	.digital_mute	= si476x_codec_digital_mute,
+	.set_fmt	= si476x_codec_set_dai_fmt,
+};
+
+static struct snd_soc_dai_driver si476x_dai = {
+	.name		= "si476x-codec",
+
+	.capture	= {
+		.stream_name	= "Capture",
+		.channels_min	= 2,
+		.channels_max	= 2,
+
+		.rates = SNDRV_PCM_RATE_32000 |
+		SNDRV_PCM_RATE_44100 |
+		SNDRV_PCM_RATE_48000,
+		.formats = SNDRV_PCM_FMTBIT_S8 |
+		SNDRV_PCM_FMTBIT_S16_LE |
+		SNDRV_PCM_FMTBIT_S20_3LE |
+		SNDRV_PCM_FMTBIT_S24_LE
+	},
+	.ops		= &si476x_dai_ops,
+};
+
+static struct snd_soc_codec_driver soc_codec_dev_si476x = {
+	.probe  = si476x_codec_probe,
+	.remove = si476x_codec_remove,
+	.read   = si476x_codec_read,
+	.write  = si476x_codec_write,
+};
+
+static int __devinit si476x_platform_probe(struct platform_device *pdev)
+{
+	return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_si476x,
+				      &si476x_dai, 1);
+}
+
+static int __devexit si476x_platform_remove(struct platform_device *pdev)
+{
+	snd_soc_unregister_codec(&pdev->dev);
+	return 0;
+}
+
+MODULE_ALIAS("platform:si476x-codec");
+
+static struct platform_driver si476x_platform_driver = {
+	.driver		= {
+		.name	= "si476x-codec",
+		.owner	= THIS_MODULE,
+	},
+	.probe		= si476x_platform_probe,
+	.remove		= __devexit_p(si476x_platform_remove),
+};
+
+static int __init si476x_init(void)
+{
+	return platform_driver_register(&si476x_platform_driver);
+}
+module_init(si476x_init);
+
+static void __exit si476x_exit(void)
+{
+	platform_driver_unregister(&si476x_platform_driver);
+}
+module_exit(si476x_exit);
+
+MODULE_AUTHOR("Andrey Smirnov <andrey.smirnov@convergeddevices.net>");
+MODULE_DESCRIPTION("ASoC Si4761/64 codec driver");
+MODULE_LICENSE("GPL");
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* Re: [PATCH 1/3] Add a core driver for SI476x MFD
  2012-09-13 22:40 ` [PATCH 1/3] Add a core driver for SI476x MFD Andrey Smirnov
@ 2012-09-14  6:44   ` Hans Verkuil
  2012-09-21  1:05     ` andrey.smirnov
  2012-10-01 17:20   ` Mark Brown
  1 sibling, 1 reply; 13+ messages in thread
From: Hans Verkuil @ 2012-09-14  6:44 UTC (permalink / raw)
  To: Andrey Smirnov; +Cc: linux-media, linux-kernel

Hi Andrey!

Thanks for posting this driver. One request for the future: please split this
patch up in smaller pieces: one for each c source for example. That makes it
easier to review.

On Fri September 14 2012 00:40:11 Andrey Smirnov wrote:
> This patch adds a core driver for Silicon Laboratories Si476x series
> of AM/FM tuner chips. The driver as a whole is implemented as an MFD device
> and this patch adds a core portion of it that provides all the necessary
> functionality to the two other drivers that represent radio and audio
> codec subsystems of the chip.
> 
> Signed-off-by: Andrey Smirnov <andrey.smirnov@convergeddevices.net>
> ---
>  drivers/mfd/Kconfig             |   14 +
>  drivers/mfd/Makefile            |    3 +
>  drivers/mfd/si476x-cmd.c        | 1509 +++++++++++++++++++++++++++++++++++++++
>  drivers/mfd/si476x-i2c.c        | 1033 +++++++++++++++++++++++++++
>  drivers/mfd/si476x-prop.c       |  477 +++++++++++++
>  include/linux/mfd/si476x-core.h |  522 ++++++++++++++
>  include/media/si476x.h          |  455 ++++++++++++
>  7 files changed, 4013 insertions(+)
>  create mode 100644 drivers/mfd/si476x-cmd.c
>  create mode 100644 drivers/mfd/si476x-i2c.c
>  create mode 100644 drivers/mfd/si476x-prop.c
>  create mode 100644 include/linux/mfd/si476x-core.h
>  create mode 100644 include/media/si476x.h
> 
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> index b1a1462..3fab06d 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -895,6 +895,20 @@ config MFD_WL1273_CORE
>  	  driver connects the radio-wl1273 V4L2 module and the wl1273
>  	  audio codec.
>  
> +config MFD_SI476X_CORE
> +	tristate "Support for Silicon Laboratories 4761/64/68 AM/FM radio."
> +	depends on I2C
> +	select MFD_CORE
> +	default n
> +	help
> +	  This is the core driver for the SI476x series of AM/FM radio. This MFD
> +	  driver connects the radio-si476x V4L2 module and the si476x
> +	  audio codec.
> +
> +	  To compile this driver as a module, choose M here: the
> +	  module will be called si476x-core.
> +
> +
>  config MFD_OMAP_USB_HOST
>  	bool "Support OMAP USBHS core driver"
>  	depends on USB_EHCI_HCD_OMAP || USB_OHCI_HCD_OMAP3
> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
> index 79dd22d..942257b 100644
> --- a/drivers/mfd/Makefile
> +++ b/drivers/mfd/Makefile
> @@ -132,3 +132,6 @@ obj-$(CONFIG_MFD_RC5T583)	+= rc5t583.o rc5t583-irq.o
>  obj-$(CONFIG_MFD_SEC_CORE)	+= sec-core.o sec-irq.o
>  obj-$(CONFIG_MFD_ANATOP)	+= anatop-mfd.o
>  obj-$(CONFIG_MFD_LM3533)	+= lm3533-core.o lm3533-ctrlbank.o
> +
> +si476x-core-objs := si476x-cmd.o si476x-prop.o si476x-i2c.o
> +obj-$(CONFIG_MFD_SI476X_CORE)	+= si476x-core.o
> diff --git a/drivers/mfd/si476x-cmd.c b/drivers/mfd/si476x-cmd.c
> new file mode 100644
> index 0000000..defe1f5
> --- /dev/null
> +++ b/drivers/mfd/si476x-cmd.c
> @@ -0,0 +1,1509 @@
> +/*
> + * include/media/si476x-cmd.c -- Subroutines implementing command
> + * protocol of si476x series of chips
> + *
> + * Copyright (C) 2012 Innovative Converged Devices(ICD)
> + *
> + * Author: Andrey Smirnov <andrey.smirnov@convergeddevices.net>
> + *
> + * 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 program is distributed in the hope that it will be useful, but
> + * WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + * General Public License for more details.
> + *
> + */
> +#include <linux/module.h>
> +#include <linux/completion.h>
> +#include <linux/delay.h>
> +#include <linux/atomic.h>
> +#include <linux/i2c.h>
> +#include <linux/device.h>
> +#include <linux/gpio.h>
> +#include <linux/videodev2.h>
> +
> +#include <media/si476x.h>
> +#include <linux/mfd/si476x-core.h>
> +
> +#define msb(x)                  ((u8)((u16) x >> 8))
> +#define lsb(x)                  ((u8)((u16) x &  0x00FF))
> +
> +
> +
> +#define CMD_POWER_UP				0x01
> +#define CMD_POWER_UP_A10_NRESP			1
> +#define CMD_POWER_UP_A10_NARGS			5
> +
> +#define CMD_POWER_UP_A20_NRESP			1
> +#define CMD_POWER_UP_A20_NARGS			5
> +
> +#define POWER_UP_DELAY_MS			110
> +
> +#define CMD_POWER_DOWN				0x11
> +#define CMD_POWER_DOWN_A10_NRESP		1
> +
> +#define CMD_POWER_DOWN_A20_NRESP		1
> +#define CMD_POWER_DOWN_A20_NARGS		1
> +
> +#define CMD_FUNC_INFO				0x12
> +#define CMD_FUNC_INFO_NRESP			7
> +
> +#define CMD_SET_PROPERTY			0x13
> +#define CMD_SET_PROPERTY_NARGS			5
> +#define CMD_SET_PROPERTY_NRESP			1
> +
> +#define CMD_GET_PROPERTY			0x14
> +#define CMD_GET_PROPERTY_NARGS			3
> +#define CMD_GET_PROPERTY_NRESP			4
> +
> +#define CMD_AGC_STATUS				0x17
> +#define CMD_AGC_STATUS_NRESP_A10		2
> +#define CMD_AGC_STATUS_NRESP_A20                6
> +
> +#define PIN_CFG_BYTE(x) (0x7F & (x))
> +#define CMD_DIG_AUDIO_PIN_CFG			0x18
> +#define CMD_DIG_AUDIO_PIN_CFG_NARGS		4
> +#define CMD_DIG_AUDIO_PIN_CFG_NRESP		5
> +
> +#define CMD_ZIF_PIN_CFG				0x19
> +#define CMD_ZIF_PIN_CFG_NARGS			4
> +#define CMD_ZIF_PIN_CFG_NRESP			5
> +
> +#define CMD_IC_LINK_GPO_CTL_PIN_CFG		0x1A
> +#define CMD_IC_LINK_GPO_CTL_PIN_CFG_NARGS	4
> +#define CMD_IC_LINK_GPO_CTL_PIN_CFG_NRESP	5
> +
> +#define CMD_ANA_AUDIO_PIN_CFG			0x1B
> +#define CMD_ANA_AUDIO_PIN_CFG_NARGS		1
> +#define CMD_ANA_AUDIO_PIN_CFG_NRESP		2
> +
> +#define CMD_INTB_PIN_CFG			0x1C
> +#define CMD_INTB_PIN_CFG_NARGS			2
> +#define CMD_INTB_PIN_CFG_A10_NRESP		6
> +#define CMD_INTB_PIN_CFG_A20_NRESP		3
> +
> +#define CMD_FM_TUNE_FREQ			0x30
> +#define CMD_FM_TUNE_FREQ_A10_NARGS		5
> +#define CMD_FM_TUNE_FREQ_A20_NARGS		3
> +#define CMD_FM_TUNE_FREQ_NRESP			1
> +
> +#define CMD_FM_RSQ_STATUS			0x32
> +
> +#define CMD_FM_RSQ_STATUS_A10_NARGS		1
> +#define CMD_FM_RSQ_STATUS_A10_NRESP		17
> +#define CMD_FM_RSQ_STATUS_A30_NARGS		1
> +#define CMD_FM_RSQ_STATUS_A30_NRESP		23
> +
> +
> +#define CMD_FM_SEEK_START			0x31
> +#define CMD_FM_SEEK_START_NARGS			1
> +#define CMD_FM_SEEK_START_NRESP			1
> +
> +#define CMD_FM_RDS_STATUS			0x36
> +#define CMD_FM_RDS_STATUS_NARGS			1
> +#define CMD_FM_RDS_STATUS_NRESP			16
> +
> +#define CMD_FM_RDS_BLOCKCOUNT			0x37
> +#define CMD_FM_RDS_BLOCKCOUNT_NARGS		1
> +#define CMD_FM_RDS_BLOCKCOUNT_NRESP		8
> +
> +#define CMD_FM_PHASE_DIVERSITY			0x38
> +#define CMD_FM_PHASE_DIVERSITY_NARGS		1
> +#define CMD_FM_PHASE_DIVERSITY_NRESP		1
> +
> +#define CMD_FM_PHASE_DIV_STATUS			0x39
> +#define CMD_FM_PHASE_DIV_STATUS_NRESP		2
> +
> +#define CMD_AM_TUNE_FREQ			0x40
> +#define CMD_AM_TUNE_FREQ_NARGS			3
> +#define CMD_AM_TUNE_FREQ_NRESP			1
> +
> +#define CMD_AM_RSQ_STATUS			0x42
> +#define CMD_AM_RSQ_STATUS_NARGS			1
> +#define CMD_AM_RSQ_STATUS_NRESP			13
> +
> +#define CMD_AM_SEEK_START			0x41
> +#define CMD_AM_SEEK_START_NARGS			1
> +#define CMD_AM_SEEK_START_NRESP			1
> +
> +
> +#define CMD_AM_ACF_STATUS			0x45
> +#define CMD_AM_ACF_STATUS_NRESP			6
> +#define CMD_AM_ACF_STATUS_NARGS			1
> +
> +#define CMD_FM_ACF_STATUS			0x35
> +#define CMD_FM_ACF_STATUS_NRESP			8
> +#define CMD_FM_ACF_STATUS_NARGS			1
> +
> +#define CMD_MAX_ARGS_COUNT			(10)
> +
> +
> +enum si476x_acf_status_report_bits {
> +	SI476X_ACF_BLEND_INT	= (1 << 4),
> +	SI476X_ACF_HIBLEND_INT	= (1 << 3),
> +	SI476X_ACF_HICUT_INT	= (1 << 2),
> +	SI476X_ACF_CHBW_INT	= (1 << 1),
> +	SI476X_ACF_SOFTMUTE_INT	= (1 << 0),
> +
> +	SI476X_ACF_SMUTE	= (1 << 0),
> +	SI476X_ACF_SMATTN	= 0b11111,
> +	SI476X_ACF_PILOT	= (1 << 7),
> +	SI476X_ACF_STBLEND	= ~SI476X_ACF_PILOT,
> +};
> +
> +enum si476x_agc_status_report_bits {
> +	SI476X_AGC_MXHI		= (1 << 5),
> +	SI476X_AGC_MXLO		= (1 << 4),
> +	SI476X_AGC_LNAHI	= (1 << 3),
> +	SI476X_AGC_LNALO	= (1 << 2),
> +};
> +
> +enum si476x_errors {
> +	SI476X_ERR_BAD_COMMAND		= 0x10,
> +	SI476X_ERR_BAD_ARG1		= 0x11,
> +	SI476X_ERR_BAD_ARG2		= 0x12,
> +	SI476X_ERR_BAD_ARG3		= 0x13,
> +	SI476X_ERR_BAD_ARG4		= 0x14,
> +	SI476X_ERR_BUSY			= 0x18,
> +	SI476X_ERR_BAD_INTERNAL_MEMORY  = 0x20,
> +	SI476X_ERR_BAD_PATCH		= 0x30,
> +	SI476X_ERR_BAD_BOOT_MODE	= 0x31,
> +	SI476X_ERR_BAD_PROPERTY		= 0x40,
> +};
> +
> +
> +static int si476x_core_parse_and_nag_about_error(struct si476x_core *core)
> +{
> +	int err;
> +	char *cause;
> +	u8 buffer[2];
> +
> +	if (core->revision != SI476X_REVISION_A10) {

It's much easier to reverse the test:

	if (core->revision == SI476X_REVISION_A10)
		return -EIO;

It reduces the indentation.

> +		err = si476x_i2c_xfer(core, SI476X_I2C_RECV,
> +				      buffer, sizeof(buffer));
> +		if (err == sizeof(buffer)) {

Ditto for the test above.

Add an err = -EINVAL line here, then you don't need to add it for all the cases
below.

> +			switch (buffer[1]) {
> +			case SI476X_ERR_BAD_COMMAND:
> +				cause = "Bad command";
> +				err = -EINVAL;
> +				break;
> +			case SI476X_ERR_BAD_ARG1:
> +				cause = "Bad argument #1";
> +				err = -EINVAL;
> +				break;
> +			case SI476X_ERR_BAD_ARG2:
> +				cause = "Bad argument #2";
> +				err = -EINVAL;
> +				break;
> +			case SI476X_ERR_BAD_ARG3:
> +				cause = "Bad argument #3";
> +				err = -EINVAL;
> +				break;
> +			case SI476X_ERR_BAD_ARG4:
> +				cause = "Bad argument #4";
> +				err = -EINVAL;
> +				break;
> +			case SI476X_ERR_BUSY:
> +				cause = "Chip is busy";
> +				err = -EBUSY;
> +				break;
> +			case SI476X_ERR_BAD_INTERNAL_MEMORY:
> +				cause = "Bad internal memory";
> +				err = -EIO;
> +				break;
> +			case SI476X_ERR_BAD_PATCH:
> +				cause = "Bad patch";
> +				err = -EINVAL;
> +				break;
> +			case SI476X_ERR_BAD_BOOT_MODE:
> +				cause = "Bad boot mode";
> +				err = -EINVAL;
> +				break;
> +			case SI476X_ERR_BAD_PROPERTY:
> +				cause = "Bad property";
> +				err = -EINVAL;
> +				break;
> +			default:
> +				cause = "Unknown";
> +				err = -EIO;
> +			}
> +
> +			dev_err(&core->client->dev,
> +				"[Chip error status]: %s\n", cause);
> +		} else {
> +			dev_err(&core->client->dev,
> +				"Failed to fetch error code\n");
> +			err = (err >= 0) ? -EIO : err;
> +		}
> +	} else {
> +		err = -EIO;
> +	}
> +
> +	return err;
> +}
> +
> +/**
> + * __core_send_command() - sends a command to si476x and waits its
> + * response
> + * @core:    si476x_device structure for the device we are
> + *            communicating with
> + * @command:  command id
> + * @args:     command arguments we are sending
> + * @argn:     actual size of @args
> + * @response: buffer to place the expected response from the device
> + * @respn:    actual size of @response
> + * @usecs:    amount of time to wait before reading the response (in
> + *            usecs)
> + *
> + * Function returns 0 on succsess and negative error code on
> + * failure
> + */
> +static int __core_send_command(struct si476x_core *core,
> +				    const u8 command,
> +				    const u8 args[],
> +				    const int argn,
> +				    u8 resp[],
> +				    const int respn,
> +				    const int usecs)
> +{
> +	struct i2c_client *client = core->client;
> +	int err;
> +	u8  data[CMD_MAX_ARGS_COUNT + 1];
> +
> +	if (argn > CMD_MAX_ARGS_COUNT) {
> +		err = -ENOMEM;
> +		goto exit;

Why goto exit? There is no clean up after the exit label, so just return
immediately. Ditto for all the other goto exit's in this function.

> +	}
> +
> +	if (!client->adapter) {
> +		err = -ENODEV;
> +		goto exit;
> +	}
> +
> +	/* First send the command and its arguments */
> +	data[0] = command;
> +	memcpy(&data[1], args, argn);
> +	DBG_BUFFER(&client->dev, "Command:\n", data, argn + 1);
> +
> +	err = si476x_i2c_xfer(core, SI476X_I2C_SEND, (char *) data, argn + 1);
> +	if (err != argn + 1) {
> +		dev_err(&core->client->dev,
> +			"Error while sending command 0x%02x\n",
> +			command);
> +		err = (err >= 0) ? -EIO : err;
> +		goto exit;
> +	}
> +	/* Set CTS to zero only after the command is send to avoid
> +	 * possible racing conditions when working in polling mode */
> +	atomic_set(&core->cts, 0);
> +
> +	if (!wait_event_timeout(core->command,
> +				atomic_read(&core->cts),
> +				usecs_to_jiffies(usecs) + 1))
> +		dev_warn(&core->client->dev,
> +			 "(%s) [CMD 0x%02x] Device took too much time to answer.\n",
> +			 __func__, command);
> +
> +	/*
> +	  When working in polling mode, for some reason the tuner will
> +	  report CTS bit as being set in the first status byte read,
> +	  but all the consequtive ones will return zros until the
> +	  tuner is actually completed the POWER_UP command. To
> +	  workaround that we wait for second CTS to be reported
> +	 */
> +	if (unlikely(!core->client->irq && command == CMD_POWER_UP)) {
> +		if (!wait_event_timeout(core->command,
> +					atomic_read(&core->cts),
> +					usecs_to_jiffies(usecs) + 1))
> +			dev_warn(&core->client->dev,
> +				 "(%s) Power up took too much time.\n",
> +				 __func__);
> +	}
> +
> +	/* Then get the response */
> +	err = si476x_i2c_xfer(core, SI476X_I2C_RECV, resp, respn);
> +	if (err != respn) {
> +		dev_err(&core->client->dev,
> +			"Error while reading response for command 0x%02x\n",
> +			command);
> +		err = (err >= 0) ? -EIO : err;
> +		goto exit;
> +	}
> +	DBG_BUFFER(&client->dev, "Response:\n", resp, respn);
> +
> +	err = 0;
> +
> +	if (resp[0] & SI476X_ERR) {
> +		dev_err(&core->client->dev, "Chip set error flag\n");
> +		err = si476x_core_parse_and_nag_about_error(core);
> +		goto exit;
> +	}
> +
> +	if (!(resp[0] & SI476X_CTS))
> +		err = -EBUSY;
> +exit:
> +	return err;
> +}
> +
> +#define CORE_SEND_COMMAND(core, cmd, args, resp, timeout)		\
> +	__core_send_command(core, cmd, args,				\
> +			    ARRAY_SIZE(args),				\
> +			    resp, ARRAY_SIZE(resp),			\
> +			    timeout)
> +
> +
> +static int __cmd_tune_seek_freq(struct si476x_core *core,
> +				uint8_t cmd,
> +				const uint8_t args[], size_t argn,
> +				uint8_t *resp, size_t respn,
> +				int (*clear_stcint) (struct si476x_core *core))
> +{
> +	int err;
> +
> +	atomic_set(&core->stc, 0);
> +	err = __core_send_command(core, cmd, args, argn,
> +				  resp, respn,
> +				  atomic_read(&core->timeouts.command));
> +	if (!err) {

Invert the test to simplify indentation.

> +		if (!wait_event_timeout(core->tuning,
> +		atomic_read(&core->stc),
> +		usecs_to_jiffies(atomic_read(&core->timeouts.tune)) + 1)) {

Weird indentation above. Indent the arguments more to the right.

> +			dev_warn(&core->client->dev,
> +				 "%s: Device took too much time "
> +				 "to answer (%d usec).\n",
> +				 __func__,
> +				 atomic_read(&core->timeouts.tune));
> +			err = -ETIMEDOUT;
> +		} else {
> +			err = clear_stcint(core);
> +		}
> +	}
> +
> +	return err;
> +}
> +
> +
> +/**
> + * si476x_cmd_func_info() - send 'FUNC_INFO' command to the device
> + * @core: device to send the command to
> + * @info:  struct si476x_func_info to fill all the information
> + *         returned by the command
> + *
> + * The command requests the firmware and patch version for currently
> + * loaded firmware (dependent on the function of the device FM/AM/WB)
> + *
> + * Function returns 0 on succsess and negative error code on

typo: success

> + * failure
> + */
> +int si476x_core_cmd_func_info(struct si476x_core *core,
> +			      struct si476x_func_info *info)
> +{
> +	int err;
> +	u8  resp[CMD_FUNC_INFO_NRESP];
> +
> +	err = __core_send_command(core, CMD_FUNC_INFO,
> +				  NULL, 0,
> +				  resp, ARRAY_SIZE(resp),
> +				  atomic_read(&core->timeouts.command));
> +
> +	info->firmware.major    = resp[1];
> +	info->firmware.minor[0] = resp[2];
> +	info->firmware.minor[1] = resp[3];
> +
> +	info->patch_id = ((u16) resp[4] << 8) | resp[5];
> +	info->func     = resp[6];
> +
> +	return err;
> +}
> +EXPORT_SYMBOL_GPL(si476x_core_cmd_func_info);
> +
> +/**
> + * si476x_cmd_set_property() - send 'SET_PROPERTY' command to the device
> + * @core:    device to send the command to
> + * @property: property address
> + * @value:    property value
> + *
> + * Function returns 0 on succsess and negative error code on
> + * failure
> + */
> +int si476x_core_cmd_set_property(struct si476x_core *core,
> +				 u16 property, u16 value)
> +{
> +	u8       resp[CMD_SET_PROPERTY_NRESP];
> +	const u8 args[CMD_SET_PROPERTY_NARGS] = {
> +		0x00,
> +		msb(property),
> +		lsb(property),
> +		msb(value),
> +		lsb(value),
> +	};
> +
> +	return CORE_SEND_COMMAND(core, CMD_SET_PROPERTY,
> +				 args, resp,
> +				 atomic_read(&core->timeouts.command));
> +}
> +EXPORT_SYMBOL_GPL(si476x_core_cmd_set_property);
> +
> +/**
> + * si476x_cmd_get_property() - send 'GET_PROPERTY' command to the device
> + * @core:    device to send the command to
> + * @property: property address
> + *
> + * Function return the value of property as u16 on success or a
> + * negative error on failure
> + */
> +int si476x_core_cmd_get_property(struct si476x_core *core, u16 property)
> +{
> +	int err;
> +	u8       resp[CMD_GET_PROPERTY_NRESP];
> +	const u8 args[CMD_GET_PROPERTY_NARGS] = {
> +		0x00,
> +		msb(property),
> +		lsb(property),
> +	};
> +
> +	err = CORE_SEND_COMMAND(core, CMD_GET_PROPERTY,
> +				args, resp,
> +				atomic_read(&core->timeouts.command));
> +	if (err < 0)
> +		return err;
> +	else
> +		return be16_to_cpup((__be16 *)(resp + 2));
> +}
> +EXPORT_SYMBOL_GPL(si476x_core_cmd_get_property);
> +
> +/**
> + * si476x_cmd_dig_audio_pin_cfg() - send 'DIG_AUDIO_PIN_CFG' command to
> + * the device
> + * @core: device to send the command to
> + * @dclk:  DCLK pin function configuration:
> + *	   #SI476X_DCLK_NOOP     - do not modify the behaviour
> + *         #SI476X_DCLK_TRISTATE - put the pin in tristate condition,
> + *                                 enable 1MOhm pulldown
> + *         #SI476X_DCLK_DAUDIO   - set the pin to be a part of digital
> + *                                 audio interface
> + * @dfs:   DFS pin function configuration:
> + *         #SI476X_DFS_NOOP      - do not modify the behaviour
> + *         #SI476X_DFS_TRISTATE  - put the pin in tristate condition,
> + *                             enable 1MOhm pulldown
> + *      SI476X_DFS_DAUDIO    - set the pin to be a part of digital
> + *                             audio interface
> + * @dout - DOUT pin function configuration:
> + *      SI476X_DOUT_NOOP       - do not modify the behaviour
> + *      SI476X_DOUT_TRISTATE   - put the pin in tristate condition,
> + *                               enable 1MOhm pulldown
> + *      SI476X_DOUT_I2S_OUTPUT - set this pin to be digital out on I2S
> + *                               port 1
> + *      SI476X_DOUT_I2S_INPUT  - set this pin to be digital in on I2S
> + *                               port 1
> + * @xout - XOUT pin function configuration:
> + *	SI476X_XOUT_NOOP        - do not modify the behaviour
> + *      SI476X_XOUT_TRISTATE    - put the pin in tristate condition,
> + *                                enable 1MOhm pulldown
> + *      SI476X_XOUT_I2S_INPUT   - set this pin to be digital in on I2S
> + *                                port 1
> + *      SI476X_XOUT_MODE_SELECT - set this pin to be the input that
> + *                                selects the mode of the I2S audio
> + *                                combiner (analog or HD)
> + *                                [SI4761/63/65/67 Only]
> + *
> + * Function returns 0 on success and negative error code on failure
> + */
> +int si476x_core_cmd_dig_audio_pin_cfg(struct  si476x_core *core,
> +				      enum si476x_dclk_config dclk,
> +				      enum si476x_dfs_config  dfs,
> +				      enum si476x_dout_config dout,
> +				      enum si476x_xout_config xout)
> +{
> +	u8       resp[CMD_DIG_AUDIO_PIN_CFG_NRESP];
> +	const u8 args[CMD_DIG_AUDIO_PIN_CFG_NARGS] = {
> +		PIN_CFG_BYTE(dclk),
> +		PIN_CFG_BYTE(dfs),
> +		PIN_CFG_BYTE(dout),
> +		PIN_CFG_BYTE(xout),
> +	};
> +
> +	return CORE_SEND_COMMAND(core, CMD_DIG_AUDIO_PIN_CFG,
> +				 args, resp,
> +				 atomic_read(&core->timeouts.command));
> +}
> +EXPORT_SYMBOL_GPL(si476x_core_cmd_dig_audio_pin_cfg);
> +
> +/**
> + * si476x_cmd_zif_pin_cfg - send 'ZIF_PIN_CFG_COMMAND'
> + * @core - device to send the command to
> + * @iqclk - IQCL pin function configuration:
> + *       SI476X_IQCLK_NOOP     - do not modify the behaviour
> + *       SI476X_IQCLK_TRISTATE - put the pin in tristate condition,
> + *                               enable 1MOhm pulldown
> + *       SI476X_IQCLK_IQ       - set pin to be a part of I/Q interace
> + *                               in master mode
> + * @iqfs - IQFS pin function configuration:
> + *       SI476X_IQFS_NOOP     - do not modify the behaviour
> + *       SI476X_IQFS_TRISTATE - put the pin in tristate condition,
> + *                              enable 1MOhm pulldown
> + *       SI476X_IQFS_IQ       - set pin to be a part of I/Q interace
> + *                              in master mode
> + * @iout - IOUT pin function configuration:
> + *       SI476X_IOUT_NOOP     - do not modify the behaviour
> + *       SI476X_IOUT_TRISTATE - put the pin in tristate condition,
> + *                              enable 1MOhm pulldown
> + *       SI476X_IOUT_OUTPUT   - set pin to be I out
> + * @qout - QOUT pin function configuration:
> + *       SI476X_QOUT_NOOP     - do not modify the behaviour
> + *       SI476X_QOUT_TRISTATE - put the pin in tristate condition,
> + *                              enable 1MOhm pulldown
> + *       SI476X_QOUT_OUTPUT   - set pin to be Q out
> + *
> + * Function returns 0 on success and negative error code on failure
> + */
> +int si476x_core_cmd_zif_pin_cfg(struct si476x_core *core,
> +				enum si476x_iqclk_config iqclk,
> +				enum si476x_iqfs_config iqfs,
> +				enum si476x_iout_config iout,
> +				enum si476x_qout_config qout)
> +{
> +	u8       resp[CMD_ZIF_PIN_CFG_NRESP];
> +	const u8 args[CMD_ZIF_PIN_CFG_NARGS] = {
> +		PIN_CFG_BYTE(iqclk),
> +		PIN_CFG_BYTE(iqfs),
> +		PIN_CFG_BYTE(iout),
> +		PIN_CFG_BYTE(qout),
> +	};
> +
> +	return CORE_SEND_COMMAND(core, CMD_ZIF_PIN_CFG,
> +				 args, resp,
> +				 atomic_read(&core->timeouts.command));
> +}
> +EXPORT_SYMBOL_GPL(si476x_core_cmd_zif_pin_cfg);
> +
> +/**
> + * si476x_cmd_ic_link_gpo_ctl_pin_cfg - send
> + * 'IC_LINK_GPIO_CTL_PIN_CFG' comand to the device
> + * @core - device to send the command to
> + * @icin - ICIN pin function configuration:
> + *      SI476X_ICIN_NOOP      - do not modify the behaviour
> + *      SI476X_ICIN_TRISTATE  - put the pin in tristate condition,
> + *                              enable 1MOhm pulldown
> + *      SI476X_ICIN_GPO1_HIGH - set pin to be an output, drive it high
> + *      SI476X_ICIN_GPO1_LOW  - set pin to be an output, drive it low
> + *      SI476X_ICIN_IC_LINK   - set the pin to be a part of Inter-Chip link
> + * @icip - ICIP pin function configuration:
> + *      SI476X_ICIP_NOOP      - do not modify the behaviour
> + *      SI476X_ICIP_TRISTATE  - put the pin in tristate condition,
> + *                              enable 1MOhm pulldown
> + *      SI476X_ICIP_GPO1_HIGH - set pin to be an output, drive it high
> + *      SI476X_ICIP_GPO1_LOW  - set pin to be an output, drive it low
> + *      SI476X_ICIP_IC_LINK   - set the pin to be a part of Inter-Chip link
> + * @icon - ICON pin function configuration:
> + *      SI476X_ICON_NOOP     - do not modify the behaviour
> + *      SI476X_ICON_TRISTATE - put the pin in tristate condition,
> + *                             enable 1MOhm pulldown
> + *      SI476X_ICON_I2S      - set the pin to be a part of audio
> + *                             interface in slave mode (DCLK)
> + *      SI476X_ICON_IC_LINK  - set the pin to be a part of Inter-Chip link
> + * @icop - ICOP pin function configuration:
> + *      SI476X_ICOP_NOOP     - do not modify the behaviour
> + *      SI476X_ICOP_TRISTATE - put the pin in tristate condition,
> + *                             enable 1MOhm pulldown
> + *      SI476X_ICOP_I2S      - set the pin to be a part of audio
> + *                             interface in slave mode (DOUT)
> + *                             [Si4761/63/65/67 Only]
> + *      SI476X_ICOP_IC_LINK  - set the pin to be a part of Inter-Chip link
> + *
> + * Function returns 0 on success and negative error code on failure
> + */
> +int si476x_core_cmd_ic_link_gpo_ctl_pin_cfg(struct si476x_core *core,
> +					    enum si476x_icin_config icin,
> +					    enum si476x_icip_config icip,
> +					    enum si476x_icon_config icon,
> +					    enum si476x_icop_config icop)
> +{
> +	u8       resp[CMD_IC_LINK_GPO_CTL_PIN_CFG_NRESP];
> +	const u8 args[CMD_IC_LINK_GPO_CTL_PIN_CFG_NARGS] = {
> +		PIN_CFG_BYTE(icin),
> +		PIN_CFG_BYTE(icip),
> +		PIN_CFG_BYTE(icon),
> +		PIN_CFG_BYTE(icop),
> +	};
> +
> +	return CORE_SEND_COMMAND(core, CMD_IC_LINK_GPO_CTL_PIN_CFG,
> +				 args, resp,
> +				 atomic_read(&core->timeouts.command));
> +}
> +EXPORT_SYMBOL_GPL(si476x_core_cmd_ic_link_gpo_ctl_pin_cfg);
> +
> +/**
> + * si476x_cmd_ana_audio_pin_cfg - send 'ANA_AUDIO_PIN_CFG' to the
> + * device
> + * @core - device to send the command to
> + * @lrout - LROUT pin function configuration:
> + *       SI476X_LROUT_NOOP     - do not modify the behaviour
> + *       SI476X_LROUT_TRISTATE - put the pin in tristate condition,
> + *                               enable 1MOhm pulldown
> + *       SI476X_LROUT_AUDIO    - set pin to be audio output
> + *       SI476X_LROUT_MPX      - set pin to be MPX output
> + *
> + * Function returns 0 on success and negative error code on failure
> + */
> +int si476x_core_cmd_ana_audio_pin_cfg(struct si476x_core *core,
> +				      enum si476x_lrout_config lrout)
> +{
> +	u8       resp[CMD_ANA_AUDIO_PIN_CFG_NRESP];
> +	const u8 args[CMD_ANA_AUDIO_PIN_CFG_NARGS] = {
> +		PIN_CFG_BYTE(lrout),
> +	};
> +
> +	return CORE_SEND_COMMAND(core, CMD_ANA_AUDIO_PIN_CFG,
> +				 args, resp,
> +				 atomic_read(&core->timeouts.command));
> +}
> +EXPORT_SYMBOL_GPL(si476x_core_cmd_ana_audio_pin_cfg);
> +
> +
> +/**
> + * si476x_cmd_intb_pin_cfg - send 'INTB_PIN_CFG' command to the device
> + * @core - device to send the command to
> + * @intb - INTB pin function configuration:
> + *      SI476X_INTB_NOOP     - do not modify the behaviour
> + *      SI476X_INTB_TRISTATE - put the pin in tristate condition,
> + *                             enable 1MOhm pulldown
> + *      SI476X_INTB_DAUDIO   - set pin to be a part of digital
> + *                             audio interface in slave mode
> + *      SI476X_INTB_IRQ      - set pin to be an interrupt request line
> + * @a1 - A1 pin function configuration:
> + *      SI476X_A1_NOOP     - do not modify the behaviour
> + *      SI476X_A1_TRISTATE - put the pin in tristate condition,
> + *                           enable 1MOhm pulldown
> + *      SI476X_A1_IRQ      - set pin to be an interrupt request line
> + *
> + * Function returns 0 on success and negative error code on failure
> + */
> +static int si476x_core_cmd_intb_pin_cfg_a10(struct si476x_core *core,
> +					    enum si476x_intb_config intb,
> +					    enum si476x_a1_config a1)
> +{
> +	u8       resp[CMD_INTB_PIN_CFG_A10_NRESP];
> +	const u8 args[CMD_INTB_PIN_CFG_NARGS] = {
> +		PIN_CFG_BYTE(intb),
> +		PIN_CFG_BYTE(a1),
> +	};
> +
> +	return CORE_SEND_COMMAND(core, CMD_INTB_PIN_CFG,
> +				 args, resp,
> +				 atomic_read(&core->timeouts.command));
> +}
> +
> +static int si476x_core_cmd_intb_pin_cfg_a20(struct si476x_core *core,
> +					    enum si476x_intb_config intb,
> +					    enum si476x_a1_config a1)
> +{
> +	u8       resp[CMD_INTB_PIN_CFG_A20_NRESP];
> +	const u8 args[CMD_INTB_PIN_CFG_NARGS] = {
> +		PIN_CFG_BYTE(intb),
> +		PIN_CFG_BYTE(a1),
> +	};
> +
> +	return CORE_SEND_COMMAND(core, CMD_INTB_PIN_CFG,
> +				 args, resp,
> +				 atomic_read(&core->timeouts.command));
> +}
> +
> +
> +
> +/**
> + * si476x_cmd_am_rsq_status - send 'FM_TUNE_FREQ' command to the
> + * device
> + * @core  - device to send the command to
> + * @rsqack - if set command clears RSQINT, SNRINT, SNRLINT, RSSIHINT,
> + *           RSSSILINT, BLENDINT, MULTHINT and MULTLINT
> + * @attune - when set the values in the status report are the values
> + *           that were calculated at tune
> + * @cancel - abort ongoing seek/tune opertation
> + * @stcack - clear the STCINT bin in status register
> + * @report - all signal quality information retured by the command
> + *           (if NULL then the output of the command is ignored)
> + *
> + * Function returns 0 on success and negative error code on failure
> + */
> +int si476x_core_cmd_am_rsq_status(struct si476x_core *core,
> +				  struct si476x_rsq_status_args *rsqargs,
> +				  struct si476x_rsq_status_report *report)
> +{
> +	int err;
> +	u8       resp[CMD_AM_RSQ_STATUS_NRESP];
> +	const u8 args[CMD_AM_RSQ_STATUS_NARGS] = {
> +		rsqargs->rsqack << 3 | rsqargs->attune << 2 |
> +		rsqargs->cancel << 1 | rsqargs->stcack,
> +	};
> +
> +	err = CORE_SEND_COMMAND(core, CMD_AM_RSQ_STATUS,
> +				args, resp,
> +				atomic_read(&core->timeouts.command));
> +
> +	if (report) {
> +		report->snrhint		= 0b00001000 & resp[1];
> +		report->snrlint		= 0b00000100 & resp[1];
> +		report->rssihint	= 0b00000010 & resp[1];
> +		report->rssilint	= 0b00000001 & resp[1];
> +
> +		report->bltf		= 0b10000000 & resp[2];
> +		report->snr_ready	= 0b00100000 & resp[2];
> +		report->rssiready	= 0b00001000 & resp[2];
> +		report->afcrl		= 0b00000010 & resp[2];
> +		report->valid		= 0b00000001 & resp[2];
> +
> +		report->readfreq	= be16_to_cpup((__be16 *)(resp + 3));
> +		report->freqoff		= resp[5];
> +		report->rssi		= resp[6];
> +		report->snr		= resp[7];
> +		report->lassi		= resp[9];
> +		report->hassi		= resp[10];
> +		report->mult		= resp[11];
> +		report->dev		= resp[12];
> +	}
> +
> +	return err;
> +}
> +EXPORT_SYMBOL_GPL(si476x_core_cmd_am_rsq_status);
> +
> +int si476x_core_cmd_fm_acf_status(struct si476x_core *core,
> +			     struct si476x_acf_status_report *report)
> +{
> +	int err;
> +	u8       resp[CMD_FM_ACF_STATUS_NRESP];
> +	const u8 args[CMD_FM_ACF_STATUS_NARGS] = {
> +		0x0,
> +	};
> +
> +	if (!report)
> +		return -EINVAL;
> +
> +	err = CORE_SEND_COMMAND(core, CMD_FM_ACF_STATUS,
> +				args, resp,
> +				atomic_read(&core->timeouts.command));
> +
> +	if (!err) {
> +		report->blend_int	= resp[1] & SI476X_ACF_BLEND_INT;
> +		report->hblend_int	= resp[1] & SI476X_ACF_HIBLEND_INT;
> +		report->hicut_int	= resp[1] & SI476X_ACF_HICUT_INT;
> +		report->chbw_int	= resp[1] & SI476X_ACF_CHBW_INT;
> +		report->softmute_int	= resp[1] & SI476X_ACF_SOFTMUTE_INT;
> +		report->smute		= resp[2] & SI476X_ACF_SMUTE;
> +		report->smattn		= resp[3] & SI476X_ACF_SMATTN;
> +		report->chbw		= resp[4];
> +		report->hicut		= resp[5];
> +		report->hiblend		= resp[6];
> +		report->pilot		= resp[7] & SI476X_ACF_PILOT;
> +		report->stblend		= resp[7] & SI476X_ACF_STBLEND;
> +	}
> +
> +	return err;
> +}
> +EXPORT_SYMBOL_GPL(si476x_core_cmd_fm_acf_status);
> +
> +int si476x_core_cmd_am_acf_status(struct si476x_core *core,
> +				  struct si476x_acf_status_report *report)
> +{
> +	int err;
> +	u8       resp[CMD_AM_ACF_STATUS_NRESP];
> +	const u8 args[CMD_AM_ACF_STATUS_NARGS] = {
> +		0x0,
> +	};
> +
> +	if (!report)
> +		return -EINVAL;
> +
> +	err = CORE_SEND_COMMAND(core, CMD_AM_ACF_STATUS,
> +				args, resp,
> +				atomic_read(&core->timeouts.command));
> +
> +	if (!err) {
> +		report->blend_int	= resp[1] & SI476X_ACF_BLEND_INT;
> +		report->hblend_int	= resp[1] & SI476X_ACF_HIBLEND_INT;
> +		report->hicut_int	= resp[1] & SI476X_ACF_HICUT_INT;
> +		report->chbw_int	= resp[1] & SI476X_ACF_CHBW_INT;
> +		report->softmute_int	= resp[1] & SI476X_ACF_SOFTMUTE_INT;
> +		report->smute		= resp[2] & SI476X_ACF_SMUTE;
> +		report->smattn		= resp[3] & SI476X_ACF_SMATTN;
> +		report->chbw		= resp[4];
> +		report->hicut		= resp[5];
> +	}
> +
> +	return err;
> +}
> +EXPORT_SYMBOL_GPL(si476x_core_cmd_am_acf_status);
> +
> +static inline int __fm_clear_stcint(struct si476x_core *core)
> +{
> +	struct si476x_rsq_status_args args = {
> +		.primary	= false,
> +		.rsqack		= false,
> +		.attune		= false,
> +		.cancel		= false,
> +		.stcack		= true,
> +	};
> +	return si476x_core_cmd_fm_rsq_status(core, &args, NULL);
> +}
> +
> +static inline int __am_clear_stcint(struct si476x_core *core)
> +{
> +	struct si476x_rsq_status_args args = {
> +		.primary	= false,
> +		.rsqack		= false,
> +		.attune		= false,
> +		.cancel		= false,
> +		.stcack		= true,
> +	};
> +	return si476x_core_cmd_am_rsq_status(core,  &args, NULL);
> +}
> +
> +
> +
> +/**
> + * si476x_cmd_fm_seek_start - send 'FM_SEEK_START' command to the
> + * device
> + * @core  - device to send the command to
> + * @seekup - if set the direction of the search is 'up'
> + * @wrap   - if set seek wraps when hitting band limit
> + *
> + * This function begins search for a valid station. The station is
> + * considered valid when 'FM_VALID_SNR_THRESHOLD' and
> + * 'FM_VALID_RSSI_THRESHOLD' and 'FM_VALID_MAX_TUNE_ERROR' criteria
> + * are met.
> +} *
> + * Function returns 0 on success and negative error code on failure
> + */
> +int si476x_core_cmd_fm_seek_start(struct si476x_core *core,
> +				  bool seekup, bool wrap)
> +{
> +	u8       resp[CMD_FM_SEEK_START_NRESP];
> +	const u8 args[CMD_FM_SEEK_START_NARGS] = {
> +		seekup << 3 | wrap << 2,
> +	};
> +
> +	return __cmd_tune_seek_freq(core, CMD_FM_SEEK_START,
> +				    args, sizeof(args), resp, sizeof(resp),
> +				    __fm_clear_stcint);
> +}
> +EXPORT_SYMBOL_GPL(si476x_core_cmd_fm_seek_start);
> +
> +/**
> + * si476x_cmd_fm_rds_status - send 'FM_RDS_STATUS' command to the
> + * device
> + * @core - device to send the command to
> + * @status_only - if set the data is not removed from RDSFIFO,
> + *                RDSFIFOUSED is not decremented and data in all the
> + *                rest RDS data contains the last valid info received
> + * @mtfifo if set the command clears RDS receive FIFO
> + * @intack if set the command clards the RDSINT bit.
> + *
> + * Function returns 0 on success and negative error code on failure
> + */
> +int si476x_core_cmd_fm_rds_status(struct si476x_core *core,
> +				  bool status_only,
> +				  bool mtfifo,
> +				  bool intack,
> +				  struct si476x_rds_status_report *report)
> +{
> +	int err;
> +	u8       resp[CMD_FM_RDS_STATUS_NRESP];
> +	const u8 args[CMD_FM_RDS_STATUS_NARGS] = {
> +		status_only << 2 | mtfifo << 1 | intack,
> +	};
> +
> +	err = CORE_SEND_COMMAND(core, CMD_FM_RDS_STATUS,
> +				args, resp,
> +				atomic_read(&core->timeouts.command));
> +
> +	if (!err && report) {
> +		report->rdstpptyint	= 0b00010000 & resp[1];
> +		report->rdspiint	= 0b00001000 & resp[1];
> +		report->rdssyncint	= 0b00000010 & resp[1];
> +		report->rdsfifoint	= 0b00000001 & resp[1];
> +
> +		report->tpptyvalid	= 0b00010000 & resp[2];
> +		report->pivalid		= 0b00001000 & resp[2];
> +		report->rdssync		= 0b00000010 & resp[2];
> +		report->rdsfifolost	= 0b00000001 & resp[2];
> +
> +		report->tp		= 0b00100000 & resp[3];
> +		report->pty		= 0b00011111 & resp[3];
> +
> +		report->pi		= be16_to_cpup((__be16 *)(resp + 4));
> +		report->rdsfifoused	= resp[6];
> +
> +		report->ble[V4L2_RDS_BLOCK_A]	= 0b11000000 & resp[7];
> +		report->ble[V4L2_RDS_BLOCK_B]	= 0b00110000 & resp[7];
> +		report->ble[V4L2_RDS_BLOCK_C]	= 0b00001100 & resp[7];
> +		report->ble[V4L2_RDS_BLOCK_D]	= 0b00000011 & resp[7];
> +
> +		report->rds[V4L2_RDS_BLOCK_A].block = V4L2_RDS_BLOCK_A;
> +		report->rds[V4L2_RDS_BLOCK_A].msb = resp[8];
> +		report->rds[V4L2_RDS_BLOCK_A].lsb = resp[9];
> +
> +		report->rds[V4L2_RDS_BLOCK_B].block = V4L2_RDS_BLOCK_B;
> +		report->rds[V4L2_RDS_BLOCK_B].msb = resp[10];
> +		report->rds[V4L2_RDS_BLOCK_B].lsb = resp[11];
> +
> +		report->rds[V4L2_RDS_BLOCK_C].block = V4L2_RDS_BLOCK_C;
> +		report->rds[V4L2_RDS_BLOCK_C].msb = resp[12];
> +		report->rds[V4L2_RDS_BLOCK_C].lsb = resp[13];
> +
> +		report->rds[V4L2_RDS_BLOCK_D].block = V4L2_RDS_BLOCK_D;
> +		report->rds[V4L2_RDS_BLOCK_D].msb = resp[14];
> +		report->rds[V4L2_RDS_BLOCK_D].lsb = resp[15];
> +	}
> +
> +	return err;
> +}
> +
> +int si476x_core_cmd_fm_rds_blockcount(struct si476x_core *core,
> +				bool clear,
> +				struct si476x_rds_blockcount_report *report)
> +{
> +	int err;
> +	u8       resp[CMD_FM_RDS_BLOCKCOUNT_NRESP];
> +	const u8 args[CMD_FM_RDS_BLOCKCOUNT_NARGS] = {
> +		clear,
> +	};
> +
> +	if (!report)
> +		return -EINVAL;
> +
> +	err = CORE_SEND_COMMAND(core, CMD_FM_RDS_BLOCKCOUNT,
> +				args, resp,
> +				atomic_read(&core->timeouts.command));
> +
> +	if (!err) {
> +		report->expected	= be16_to_cpup((__be16 *)(resp + 2));
> +		report->received	= be16_to_cpup((__be16 *)(resp + 4));
> +		report->uncorrectable	= be16_to_cpup((__be16 *)(resp + 6));
> +	}
> +
> +	return err;
> +}
> +EXPORT_SYMBOL_GPL(si476x_core_cmd_fm_rds_blockcount);
> +
> +int si476x_core_cmd_fm_phase_diversity(struct si476x_core *core,
> +				       enum si476x_phase_diversity_mode mode)
> +{
> +	u8       resp[CMD_FM_PHASE_DIVERSITY_NRESP];
> +	const u8 args[CMD_FM_PHASE_DIVERSITY_NARGS] = {
> +		mode & 0b111,
> +	};
> +
> +	return CORE_SEND_COMMAND(core, CMD_FM_PHASE_DIVERSITY,
> +				 args, resp,
> +				 atomic_read(&core->timeouts.command));
> +}
> +EXPORT_SYMBOL_GPL(si476x_core_cmd_fm_phase_diversity);
> +/**
> + * si476x_core_cmd_fm_phase_div_status() - get the phase diversity
> + * status
> + *
> + * @core: si476x device
> + *
> + * NOTE caller must hold core lock
> + *
> + * Function returns the value of the status bit in case of success and
> + * negative error code in case of failre.
> + */
> +int si476x_core_cmd_fm_phase_div_status(struct si476x_core *core)
> +{
> +	int err;
> +	u8 resp[CMD_FM_PHASE_DIV_STATUS_NRESP];
> +
> +	err = __core_send_command(core, CMD_FM_PHASE_DIV_STATUS,
> +				  NULL, 0,
> +				  resp, ARRAY_SIZE(resp),
> +				  atomic_read(&core->timeouts.command));
> +
> +	return (err < 0) ? err : resp[1];
> +}
> +EXPORT_SYMBOL_GPL(si476x_core_cmd_fm_phase_div_status);
> +
> +
> +/**
> + * si476x_cmd_am_seek_start - send 'FM_SEEK_START' command to the
> + * device
> + * @core  - device to send the command to
> + * @seekup - if set the direction of the search is 'up'
> + * @wrap   - if set seek wraps when hitting band limit
> + *
> + * This function begins search for a valid station. The station is
> + * considered valid when 'FM_VALID_SNR_THRESHOLD' and
> + * 'FM_VALID_RSSI_THRESHOLD' and 'FM_VALID_MAX_TUNE_ERROR' criteria
> + * are met.
> + *
> + * Function returns 0 on success and negative error code on failure
> + */
> +int si476x_core_cmd_am_seek_start(struct si476x_core *core,
> +				  bool seekup, bool wrap)
> +{
> +	u8       resp[CMD_AM_SEEK_START_NRESP];
> +	const u8 args[CMD_AM_SEEK_START_NARGS] = {
> +		seekup << 3 | wrap << 2,
> +	};
> +
> +	return __cmd_tune_seek_freq(core,  CMD_AM_SEEK_START,
> +				    args, sizeof(args), resp, sizeof(resp),
> +				    __am_clear_stcint);
> +}
> +EXPORT_SYMBOL_GPL(si476x_core_cmd_am_seek_start);
> +
> +
> +
> +static int si476x_core_cmd_power_up_a10(struct si476x_core *core,
> +					struct si476x_power_up_args *puargs)
> +{
> +	u8       resp[CMD_POWER_UP_A10_NRESP];
> +	const bool intsel = (core->pinmux.a1 == SI476X_A1_IRQ);
> +	const bool ctsen  = (core->client->irq != 0);
> +	const u8 args[CMD_POWER_UP_A10_NARGS] = {
> +		0xF7,		/* Reserved, always 0xF7 */
> +		0x3F & puargs->xcload,	/* First two bits are reserved to be
> +				 * zeros */
> +		ctsen << 7 | intsel << 6 | 0x07, /* Last five bits
> +						   * are reserved to
> +						   * be written as 0x7 */
> +		puargs->func << 4 | puargs->freq,
> +		0x11,		/* Reserved, always 0x11 */
> +	};
> +
> +	return CORE_SEND_COMMAND(core, CMD_POWER_UP,
> +				 args, resp,
> +				 atomic_read(&core->timeouts.power_up));
> +}
> +
> +static int si476x_core_cmd_power_up_a20(struct si476x_core *core,
> +				 struct si476x_power_up_args *puargs)
> +{
> +	u8       resp[CMD_POWER_UP_A20_NRESP];
> +	const bool intsel = (core->pinmux.a1 == SI476X_A1_IRQ);
> +	const bool ctsen  = (core->client->irq != 0);
> +	const u8 args[CMD_POWER_UP_A20_NARGS] = {
> +		puargs->ibias6x << 7 | puargs->xstart,
> +		0x3F & puargs->xcload,	/* First two bits are reserved to be
> +					 * zeros */
> +		ctsen << 7 | intsel << 6 | puargs->fastboot << 5 |
> +		puargs->xbiashc << 3 | puargs->xbias,
> +		puargs->func << 4 | puargs->freq,
> +		0x10 | puargs->xmode,
> +	};
> +
> +	return CORE_SEND_COMMAND(core, CMD_POWER_UP,
> +				 args, resp,
> +				 atomic_read(&core->timeouts.power_up));
> +}
> +
> +static int si476x_core_cmd_power_down_a10(struct si476x_core *core,
> +					  struct si476x_power_down_args *pdargs)
> +{
> +	u8 resp[CMD_POWER_DOWN_A10_NRESP];
> +
> +	return __core_send_command(core, CMD_POWER_DOWN,
> +				   NULL, 0,
> +				   resp, ARRAY_SIZE(resp),
> +				   atomic_read(&core->timeouts.command));
> +}
> +
> +static int si476x_core_cmd_power_down_a20(struct si476x_core *core,
> +					  struct si476x_power_down_args *pdargs)
> +{
> +	u8 resp[CMD_POWER_DOWN_A20_NRESP];
> +	const u8 args[CMD_POWER_DOWN_A20_NARGS] = {
> +		pdargs->xosc,
> +	};
> +	return CORE_SEND_COMMAND(core, CMD_POWER_DOWN,
> +				 args, resp,
> +				 atomic_read(&core->timeouts.command));
> +}
> +
> +static int si476x_core_cmd_am_tune_freq_a10(struct si476x_core *core,
> +					struct si476x_tune_freq_args *tuneargs)
> +{
> +
> +	const int am_freq = tuneargs->freq;
> +	u8       resp[CMD_AM_TUNE_FREQ_NRESP];
> +	const u8 args[CMD_AM_TUNE_FREQ_NARGS] = {
> +		(tuneargs->hd << 6),
> +		msb(am_freq),
> +		lsb(am_freq),
> +	};
> +
> +	return __cmd_tune_seek_freq(core, CMD_AM_TUNE_FREQ, args, sizeof(args),
> +			       resp, sizeof(resp), __am_clear_stcint);
> +}
> +
> +static int si476x_core_cmd_am_tune_freq_a20(struct si476x_core *core,
> +					struct si476x_tune_freq_args *tuneargs)
> +{
> +	const int am_freq = tuneargs->freq;
> +	u8       resp[CMD_AM_TUNE_FREQ_NRESP];
> +	const u8 args[CMD_AM_TUNE_FREQ_NARGS] = {
> +		(tuneargs->zifsr << 6) | (tuneargs->injside & 0b11),
> +		msb(am_freq),
> +		lsb(am_freq),
> +	};
> +
> +	return __cmd_tune_seek_freq(core, CMD_AM_TUNE_FREQ, args, sizeof(args),
> +			       resp, sizeof(resp), __am_clear_stcint);
> +}
> +
> +static int si476x_core_cmd_fm_rsq_status_a10(struct si476x_core *core,
> +					struct si476x_rsq_status_args *rsqargs,
> +					struct si476x_rsq_status_report *report)
> +{
> +	int err;
> +	u8       resp[CMD_FM_RSQ_STATUS_A10_NRESP];
> +	const u8 args[CMD_FM_RSQ_STATUS_A10_NARGS] = {
> +		rsqargs->rsqack << 3 | rsqargs->attune << 2 |
> +		rsqargs->cancel << 1 | rsqargs->stcack,
> +	};
> +
> +	err = CORE_SEND_COMMAND(core, CMD_FM_RSQ_STATUS,
> +				args, resp,
> +				atomic_read(&core->timeouts.command));
> +
> +	if (report && !err) {
> +		report->multhint	= 0b10000000 & resp[1];
> +		report->multlint	= 0b01000000 & resp[1];
> +		report->snrhint		= 0b00001000 & resp[1];
> +		report->snrlint		= 0b00000100 & resp[1];
> +		report->rssihint	= 0b00000010 & resp[1];
> +		report->rssilint	= 0b00000001 & resp[1];
> +
> +		report->bltf		= 0b10000000 & resp[2];
> +		report->snr_ready	= 0b00100000 & resp[2];
> +		report->rssiready	= 0b00001000 & resp[2];
> +		report->afcrl		= 0b00000010 & resp[2];
> +		report->valid		= 0b00000001 & resp[2];
> +
> +		report->readfreq	= be16_to_cpup((__be16 *)(resp + 3));
> +		report->freqoff		= resp[5];
> +		report->rssi		= resp[6];
> +		report->snr		= resp[7];
> +		report->lassi		= resp[9];
> +		report->hassi		= resp[10];
> +		report->mult		= resp[11];
> +		report->dev		= resp[12];
> +		report->readantcap	= be16_to_cpup((__be16 *)(resp + 13));
> +		report->assi		= resp[15];
> +		report->usn		= resp[16];
> +	}
> +
> +	return err;
> +}
> +
> +static int si476x_core_cmd_fm_rsq_status_a20(struct si476x_core *core,
> +					struct si476x_rsq_status_args *rsqargs,
> +					struct si476x_rsq_status_report *report)
> +{
> +	int err;
> +	u8       resp[CMD_FM_RSQ_STATUS_A10_NRESP];
> +
> +	const u8 args[CMD_FM_RSQ_STATUS_A30_NARGS] = {
> +		rsqargs->primary << 4 | rsqargs->rsqack << 3 |
> +		rsqargs->attune  << 2 | rsqargs->cancel << 1 |
> +		rsqargs->stcack,
> +	};
> +
> +	err = CORE_SEND_COMMAND(core, CMD_FM_RSQ_STATUS,
> +				args, resp,
> +				atomic_read(&core->timeouts.command));
> +
> +	if (report && !err) {
> +		report->multhint	= 0b10000000 & resp[1];
> +		report->multlint	= 0b01000000 & resp[1];
> +		report->snrhint		= 0b00001000 & resp[1];
> +		report->snrlint		= 0b00000100 & resp[1];
> +		report->rssihint	= 0b00000010 & resp[1];
> +		report->rssilint	= 0b00000001 & resp[1];
> +
> +		report->bltf		= 0b10000000 & resp[2];
> +		report->snr_ready	= 0b00100000 & resp[2];
> +		report->rssiready	= 0b00001000 & resp[2];
> +		report->afcrl		= 0b00000010 & resp[2];
> +		report->valid		= 0b00000001 & resp[2];
> +
> +		report->readfreq	= be16_to_cpup((__be16 *)(resp + 3));
> +		report->freqoff		= resp[5];
> +		report->rssi		= resp[6];
> +		report->snr		= resp[7];
> +		report->lassi		= resp[9];
> +		report->hassi		= resp[10];
> +		report->mult		= resp[11];
> +		report->dev		= resp[12];
> +		report->readantcap	= be16_to_cpup((__be16 *)(resp + 13));
> +		report->assi		= resp[15];
> +		report->usn		= resp[16];
> +	}
> +
> +	return err;
> +}
> +
> +
> +static int si476x_core_cmd_fm_rsq_status_a30(struct si476x_core *core,
> +					struct si476x_rsq_status_args *rsqargs,
> +					struct si476x_rsq_status_report *report)
> +{
> +	int err;
> +	u8       resp[CMD_FM_RSQ_STATUS_A30_NRESP];
> +	const u8 args[CMD_FM_RSQ_STATUS_A30_NARGS] = {
> +		rsqargs->primary << 4 | rsqargs->rsqack << 3 |
> +		rsqargs->attune << 2 | rsqargs->cancel << 1 |
> +		rsqargs->stcack,
> +	};
> +
> +	err = CORE_SEND_COMMAND(core, CMD_FM_RSQ_STATUS,
> +				args, resp,
> +				atomic_read(&core->timeouts.command));
> +
> +	if (report && !err) {
> +		report->multhint	= 0b10000000 & resp[1];
> +		report->multlint	= 0b01000000 & resp[1];
> +		report->snrhint		= 0b00001000 & resp[1];
> +		report->snrlint		= 0b00000100 & resp[1];
> +		report->rssihint	= 0b00000010 & resp[1];
> +		report->rssilint	= 0b00000001 & resp[1];
> +
> +		report->bltf		= 0b10000000 & resp[2];
> +		report->snr_ready	= 0b00100000 & resp[2];
> +		report->rssiready	= 0b00001000 & resp[2];
> +		report->injside         = 0b00000100 & resp[2];
> +		report->afcrl		= 0b00000010 & resp[2];
> +		report->valid		= 0b00000001 & resp[2];
> +
> +		report->readfreq	= be16_to_cpup((__be16 *)(resp + 3));
> +		report->freqoff		= resp[5];
> +		report->rssi		= resp[6];
> +		report->snr		= resp[7];
> +		report->issi		= resp[8];
> +		report->lassi		= resp[9];
> +		report->hassi		= resp[10];
> +		report->mult		= resp[11];
> +		report->dev		= resp[12];
> +		report->readantcap	= be16_to_cpup((__be16 *)(resp + 13));
> +		report->assi		= resp[15];
> +		report->usn		= resp[16];
> +
> +		report->pilotdev	= resp[17];
> +		report->rdsdev		= resp[18];
> +		report->assidev		= resp[19];
> +		report->strongdev	= resp[20];
> +		report->rdspi		= be16_to_cpup((__be16 *)(resp + 21));
> +	}
> +
> +	return err;
> +}
> +
> +static int si476x_core_cmd_fm_tune_freq_a10(struct si476x_core *core,
> +					struct si476x_tune_freq_args *tuneargs)
> +{
> +	u8       resp[CMD_FM_TUNE_FREQ_NRESP];
> +	const u8 args[CMD_FM_TUNE_FREQ_A10_NARGS] = {
> +		(tuneargs->hd << 6) | (tuneargs->tunemode << 4)
> +		| (tuneargs->smoothmetrics << 2),
> +		msb(tuneargs->freq),
> +		lsb(tuneargs->freq),
> +		msb(tuneargs->antcap),
> +		lsb(tuneargs->antcap)
> +	};
> +
> +	return __cmd_tune_seek_freq(core, CMD_FM_TUNE_FREQ, args, sizeof(args),
> +			       resp, sizeof(resp), __fm_clear_stcint);
> +}
> +
> +static int si476x_core_cmd_fm_tune_freq_a20(struct si476x_core *core,
> +					struct si476x_tune_freq_args *tuneargs)
> +{
> +	u8       resp[CMD_FM_TUNE_FREQ_NRESP];
> +	const u8 args[CMD_FM_TUNE_FREQ_A20_NARGS] = {
> +		(tuneargs->hd << 6) | (tuneargs->tunemode << 4)
> +		|  (tuneargs->smoothmetrics << 2) | (tuneargs->injside),
> +		msb(tuneargs->freq),
> +		lsb(tuneargs->freq),
> +	};
> +
> +	return __cmd_tune_seek_freq(core, CMD_FM_TUNE_FREQ, args, sizeof(args),
> +			       resp, sizeof(resp), __fm_clear_stcint);
> +}
> +
> +static int si476x_core_cmd_agc_status_a20(struct si476x_core *core,
> +					struct si476x_agc_status_report *report)
> +{
> +	int err;
> +	u8 resp[CMD_AGC_STATUS_NRESP_A20];
> +
> +	if (!report)
> +		return -EINVAL;
> +
> +	err = __core_send_command(core, CMD_AGC_STATUS,
> +				  NULL, 0,
> +				  resp, ARRAY_SIZE(resp),
> +				  atomic_read(&core->timeouts.command));
> +	if (!err) {
> +		report->mxhi		= resp[1] & SI476X_AGC_MXHI;
> +		report->mxlo		= resp[1] & SI476X_AGC_MXLO;
> +		report->lnahi		= resp[1] & SI476X_AGC_LNAHI;
> +		report->lnalo		= resp[1] & SI476X_AGC_LNALO;
> +		report->fmagc1		= resp[2];
> +		report->fmagc2		= resp[3];
> +		report->pgagain		= resp[4];
> +		report->fmwblang	= resp[5];
> +	}
> +
> +	return err;
> +}
> +
> +static int si476x_core_cmd_agc_status_a10(struct si476x_core *core,
> +					struct si476x_agc_status_report *report)
> +{
> +	int err;
> +	u8 resp[CMD_AGC_STATUS_NRESP_A10];
> +
> +	if (!report)
> +		return -EINVAL;
> +
> +	err = __core_send_command(core, CMD_AGC_STATUS,
> +				  NULL, 0,
> +				  resp, ARRAY_SIZE(resp),
> +				  atomic_read(&core->timeouts.command));
> +	if (!err) {
> +		report->mxhi		= resp[1] & SI476X_AGC_MXHI;
> +		report->mxlo		= resp[1] & SI476X_AGC_MXLO;
> +		report->lnahi		= resp[1] & SI476X_AGC_LNAHI;
> +		report->lnalo		= resp[1] & SI476X_AGC_LNALO;
> +	}
> +
> +	return err;
> +}
> +
> +static struct {
> +	int (*power_up) (struct si476x_core *,
> +			 struct si476x_power_up_args *);
> +	int (*power_down) (struct si476x_core *,
> +			   struct si476x_power_down_args *);
> +
> +	tune_freq_func_t fm_tune_freq;
> +	tune_freq_func_t am_tune_freq;
> +
> +	int (*fm_rsq_status)(struct si476x_core *,
> +			     struct si476x_rsq_status_args *,
> +			     struct si476x_rsq_status_report *);
> +
> +	int (*agc_status)(struct si476x_core *,
> +			  struct si476x_agc_status_report *);
> +	int (*intb_pin_cfg)(struct si476x_core *core,
> +			    enum si476x_intb_config intb,
> +			    enum si476x_a1_config a1);
> +} si476x_cmds_vtable[] = {
> +	[SI476X_REVISION_A10] = {
> +		.power_up	= si476x_core_cmd_power_up_a10,
> +		.power_down	= si476x_core_cmd_power_down_a10,
> +		.fm_tune_freq	= si476x_core_cmd_fm_tune_freq_a10,
> +		.am_tune_freq	= si476x_core_cmd_am_tune_freq_a10,
> +		.fm_rsq_status	= si476x_core_cmd_fm_rsq_status_a10,
> +		.agc_status	= si476x_core_cmd_agc_status_a10,
> +		.intb_pin_cfg   = si476x_core_cmd_intb_pin_cfg_a10,
> +	},
> +	[SI476X_REVISION_A20] = {
> +		.power_up	= si476x_core_cmd_power_up_a20,
> +		.power_down	= si476x_core_cmd_power_down_a20,
> +		.fm_tune_freq	= si476x_core_cmd_fm_tune_freq_a20,
> +		.am_tune_freq	= si476x_core_cmd_am_tune_freq_a20,
> +		.fm_rsq_status	= si476x_core_cmd_fm_rsq_status_a20,
> +		.agc_status	= si476x_core_cmd_agc_status_a20,
> +		.intb_pin_cfg   = si476x_core_cmd_intb_pin_cfg_a20,
> +	},
> +	[SI476X_REVISION_A30] = {
> +		.power_up	= si476x_core_cmd_power_up_a20,
> +		.power_down	= si476x_core_cmd_power_down_a20,
> +		.fm_tune_freq	= si476x_core_cmd_fm_tune_freq_a20,
> +		.am_tune_freq	= si476x_core_cmd_am_tune_freq_a20,
> +		.fm_rsq_status	= si476x_core_cmd_fm_rsq_status_a30,
> +		.agc_status	= si476x_core_cmd_agc_status_a20,
> +		.intb_pin_cfg   = si476x_core_cmd_intb_pin_cfg_a20,
> +	},
> +};
> +
> +int si476x_core_cmd_power_up(struct si476x_core *core,
> +			     struct si476x_power_up_args *args)
> +{
> +	BUG_ON(core->revision > SI476X_REVISION_A30 ||
> +	       core->revision == -1);
> +	return si476x_cmds_vtable[core->revision].power_up(core, args);
> +}
> +EXPORT_SYMBOL_GPL(si476x_core_cmd_power_up);
> +
> +int si476x_core_cmd_power_down(struct si476x_core *core,
> +			       struct si476x_power_down_args *args)
> +{
> +	BUG_ON(core->revision > SI476X_REVISION_A30 ||
> +	       core->revision == -1);
> +	return si476x_cmds_vtable[core->revision].power_down(core, args);
> +}
> +EXPORT_SYMBOL_GPL(si476x_core_cmd_power_down);
> +
> +int si476x_core_cmd_fm_tune_freq(struct si476x_core *core,
> +				 struct si476x_tune_freq_args *args)
> +{
> +	BUG_ON(core->revision > SI476X_REVISION_A30 ||
> +	       core->revision == -1);
> +	return si476x_cmds_vtable[core->revision].fm_tune_freq(core, args);
> +}
> +EXPORT_SYMBOL_GPL(si476x_core_cmd_fm_tune_freq);
> +
> +int si476x_core_cmd_am_tune_freq(struct si476x_core *core,
> +				 struct si476x_tune_freq_args *args)
> +{
> +	BUG_ON(core->revision > SI476X_REVISION_A30 ||
> +	       core->revision == -1);
> +	return si476x_cmds_vtable[core->revision].am_tune_freq(core, args);
> +}
> +EXPORT_SYMBOL_GPL(si476x_core_cmd_am_tune_freq);
> +
> +int si476x_core_cmd_fm_rsq_status(struct si476x_core *core,
> +				  struct si476x_rsq_status_args *args,
> +				  struct si476x_rsq_status_report *report)
> +
> +{
> +	BUG_ON(core->revision > SI476X_REVISION_A30 ||
> +	       core->revision == -1);
> +	return si476x_cmds_vtable[core->revision].fm_rsq_status(core, args,
> +								report);
> +}
> +EXPORT_SYMBOL_GPL(si476x_core_cmd_fm_rsq_status);
> +
> +int si476x_core_cmd_agc_status(struct si476x_core *core,
> +				  struct si476x_agc_status_report *report)
> +
> +{
> +	BUG_ON(core->revision > SI476X_REVISION_A30 ||
> +	       core->revision == -1);
> +	return si476x_cmds_vtable[core->revision].agc_status(core, report);
> +}
> +EXPORT_SYMBOL_GPL(si476x_core_cmd_agc_status);
> +
> +
> +int si476x_core_cmd_intb_pin_cfg(struct si476x_core *core,
> +			    enum si476x_intb_config intb,
> +			    enum si476x_a1_config a1)
> +{
> +	BUG_ON(core->revision > SI476X_REVISION_A30 ||
> +	       core->revision == -1);
> +
> +	return si476x_cmds_vtable[core->revision].intb_pin_cfg(core, intb, a1);
> +}
> +EXPORT_SYMBOL_GPL(si476x_core_cmd_intb_pin_cfg);
> +
> +
> +

Andrey, you should look at the drivers/media/radio/si4713-i2c.c source.
It is for the same chip family and is much, much smaller.

See if you can use some of the code that's there.

Regards,

  Hans

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 2/3] Add a V4L2 driver for SI476X MFD
  2012-09-13 22:40 ` [PATCH 2/3] Add a V4L2 driver for SI476X MFD Andrey Smirnov
@ 2012-09-14  7:17   ` Hans Verkuil
  0 siblings, 0 replies; 13+ messages in thread
From: Hans Verkuil @ 2012-09-14  7:17 UTC (permalink / raw)
  To: Andrey Smirnov; +Cc: linux-media, linux-kernel

Hi Andrey!

Some generic comments:

sound/i2c/other/tea575x-tuner.c is a good example of how to make an AM/FM tuner
driver. It's used by e.g. drivers/media/radio/radio-shark.c. This went in just
yesterday, so you need to look at the latest staging/for_v3.7 branch of the
media_tree.git repo.

Some main missing pieces here:

- you must use a struct v4l2_device as the top-level struct.
- you must use the control framework to handle controls
- you must use struct v4l2_fh as that gives you V4L2 priority handling and
  control events for free.
- don't use audio inputs to select the freq bands. Instead do what tea575x does:
  implement enum_freq_bands and do the right checks in hw_freq_seek. See the
  documentation for those ioctls in the latest V4L2 spec available from linuxtv.org.
- is the RDS format that's returned with read() compliant to the V4L2 spec?
  See: http://linuxtv.org/downloads/v4l-dvb-apis/rds.html
  Note that the v4l-utils repository contains a command line tool rds-ctl to test
  rds input.
- run v4l2-compliance for your driver. This is available in the v4l-utils.git repo
  (use the master branch) on linuxtv.org. This tool verifies whether your driver
  is fully V4L2 compliant. There should be no errors or warnings. In case of doubt
  or if you suspect a bug in the tool, then please contact me and/or the mailinglist!

Several of the controls can be dropped when frequency bands are implemented
correctly. There are a few others that probably need to be turned into
standard controls. We can discuss that for the next version of this patch.

On Fri September 14 2012 00:40:12 Andrey Smirnov wrote:
> This commit adds a driver that exposes all the radio related
> functionality of the Si476x series of chips via the V4L2 subsystem.
> 
> Signed-off-by: Andrey Smirnov <andrey.smirnov@convergeddevices.net>
> ---
>  drivers/media/radio/Kconfig        |   17 +
>  drivers/media/radio/radio-si476x.c | 1307 ++++++++++++++++++++++++++++++++++++
>  2 files changed, 1324 insertions(+)
>  create mode 100644 drivers/media/radio/radio-si476x.c
> 
> diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
> index 8090b87..3c79d09 100644
> --- a/drivers/media/radio/Kconfig
> +++ b/drivers/media/radio/Kconfig
> @@ -16,6 +16,23 @@ config RADIO_SI470X
>  	bool "Silicon Labs Si470x FM Radio Receiver support"
>  	depends on VIDEO_V4L2
>  
> +config RADIO_SI476X
> +	tristate "Silicon Laboratories Si476x I2C FM Radio"
> +	depends on I2C && VIDEO_V4L2
> +	select MFD_CORE
> +	select MFD_SI476X_CORE
> +	select SND_SOC_SI476X
> +	---help---
> +	  Choose Y here if you have this FM radio chip.
> +
> +	  In order to control your radio card, you will need to use programs
> +	  that are compatible with the Video For Linux 2 API.  Information on
> +	  this API and pointers to "v4l2" programs may be found at
> +	  <file:Documentation/video4linux/API.html>.
> +
> +	  To compile this driver as a module, choose M here: the
> +	  module will be called radio-si476x.
> +
>  source "drivers/media/radio/si470x/Kconfig"
>  
>  config USB_MR800
> diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
> new file mode 100644
> index 0000000..f313005
> --- /dev/null
> +++ b/drivers/media/radio/radio-si476x.c
> @@ -0,0 +1,1307 @@
> +#include <linux/module.h>
> +#include <linux/delay.h>
> +#include <linux/interrupt.h>
> +#include <linux/slab.h>
> +#include <linux/atomic.h>
> +#include <media/v4l2-common.h>
> +#include <media/v4l2-ctrls.h>
> +#include <media/v4l2-device.h>
> +#include <media/v4l2-ioctl.h>
> +
> +#include <linux/mfd/si476x-core.h>
> +
> +#define FM_FREQ_RANGE_LOW   64000000
> +#define FM_FREQ_RANGE_HIGH 108000000
> +
> +#define AM_FREQ_RANGE_LOW    520000
> +#define AM_FREQ_RANGE_HIGH 30000000
> +
> +#define PWRLINEFLTR (1 << 8)
> +
> +#define FREQ_MUL (10000000 / 625)
> +
> +#define DRIVER_NAME "si476x-radio"
> +#define DRIVER_CARD "SI476x AM/FM Receiver"
> +
> +static const char * const deemphasis[] = {
> +	"75 us",
> +	"50 us",
> +};
> +
> +static const char * const grid_frequency[] = {
> +	"50 Hz",
> +	"60 Hz",
> +};
> +
> +#define PRIVATE_CTL_IDX(x) (x - V4L2_CID_PRIVATE_BASE)
> +
> +static const struct v4l2_queryctrl si476x_ctrls[] = {
> +	/*
> +	   Tuning parameters
> +	   'max tune errors' is shared for both AM/FM mode of operation
> +	*/
> +	{
> +		.id		= SI476X_CID_RSSI_THRESHOLD,
> +		.type		= V4L2_CTRL_TYPE_INTEGER,
> +		.name		= "valid rssi threshold",
> +		.minimum	= -128,
> +		.maximum	= 127,
> +		.step		= 1,
> +	},
> +	{
> +		.id		= SI476X_CID_SNR_THRESHOLD,
> +		.type		= V4L2_CTRL_TYPE_INTEGER,
> +		.name		= "valid snr threshold",
> +		.minimum	= -128,
> +		.maximum	= 127,
> +		.step		= 1,
> +	},
> +	{
> +		.id		= SI476X_CID_MAX_TUNE_ERROR,
> +		.type		= V4L2_CTRL_TYPE_INTEGER,
> +		.name		= "max tune errors",
> +		.minimum	= 0,
> +		.maximum	= 126 * 2,
> +		.step		= 2,
> +	},
> +	/*
> +	   Region specific parameters
> +	*/
> +	{
> +		.id		= SI476X_CID_GRID_FREQUENCY,

Use V4L2_CID_POWER_LINE_FREQUENCY instead.

> +		.type		= V4L2_CTRL_TYPE_MENU,
> +		.name		= "power grid frequency",
> +		.minimum	= 0,
> +		.maximum	= ARRAY_SIZE(grid_frequency) - 1,
> +		.step		= 1,
> +	},
> +	{
> +		.id		= SI476X_CID_HARMONICS_COUNT,
> +		.type		= V4L2_CTRL_TYPE_INTEGER,
> +		.name		= "# of harmonics to reject",
> +		.minimum	= 0,
> +		.maximum	= 20,
> +		.step		= 1,
> +	},
> +	{
> +		.id		= SI476X_CID_SEEK_SPACING,
> +		.type		= V4L2_CTRL_TYPE_INTEGER,
> +		.name		= "seek frequency spacing",
> +		.minimum	= 0,
> +		.maximum	= 0xFFFF,
> +		.step		= 1,
> +	},
> +	{
> +		.id		= SI476X_CID_SEEK_BAND_TOP,
> +		.type		= V4L2_CTRL_TYPE_INTEGER,
> +		.name		= "seek band top",
> +		.minimum	= 0,
> +		.maximum	= 0xFFFF,
> +		.step		= 1,
> +	},
> +	{
> +		.id		= SI476X_CID_SEEK_BAND_BOTTOM,
> +		.type		= V4L2_CTRL_TYPE_INTEGER,
> +		.name		= "seek band bottom",
> +		.minimum	= 0,
> +		.maximum	= 0xFFFF,
> +		.step		= 1,
> +	},

The three controls above shouldn't be necessary with the freq_bands and
hw seek API.

> +	{
> +		.id		= SI476X_CID_DEEMPHASIS,
> +		.type		= V4L2_CTRL_TYPE_MENU,
> +		.name		= "de-emphassis",

emphasis typo

> +		.minimum	= 0,
> +		.maximum	= ARRAY_SIZE(deemphasis) - 1,
> +		.step		= 1,
> +		.default_value	= 0,
> +	},

I know a patch was posted that added this as a standard control, but I haven't
heard from that for some time now.

> +	{
> +		.id		= SI476X_CID_RDS_RECEPTION,
> +		.type		= V4L2_CTRL_TYPE_BOOLEAN,
> +		.name		= "rds",
> +		.minimum	= 0,
> +		.maximum	= 1,
> +	},

Probably isn't necessary. The presence of RDS is reported through rxsubchans
returned by VIDIOC_G_TUNER.

> +};
> +
> +struct si476x_radio;
> +
> +/**
> + * struct si476x_radio_ops - vtable of tuner functions
> + *
> + * This table holds pointers to functions implementing particular
> + * operations depending on the mode in which the tuner chip was
> + * configured to start in. If the function is not supported
> + * corresponding element is set to #NULL.
> + *
> + * @tune_freq: Tune chip to a specific frequency
> + * @seek_start: Star station seeking
> + * @rsq_status: Get Recieved Signal Quality(RSQ) status
> + * @rds_blckcnt: Get recived RDS blocks count
> + * @phase_diversity: Change phase diversity mode of the tuner
> + * @phase_div_status: Get phase diversity mode status
> + * @acf_status: Get the status of Automatically Controlled
> + * Features(ACF)
> + * @agc_status: Get Automatic Gain Control(AGC) status
> + */
> +struct si476x_radio_ops {
> +	int (*tune_freq)(struct si476x_core *, struct si476x_tune_freq_args *);
> +	int (*seek_start)(struct si476x_core *, bool, bool);
> +	int (*rsq_status)(struct si476x_core *, struct si476x_rsq_status_args *,
> +			  struct si476x_rsq_status_report *);
> +	int (*rds_blckcnt)(struct si476x_core *, bool,
> +			   struct si476x_rds_blockcount_report *);
> +
> +	int (*phase_diversity)(struct si476x_core *,
> +			       enum si476x_phase_diversity_mode);
> +	int (*phase_div_status)(struct si476x_core *);
> +	int (*acf_status)(struct si476x_core *,
> +			  struct si476x_acf_status_report *);
> +	int (*agc_status)(struct si476x_core *,
> +			  struct si476x_agc_status_report *);
> +};
> +
> +/**
> + * struct si476x_radio - radio device
> + *
> + * @core: Pointer to underlying core device
> + * @videodev: Pointer to video device created by V4L2 subsystem
> + * @ops: Vtable of functions. See struct si476x_radio_ops for details
> + * @kref: Reference counter
> + * @core_lock: An r/w semaphore to brebvent the deletion of underlying
> + * core structure is the radio device is being used
> + */
> +struct si476x_radio {
> +	struct si476x_core  *core;
> +	struct video_device *videodev;
> +
> +	/* This field should not be accesses unless core lock is held */
> +	const struct si476x_radio_ops *ops;
> +
> +	struct kref kref;
> +	struct rw_semaphore core_lock;
> +};
> +static inline struct si476x_radio *kref_to_si476x_radio(struct kref *ref)
> +{
> +	return container_of(ref, struct si476x_radio, kref);
> +}
> +
> +static void si476x_radio_delete(struct kref *kref);
> +static inline void si476x_radio_get(struct si476x_radio *radio)
> +{
> +	kref_get(&radio->kref);
> +}
> +
> +static inline void si476x_radio_put(struct si476x_radio *radio)
> +{
> +	kref_put(&radio->kref, si476x_radio_delete);
> +}

Why would you need refcounting?

> +
> +
> +static int si476x_radio_initialize_mode(struct si476x_radio *);
> +
> +/*
> + * si476x_vidioc_querycap - query device capabilities
> + */
> +static int si476x_querycap(struct file *file, void *priv,
> +			   struct v4l2_capability *capability)
> +{
> +	strlcpy(capability->driver, DRIVER_NAME, sizeof(capability->driver));
> +	strlcpy(capability->card,   DRIVER_CARD, sizeof(capability->card));

fill in bus_info

> +	capability->capabilities = V4L2_CAP_HW_FREQ_SEEK |
> +		V4L2_CAP_TUNER | V4L2_CAP_RADIO;

fill in device_caps

> +
> +	return 0;
> +}
> +
> +static int si476x_queryctrl(struct file *file, void *priv,
> +			    struct v4l2_queryctrl *qc)
> +{
> +	int retval;
> +
> +	/* search video control */
> +	switch (qc->id) {
> +	case SI476X_CID_RSSI_THRESHOLD:
> +	case SI476X_CID_SNR_THRESHOLD:
> +	case SI476X_CID_MAX_TUNE_ERROR:
> +	case SI476X_CID_SEEK_SPACING:
> +	case SI476X_CID_SEEK_BAND_TOP:
> +	case SI476X_CID_SEEK_BAND_BOTTOM:
> +	case SI476X_CID_RDS_RECEPTION:
> +	case SI476X_CID_HARMONICS_COUNT:
> +	case SI476X_CID_GRID_FREQUENCY:
> +	case SI476X_CID_DEEMPHASIS:
> +		memcpy(qc, &si476x_ctrls[PRIVATE_CTL_IDX(qc->id)],
> +		       sizeof(*qc));
> +		retval = 0;
> +		break;
> +	default:
> +		retval = -EINVAL;
> +		break;
> +	}
> +
> +	return retval;
> +}
> +
> +static int si476x_querymenu(struct file *file, void *fh,
> +			    struct v4l2_querymenu *m)
> +{
> +	switch (m->id) {
> +	case SI476X_CID_GRID_FREQUENCY:
> +		if (m->index > ARRAY_SIZE(grid_frequency) - 1)
> +			return -EINVAL;
> +		strncpy(m->name, grid_frequency[m->index], sizeof(m->name));
> +		break;
> +	case SI476X_CID_DEEMPHASIS:
> +		if (m->index > ARRAY_SIZE(deemphasis) - 1)
> +			return -EINVAL;
> +		strncpy(m->name, deemphasis[m->index], sizeof(m->name));
> +		break;
> +	default:
> +		return -EINVAL;
> +	}
> +
> +	return 0;
> +}
> +
> +/* si4713_g_ctrl - get the value of a control */
> +static int si476x_g_ctrl(struct file *file, void *priv,
> +			 struct v4l2_control *ctrl)
> +{
> +	int retval;
> +	struct si476x_radio *radio = video_drvdata(file);
> +
> +	down_read(&radio->core_lock);
> +
> +	if (!radio->core) {
> +		retval = -ENODEV;
> +		goto up_semaphore;
> +	}
> +
> +	si476x_core_lock(radio->core);
> +
> +	switch (ctrl->id) {
> +	case SI476X_CID_RSSI_THRESHOLD:
> +		retval = si476x_core_get_valid_rssi_threshold(radio->core);
> +		break;
> +	case SI476X_CID_SNR_THRESHOLD:
> +		retval = si476x_core_get_valid_snr_threshold(radio->core);
> +		break;
> +	case SI476X_CID_MAX_TUNE_ERROR:
> +		retval = si476x_core_get_valid_max_tune_error(radio->core);
> +		break;
> +	case SI476X_CID_SEEK_SPACING:
> +		retval = si476x_core_get_frequency_spacing(radio->core);
> +		break;
> +	case SI476X_CID_SEEK_BAND_TOP:
> +		retval = si476x_core_get_seek_band_top(radio->core);
> +		break;
> +	case SI476X_CID_SEEK_BAND_BOTTOM:
> +		retval = si476x_core_get_seek_band_bottom(radio->core);
> +		break;
> +	case SI476X_CID_RDS_RECEPTION:
> +		retval = si476x_core_get_rds_reception(radio->core);
> +		break;
> +	case SI476X_CID_DEEMPHASIS:
> +		retval = si476x_core_get_audio_deemphasis(radio->core);
> +		break;
> +	case SI476X_CID_HARMONICS_COUNT:
> +		retval = si476x_core_get_audio_pwr_line_filter(radio->core);
> +		break;
> +	case SI476X_CID_GRID_FREQUENCY:
> +		retval = si476x_core_get_audio_pwr_line_filter(radio->core);
> +		break;
> +	default:
> +		retval = -EINVAL;
> +		break;
> +	}
> +
> +	if (retval >= 0) {
> +		if (ctrl->id == SI476X_CID_HARMONICS_COUNT)
> +			ctrl->value = retval & 0x0F;
> +		else if (ctrl->id == SI476X_CID_GRID_FREQUENCY)
> +			ctrl->value = !!(PWRLINEFLTR & retval);
> +		else
> +			ctrl->value = retval;
> +
> +		retval = 0;
> +	}
> +	si476x_core_unlock(radio->core);
> +
> +up_semaphore:
> +	up_read(&radio->core_lock);
> +	return retval;
> +}
> +
> +/* si4713_s_ctrl - set the value of a control */
> +static int si476x_s_ctrl(struct file *file, void *priv,
> +			 struct v4l2_control *ctrl)
> +{
> +	int old_value, retval, count;
> +	struct si476x_radio *radio = video_drvdata(file);
> +
> +	down_read(&radio->core_lock);
> +
> +	if (!radio->core) {
> +		retval = -ENODEV;
> +		goto up_semaphore;
> +	}
> +
> +	si476x_core_lock(radio->core);
> +
> +	switch (ctrl->id) {
> +	case SI476X_CID_RSSI_THRESHOLD:
> +		retval = si476x_core_set_valid_rssi_threshold(radio->core,
> +							      ctrl->value);
> +		break;
> +	case SI476X_CID_SNR_THRESHOLD:
> +		retval = si476x_core_set_valid_snr_threshold(radio->core,
> +							     ctrl->value);
> +		break;
> +	case SI476X_CID_MAX_TUNE_ERROR:
> +		retval = si476x_core_set_valid_max_tune_error(radio->core,
> +							      ctrl->value);
> +		break;
> +	case SI476X_CID_SEEK_SPACING:
> +		retval = si476x_core_set_frequency_spacing(radio->core,
> +							   ctrl->value);
> +		break;
> +	case SI476X_CID_SEEK_BAND_TOP:
> +		retval = si476x_core_set_seek_band_top(radio->core,
> +						       ctrl->value);
> +		break;
> +	case SI476X_CID_SEEK_BAND_BOTTOM:
> +		retval = si476x_core_set_seek_band_bottom(radio->core,
> +							  ctrl->value);
> +		break;
> +	case SI476X_CID_RDS_RECEPTION:
> +		retval = si476x_core_set_rds_reception(radio->core,
> +						       ctrl->value);
> +		break;
> +	case SI476X_CID_DEEMPHASIS:
> +		retval = si476x_core_set_audio_deemphasis(radio->core,
> +							  ctrl->value);
> +		break;
> +	case SI476X_CID_HARMONICS_COUNT:
> +		old_value = si476x_core_get_audio_pwr_line_filter(radio->core);
> +		if (old_value < 0) {
> +			retval = old_value;
> +			break;
> +		}
> +
> +		retval = si476x_core_set_audio_pwr_line_filter(radio->core,
> +					(ctrl->value > 0) ? true : false,
> +					!!(PWRLINEFLTR & old_value),
> +					ctrl->value);
> +		break;
> +	case SI476X_CID_GRID_FREQUENCY:
> +		old_value = si476x_core_get_audio_pwr_line_filter(radio->core);
> +		if (old_value < 0) {
> +			retval = old_value;
> +			break;
> +		}
> +		count  = old_value & 0x0F;
> +
> +		retval = si476x_core_set_audio_pwr_line_filter(radio->core,
> +						(count > 0) ? true : false,
> +						ctrl->value,
> +						count);
> +		break;
> +	default:
> +		retval = -EINVAL;
> +		break;
> +	}
> +
> +	si476x_core_unlock(radio->core);
> +
> +up_semaphore:
> +	up_read(&radio->core_lock);
> +	return retval;
> +}
> +
> +static int si476x_g_tuner(struct file *file, void *priv,
> +			  struct v4l2_tuner *tuner)
> +{
> +	int err;
> +	struct si476x_rsq_status_report report;
> +	struct si476x_radio *radio = video_drvdata(file);
> +
> +	if (tuner->index != 0) {
> +		err = -EINVAL;
> +		goto exit;
> +	}
> +
> +	down_read(&radio->core_lock);

Use the V4L2 core locking functionality. See Documentation/video4linux/v4l2-framework.txt.
Also see the tea575x driver that uses it. And never use a semaphore for
this, use a mutex.

> +
> +	if (!radio->core) {
> +		err = -ENODEV;

This should never happen.

> +		goto up_semaphore;
> +	}
> +
> +	tuner->type       = V4L2_TUNER_RADIO;
> +	tuner->capability = V4L2_TUNER_CAP_LOW; /* Measure frequncies
> +						 * in multiples of
> +						 * 62.5 Hz */
> +	if (radio->core->chip_id < 5) { /* Si4760/61/62/63/64 */
> +		strlcpy(tuner->name, "AM/FM", sizeof(tuner->name));
> +
> +		tuner->capability |=  V4L2_TUNER_CAP_STEREO
> +			| V4L2_TUNER_CAP_RDS
> +			| V4L2_TUNER_CAP_RDS_BLOCK_IO;
> +
> +		tuner->rangelow  = 520 * FREQ_MUL / 1000;
> +
> +		tuner->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
> +		tuner->audmode = V4L2_TUNER_MODE_STEREO;
> +	} else {  /* Si4768/69 */
> +		strlcpy(tuner->name, "FM", sizeof(tuner->name));
> +		tuner->rangelow  = 64 * FREQ_MUL;
> +		tuner->capability |= V4L2_TUNER_CAP_RDS
> +			| V4L2_TUNER_CAP_RDS_BLOCK_IO;
> +	}
> +
> +	tuner->rxsubchans |= V4L2_TUNER_SUB_RDS;
> +
> +
> +	if (radio->core->diversity_mode == SI476X_PHDIV_SECONDARY_ANTENNA ||
> +	    radio->core->diversity_mode == SI476X_PHDIV_SECONDARY_COMBINING) {
> +		strlcpy(tuner->name, "FM (secondary)", sizeof(tuner->name));
> +		tuner->capability = 0;
> +		tuner->rxsubchans = 0;
> +		tuner->audmode    = 0;
> +	}
> +
> +	if (radio->core->diversity_mode == SI476X_PHDIV_PRIMARY_ANTENNA ||
> +	    radio->core->diversity_mode == SI476X_PHDIV_PRIMARY_COMBINING)
> +		strlcpy(tuner->name, "AM/FM (primary)", sizeof(tuner->name));
> +
> +	tuner->rangehigh = 108 * FREQ_MUL;
> +	tuner->afc = 1;
> +
> +	si476x_core_lock(radio->core);
> +	{
> +		struct si476x_rsq_status_args args = {
> +			.primary	= false,
> +			.rsqack		= false,
> +			.attune		= false,
> +			.cancel		= false,
> +			.stcack		= false,
> +		};
> +		if (radio->ops->rsq_status) {
> +			err = radio->ops->rsq_status(radio->core,
> +						     &args, &report);
> +			if (err < 0) {
> +				tuner->signal = 0;
> +			} else {
> +				/*
> +				  tuner->signal value range: 0x0000 .. 0xFFFF,
> +				  report.rssi: -128 .. 127
> +				*/
> +				tuner->signal = (report.rssi + 128) * 257;
> +			}
> +		} else {
> +			tuner->signal = 0;
> +			err = -EINVAL;
> +		}
> +	}
> +	si476x_core_unlock(radio->core);
> +
> +up_semaphore:
> +	up_read(&radio->core_lock);
> +exit:
> +	return err;
> +}
> +
> +/**
> + * The switching between AM/FM mode of the tuner is implemented as
> + * swtiching between tow audio stream of the V4L2 tuner. SO each AM/FM
> + * capabel chips reports two audio streams "AM Radio" and "FM Radio".
> + * Selectio=ng one or the other would put hte tuner in an appropriate
> + * mode.
> + */
> +
> +static int si476x_enumaudio(struct file *file, void *fh,
> +			    struct v4l2_audio *audio)
> +{
> +	int err;
> +	struct si476x_radio *radio = video_drvdata(file);
> +
> +	down_read(&radio->core_lock);
> +
> +	if (!radio->core) {
> +		err = -ENODEV;
> +		goto up_semaphore;
> +	}
> +
> +	if (radio->core->chip_id >= 5) {
> +		err = -EINVAL;
> +		goto up_semaphore;
> +	}
> +
> +	err = 0;
> +	switch (audio->index) {
> +	case 0:
> +		strcpy(audio->name, "FM Radio");
> +		audio->capability = V4L2_AUDCAP_STEREO;
> +		audio->mode = 0;
> +		break;
> +	case 1:
> +		strcpy(audio->name, "AM Radio");
> +		audio->capability = 0;
> +		audio->mode = 0;
> +		break;
> +	default:
> +		err = -EINVAL;
> +	}
> +
> +up_semaphore:
> +	up_read(&radio->core_lock);
> +	return err;
> +}
> +
> +static int si476x_g_audio(struct file *file, void *priv,
> +			  struct v4l2_audio *audio)
> +{
> +	int err;
> +	struct si476x_radio *radio = video_drvdata(file);
> +
> +	down_read(&radio->core_lock);
> +
> +	if (!radio->core) {
> +		err = -ENODEV;
> +		goto up_semaphore;
> +	}
> +
> +	if (radio->core->chip_id >= 5) {
> +		err = -EINVAL;
> +		goto up_semaphore;
> +	}
> +
> +	si476x_core_lock(radio->core);
> +	err = 0;
> +	switch (radio->core->power_up_parameters.func) {
> +	case SI476X_FUNC_FM_RECEIVER:
> +		audio->index = 0;
> +		strcpy(audio->name, "FM Radio");
> +		audio->capability = V4L2_AUDCAP_STEREO;
> +		break;
> +	case SI476X_FUNC_AM_RECEIVER:
> +		audio->index = 1;
> +		strcpy(audio->name, "AM Radio");
> +		audio->capability = 0;
> +		break;
> +	default:
> +		err = -EINVAL;
> +		goto unlock;
> +	}
> +	audio->mode = 0;
> +unlock:
> +	si476x_core_unlock(radio->core);
> +up_semaphore:
> +	up_read(&radio->core_lock);
> +	return err;
> +}
> +
> +static int si476x_s_audio(struct file *file, void *priv,
> +			  struct v4l2_audio *audio)
> +{
> +	int err;
> +	struct si476x_radio *radio = video_drvdata(file);
> +
> +	down_read(&radio->core_lock);
> +
> +	if (!radio->core) {
> +		err = -ENODEV;
> +		goto up_semaphore;
> +	}
> +
> +	if (radio->core->chip_id >= 5 || audio->index > 1) {
> +		err = -EINVAL;
> +		goto up_semaphore;
> +	}
> +
> +	si476x_core_lock(radio->core);
> +
> +	/*
> +	   Since power/up down is a very time consuming operation,
> +	   try to avoid doing it if the requested mode matches the one
> +	   the tuner is in
> +	*/
> +	if ((audio->index == 0 &&
> +	     radio->core->power_up_parameters.func
> +	     == SI476X_FUNC_FM_RECEIVER) ||
> +	    (audio->index == 1 &&
> +	     radio->core->power_up_parameters.func
> +	     == SI476X_FUNC_AM_RECEIVER)) {
> +		err = 0;
> +		goto unlock;
> +	}
> +
> +	err = si476x_core_stop(radio->core, true);
> +	if (err < 0)
> +		goto unlock;
> +
> +	switch (audio->index) {
> +	case 0:
> +		radio->core->power_up_parameters.func = SI476X_FUNC_FM_RECEIVER;
> +		break;
> +	case 1:
> +		radio->core->power_up_parameters.func = SI476X_FUNC_AM_RECEIVER;
> +		break;
> +	}
> +
> +	err = si476x_core_start(radio->core, true);
> +	if (!err)
> +		err = si476x_radio_initialize_mode(radio);
> +
> +unlock:
> +	si476x_core_unlock(radio->core);
> +up_semaphore:
> +	up_read(&radio->core_lock);
> +	return err;
> +}

As mentioned above, these three functions should be removed. That's not the
way frequency bands are supported.

> +
> +static int si476x_g_frequency(struct file *file, void *priv,
> +			      struct v4l2_frequency *f)
> +{
> +	int err;
> +	struct si476x_radio *radio = video_drvdata(file);
> +
> +	down_read(&radio->core_lock);
> +
> +	if (!radio->core) {
> +		err = -ENODEV;
> +		goto up_semaphore;
> +	}
> +
> +	si476x_core_lock(radio->core);
> +
> +	f->type = V4L2_TUNER_RADIO;
> +	if (radio->ops->rsq_status) {
> +		struct si476x_rsq_status_report report;
> +		struct si476x_rsq_status_args   args = {
> +			.primary	= false,
> +			.rsqack		= false,
> +			.attune		= true,
> +			.cancel		= false,
> +			.stcack		= false,
> +		};
> +
> +		err = radio->ops->rsq_status(radio->core, &args, &report);
> +		if (!err)
> +			f->frequency = si476x_to_v4l2(radio->core,
> +						      report.readfreq);
> +	} else {
> +		err = -EINVAL;
> +	}
> +
> +	si476x_core_unlock(radio->core);
> +up_semaphore:
> +	up_read(&radio->core_lock);
> +	return err;
> +}
> +
> +static int si476x_s_frequency(struct file *file, void *priv,
> +			      struct v4l2_frequency *f)
> +{
> +	int err;
> +	struct si476x_radio *radio = video_drvdata(file);
> +
> +	down_read(&radio->core_lock);
> +
> +	if (!radio->core) {
> +		err = -ENODEV;
> +		goto up_semaphore;
> +	}
> +	si476x_core_lock(radio->core);
> +
> +	switch (radio->core->power_up_parameters.func) {
> +	case SI476X_FUNC_FM_RECEIVER:
> +		/* FIXME change teh constants to use Hz */
> +		if (v4l2_to_hz(f->frequency) < FM_FREQ_RANGE_LOW ||
> +		    v4l2_to_hz(f->frequency) > FM_FREQ_RANGE_HIGH) {
> +			err = -EDOM;
> +			goto unlock;
> +		}
> +		break;
> +	case SI476X_FUNC_AM_RECEIVER:
> +		if (v4l2_to_hz(f->frequency) < AM_FREQ_RANGE_LOW ||
> +		    v4l2_to_hz(f->frequency) > AM_FREQ_RANGE_HIGH) {
> +			err = -EDOM;
> +			goto unlock;
> +		}
> +		break;
> +	case SI476X_FUNC_WB_RECEIVER:
> +	case SI476X_FUNC_BOOTLOADER:
> +		break;
> +	}
> +
> +	if (radio->ops->tune_freq) {
> +		struct si476x_tune_freq_args args = {
> +			.zifsr		= false,
> +			.hd		= false,
> +			.injside	= SI476X_INJSIDE_AUTO,
> +			.freq		= v4l2_to_si476x(radio->core,
> +							 f->frequency),
> +			.tunemode	= SI476X_SM_INITIALIZE_AUDIO,
> +			.smoothmetrics	= SI476X_TM_VALIDATED_NORMAL_TUNE,
> +			.antcap		= 0,
> +		};
> +		err = radio->ops->tune_freq(radio->core, &args);
> +	} else {
> +		err = -ENOTSUPP;
> +	}
> +
> +unlock:
> +	si476x_core_unlock(radio->core);
> +
> +up_semaphore:
> +	up_read(&radio->core_lock);
> +	return err;
> +}
> +
> +static int si476x_s_hw_freq_seek(struct file *file, void *priv,
> +				 struct v4l2_hw_freq_seek *seek)
> +{
> +	int err;
> +	struct si476x_radio *radio = video_drvdata(file);
> +
> +	down_read(&radio->core_lock);
> +
> +	if (!radio->core) {
> +		err = -ENODEV;
> +		goto up_semaphore;
> +	}
> +	/* FIXME: Add seek->spacing support */
> +	si476x_core_lock(radio->core);
> +	if (radio->ops->seek_start)
> +		err = radio->ops->seek_start(radio->core,
> +					     seek->seek_upward,
> +					     seek->wrap_around);
> +	else
> +		err = -ENOTSUPP;

Use ENOTTY instead of ENOTSUPP. ENOTTY is the standard error code when an
ioctl is not supported.

> +	si476x_core_unlock(radio->core);
> +
> +up_semaphore:
> +	up_read(&radio->core_lock);
> +	return err;
> +}
> +
> +static int __g_register(struct file *file, void *fh,
> +			     struct v4l2_dbg_register *reg)
> +{
> +	struct si476x_radio *radio = video_drvdata(file);
> +
> +	if (si476x_core_is_valid_property(radio->core, reg->reg)) {
> +		reg->size = 2;
> +		reg->val  = si476x_core_cmd_get_property(radio->core, reg->reg);
> +		return (reg->val < 0) ? reg->val : 0;
> +	} else {
> +		return -EINVAL;
> +	}
> +}
> +
> +static int __s_register(struct file *file, void *fh,
> +			struct v4l2_dbg_register *reg)
> +{
> +	int err;
> +	struct si476x_radio *radio = video_drvdata(file);
> +
> +	if (si476x_core_is_valid_property(radio->core, reg->reg) &&
> +	   !si476x_core_is_readonly_property(radio->core, reg->reg)) {
> +		err = si476x_core_cmd_set_property(radio->core,
> +						   reg->reg, reg->val);
> +	} else {
> +		err = -EINVAL;
> +	}
> +
> +	return err;
> +}
> +
> +#ifdef CONFIG_VIDEO_ADV_DEBUG
> +static int si476x_g_register(struct file *file, void *fh,
> +			     struct v4l2_dbg_register *reg)

If you implement g/s_register, then you should also implement g_chip_ident.

> +{
> +	int err;
> +	struct si476x_radio *radio = video_drvdata(file);
> +
> +	down_read(&radio->core_lock);
> +
> +	if (!radio->core) {
> +		err = -ENODEV;
> +	} else {
> +		si476x_core_lock(radio->core);
> +		err = __g_register(file, fh, reg);
> +		si476x_core_unlock(radio->core);
> +	}
> +
> +	up_read(&radio->core_lock);
> +	return err;
> +}
> +
> +static int si476x_s_register(struct file *file, void *fh,
> +			     struct v4l2_dbg_register *reg)
> +{
> +
> +	int err;
> +	struct si476x_radio *radio = video_drvdata(file);
> +
> +	down_read(&radio->core_lock);
> +
> +	if (!radio->core) {
> +		err = -ENODEV;
> +	} else {
> +		si476x_core_lock(radio->core);
> +		err = __s_register(file, fh, reg);
> +		si476x_core_unlock(radio->core);
> +	}
> +
> +	up_read(&radio->core_lock);
> +	return err;
> +}
> +#endif
> +
> +static long si476x_default(struct file *file, void *fh,
> +			   bool valid_prio, int cmd, void *arg)
> +{
> +	long rval;
> +	struct si476x_rsq_status_args args = {
> +		.primary	= false,
> +		.rsqack		= false,
> +		.attune		= false,
> +		.cancel		= false,
> +		.stcack		= false,
> +	};
> +	struct si476x_radio *radio  = video_drvdata(file);
> +
> +	down_read(&radio->core_lock);
> +	if (!radio->core) {
> +		rval = -ENODEV;
> +		goto up_semaphore;
> +	}
> +
> +	si476x_core_lock(radio->core);
> +	switch (cmd) {
> +	case SI476X_IOC_GET_RSQ_PRIMARY:
> +		args.primary = true;
> +	case SI476X_IOC_GET_RSQ: /* FALLTHROUG */
> +		if (radio->ops->rsq_status)
> +			rval = radio->ops->rsq_status(radio->core, &args,
> +				(struct si476x_rsq_status_report *) arg);
> +		else
> +			rval = -ENOTTY;
> +		break;
> +	case SI476X_IOC_SET_PHDIV_MODE:
> +		if (radio->ops->phase_diversity)
> +			rval = radio->ops->phase_diversity(radio->core,
> +				*((enum si476x_phase_diversity_mode *) arg));
> +		else
> +			rval = -ENOTTY;
> +		break;
> +	case SI476X_IOC_GET_PHDIV_STATUS:
> +		if (radio->ops->phase_div_status) {
> +			rval = radio->ops->phase_div_status(radio->core);
> +			if (rval >= 0) {
> +				*((int *)arg) = rval;
> +				rval = 0;
> +			}
> +		} else {
> +			rval = -ENOTTY;
> +		}
> +		break;
> +	case SI476X_IOC_GET_ACF:
> +		if (radio->ops->acf_status)
> +			rval = radio->ops->acf_status(radio->core,
> +				(struct si476x_acf_status_report *)arg);
> +		else
> +			rval = -ENOTTY;
> +		break;
> +	case SI476X_IOC_GET_AGC:
> +		if (radio->ops->agc_status)
> +			rval = radio->ops->agc_status(radio->core,
> +				(struct si476x_agc_status_report *)arg);
> +		else
> +			rval = -ENOTTY;
> +		break;
> +	case SI476X_IOC_GET_RDS_BLKCNT:
> +		if (radio->ops->rds_blckcnt)
> +			rval = radio->ops->rds_blckcnt(radio->core, true,
> +				(struct si476x_rds_blockcount_report *)arg);
> +		else
> +			rval = -ENOTTY;
> +		break;

Please give an explanation of these custom ioctls and why you think this
driver needs them. Perhaps these can be implemented in a more generic manner.

> +#ifndef CONFIG_VIDEO_ADV_DEBUG
> +	case VIDIOC_DBG_G_REGISTER:
> +		rval = __g_register(file, fh, arg);
> +		break;
> +	case VIDIOC_DBG_S_REGISTER:
> +		rval = __s_register(file, fh, arg);
> +		break;

Why are these here? These are available in v4l2_ioctls_op.

> +#endif
> +	default:
> +		/* nothing */
> +		rval = -ENOTTY;
> +		break;
> +	}
> +
> +	si476x_core_unlock(radio->core);
> +up_semaphore:
> +	up_read(&radio->core_lock);
> +	return rval;
> +}
> +
> +static int si476x_radio_fops_open(struct file *file)
> +{
> +	int err;
> +	struct si476x_radio *radio = video_drvdata(file);
> +
> +	si476x_radio_get(radio);
> +
> +	down_read(&radio->core_lock);
> +
> +	if (!radio->core) {
> +		err = -ENODEV;
> +		goto up_semaphore;
> +	}
> +
> +	if (atomic_inc_return(&radio->core->users) == 1) {
> +		si476x_core_lock(radio->core);
> +		err = si476x_core_set_power_state(radio->core,
> +						     SI476X_POWER_UP_FULL);
> +		if (err < 0)
> +			goto done;
> +
> +		err = si476x_radio_initialize_mode(radio);
> +		if (err < 0)
> +			goto power_down;
> +
> +		si476x_core_unlock(radio->core);
> +	} else {
> +		err = 0;
> +	}
> +
> +	up_read(&radio->core_lock);
> +	return err;
> +
> +power_down:
> +	si476x_core_set_power_state(radio->core,
> +				    SI476X_POWER_DOWN);
> +done:
> +	si476x_core_unlock(radio->core);
> +	atomic_dec(&radio->core->users);
> +up_semaphore:
> +	up_read(&radio->core_lock);
> +	si476x_radio_put(radio);
> +	return err;
> +}
> +
> +static int si476x_radio_fops_release(struct file *file)
> +{
> +	int err;
> +	struct si476x_radio *radio = video_drvdata(file);
> +
> +	down_read(&radio->core_lock);
> +
> +	if (!radio->core) {
> +		err = -ENODEV;
> +		goto up_semaphore;
> +	}
> +
> +	if (atomic_dec_and_test(&radio->core->users)) {
> +		err = si476x_core_set_power_state(radio->core,
> +						  SI476X_POWER_DOWN);
> +	} else {
> +		err = 0;
> +	}
> +
> +up_semaphore:
> +	up_read(&radio->core_lock);
> +	si476x_radio_put(radio);
> +	return err;
> +}
> +
> +static ssize_t si476x_radio_fops_read(struct file *file, char __user *buf,
> +				      size_t count, loff_t *ppos)
> +{
> +	ssize_t      rval;
> +	size_t       fifo_len;
> +	unsigned int copied;
> +
> +	struct si476x_radio *radio = video_drvdata(file);
> +
> +	down_read(&radio->core_lock);
> +
> +	if (!radio->core) {
> +		rval = -ENODEV;
> +		goto up_semaphore;
> +	}
> +
> +	/* block if no new data available */
> +	if (kfifo_is_empty(&radio->core->rds_fifo)) {
> +		if (file->f_flags & O_NONBLOCK) {
> +			rval = -EWOULDBLOCK;
> +			goto up_semaphore;
> +		}
> +		rval = wait_event_interruptible(radio->core->rds_read_queue,
> +				(!kfifo_is_empty(&radio->core->rds_fifo) ||
> +				 !atomic_read(&radio->core->is_alive)));
> +		if (rval < 0) {
> +			rval = -EINTR;
> +			goto up_semaphore;
> +		}
> +		if (!atomic_read(&radio->core->is_alive)) {
> +			rval = -ENODEV;
> +			goto up_semaphore;
> +		}
> +	}
> +
> +	fifo_len = kfifo_len(&radio->core->rds_fifo);
> +
> +	if (kfifo_to_user(&radio->core->rds_fifo, buf,
> +			  min(fifo_len, count),
> +			  &copied) != 0) {
> +		dev_warn(&radio->videodev->dev,
> +			 "Error durnig FIFO to userspace copy\n");
> +		rval = -EIO;
> +	} else {
> +		rval = (ssize_t)copied;
> +	}
> +
> +up_semaphore:
> +	up_read(&radio->core_lock);
> +	return rval;
> +}
> +
> +
> +static unsigned int si476x_radio_fops_poll(struct file *file,
> +				struct poll_table_struct *pts)
> +{
> +	int err;
> +	struct si476x_radio *radio = video_drvdata(file);
> +
> +	down_read(&radio->core_lock);
> +	if (!radio->core) {
> +		err = POLLHUP;
> +		goto up_semaphore;
> +	}
> +
> +	if (atomic_read(&radio->core->is_alive))
> +		poll_wait(file, &radio->core->rds_read_queue, pts);
> +
> +	if (!atomic_read(&radio->core->is_alive))
> +		err = POLLHUP;
> +
> +	if (!kfifo_is_empty(&radio->core->rds_fifo))
> +		err = POLLIN | POLLRDNORM;
> +
> +up_semaphore:
> +	up_read(&radio->core_lock);

Huh? err can be undefined here. The compiler should have warned you.

> +	return err;
> +}
> +
> +static const struct v4l2_file_operations si476x_fops = {
> +	.owner			= THIS_MODULE,
> +	.read			= si476x_radio_fops_read,
> +	.poll			= si476x_radio_fops_poll,
> +	.unlocked_ioctl		= video_ioctl2,
> +	.open			= si476x_radio_fops_open,
> +	.release		= si476x_radio_fops_release,
> +};
> +
> +static const struct v4l2_ioctl_ops si4761_ioctl_ops = {
> +	.vidioc_querycap	= si476x_querycap,
> +	.vidioc_queryctrl	= si476x_queryctrl,
> +	.vidioc_querymenu       = si476x_querymenu,
> +	.vidioc_g_ctrl		= si476x_g_ctrl,
> +	.vidioc_s_ctrl		= si476x_s_ctrl,
> +	.vidioc_g_audio		= si476x_g_audio,
> +	.vidioc_s_audio		= si476x_s_audio,
> +	.vidioc_enumaudio	= si476x_enumaudio,
> +	.vidioc_g_tuner		= si476x_g_tuner,
> +
> +	.vidioc_g_frequency	= si476x_g_frequency,
> +	.vidioc_s_frequency	= si476x_s_frequency,
> +	.vidioc_s_hw_freq_seek	= si476x_s_hw_freq_seek,
> +
> +#ifdef CONFIG_VIDEO_ADV_DEBUG
> +	.vidioc_g_register      = si476x_g_register,
> +	.vidioc_s_register      = si476x_s_register,
> +#endif
> +	.vidioc_default         = si476x_default,
> +};
> +
> +
> +static const struct video_device si476x_viddev_template = {
> +	.fops			= &si476x_fops,
> +	.name			= DRIVER_NAME,
> +	.release		= video_device_release,
> +};
> +
> +
> +static int si476x_radio_initialize_mode(struct si476x_radio *radio)
> +{
> +	static const struct si476x_radio_ops fm_ops = {
> +		.tune_freq		= si476x_core_cmd_fm_tune_freq,
> +		.seek_start		= si476x_core_cmd_fm_seek_start,
> +		.rsq_status		= si476x_core_cmd_fm_rsq_status,
> +		.rds_blckcnt		= si476x_core_cmd_fm_rds_blockcount,
> +		.phase_diversity	= si476x_core_cmd_fm_phase_diversity,
> +		.phase_div_status	= si476x_core_cmd_fm_phase_div_status,
> +		.acf_status		= si476x_core_cmd_fm_acf_status,
> +		.agc_status		= si476x_core_cmd_agc_status,
> +	};
> +
> +	static const struct si476x_radio_ops am_ops = {
> +		.tune_freq		= si476x_core_cmd_am_tune_freq,
> +		.seek_start		= si476x_core_cmd_am_seek_start,
> +		.rsq_status		= si476x_core_cmd_am_rsq_status,
> +		.rds_blckcnt		= NULL,
> +		.phase_diversity	= NULL,
> +		.phase_div_status	= NULL,
> +		.acf_status		= si476x_core_cmd_am_acf_status,
> +		.agc_status		= NULL,
> +	};
> +
> +	static const struct si476x_radio_ops none_ops = {
> +		.tune_freq		= NULL,
> +		.seek_start		= NULL,
> +		.rsq_status		= NULL,
> +		.rds_blckcnt		= NULL,
> +		.phase_diversity	= NULL,
> +		.phase_div_status	= NULL,
> +		.acf_status		= NULL,
> +		.agc_status		= NULL,
> +	};
> +
> +	struct si476x_func_info info;
> +	int retval;
> +
> +	retval = si476x_core_cmd_func_info(radio->core, &info);
> +	if (retval < 0)
> +		return retval;
> +
> +	switch (info.func) {
> +	case SI476X_FUNC_FM_RECEIVER:
> +		radio->ops = &fm_ops;
> +		break;
> +	case SI476X_FUNC_AM_RECEIVER:
> +		radio->ops = &am_ops;
> +		break;
> +	default:
> +		WARN(1, "Unexpected tuner function value\n"); /* FALLTHROUGH */
> +	case SI476X_FUNC_WB_RECEIVER: /* FALLTHROUGH */
> +	case SI476X_FUNC_BOOTLOADER:
> +		radio->ops = &none_ops;
> +		break;
> +	}
> +
> +	return retval;
> +}
> +
> +static int __devinit si476x_radio_probe(struct platform_device *pdev)
> +{
> +	int rval;
> +	struct si476x_core **core = pdev->dev.platform_data;
> +	struct si476x_radio *radio;
> +
> +	if (!core) {
> +		dev_err(&pdev->dev, "No platform data.\n");
> +		rval = -EINVAL;
> +		goto exit;
> +	}
> +
> +	radio = kzalloc(sizeof(*radio), GFP_KERNEL);
> +	if (!radio) {
> +		rval = -ENOMEM;
> +		goto exit;
> +	}
> +
> +	radio->core = *core;
> +	si476x_core_get(radio->core);
> +
> +	radio->videodev = video_device_alloc();

I generally recommend that video_device is embedded in the radio struct.
That way you don't have to test whether the allocation failed.

> +	if (!radio->videodev) {
> +		dev_err(&pdev->dev, "Failed to alloc video device.\n");
> +		rval = -ENOMEM;
> +		goto free_radio;
> +	}
> +
> +	memcpy(radio->videodev, &si476x_viddev_template,
> +	       sizeof(struct video_device));

	radio->videodev = si476x_viddev_template;

> +	radio->videodev->ioctl_ops = &si4761_ioctl_ops;
> +
> +	/* tie this device to some physical hardware */
> +	radio->videodev->parent = &pdev->dev;
> +
> +	video_set_drvdata(radio->videodev, radio);
> +	platform_set_drvdata(pdev, radio);
> +
> +	/* register video device */
> +	rval = video_register_device(radio->videodev, VFL_TYPE_RADIO, -1);
> +
> +	if (rval) {
> +		dev_err(&pdev->dev, "Could not register video device\n");
> +	} else {
> +		init_rwsem(&radio->core_lock);
> +		kref_init(&radio->kref);

Do this before the video_register_device.

> +		/* si476x_debugfs_init(radio, id->name); */
> +		return 0;
> +	}
> +
> +free_radio:
> +	kfree(radio);
> +exit:
> +	return rval;
> +}
> +
> +static void si476x_radio_delete(struct kref *kref)
> +{
> +	struct si476x_radio *radio = kref_to_si476x_radio(kref);
> +	kfree(radio);
> +}
> +
> +
> +static int si476x_radio_remove(struct platform_device *pdev)
> +{
> +	struct si476x_radio *radio = platform_get_drvdata(pdev);
> +
> +
> +	video_unregister_device(radio->videodev);
> +
> +	down_write(&radio->core_lock);
> +	si476x_core_put(radio->core);
> +	radio->core = NULL;
> +	up_write(&radio->core_lock);
> +
> +	si476x_radio_put(radio);
> +
> +	return 0;
> +}
> +
> +MODULE_ALIAS("platform:si476x-radio");
> +
> +static struct platform_driver si476x_radio_driver = {
> +	.probe		= si476x_radio_probe,
> +	.remove		= __devexit_p(si476x_radio_remove),
> +	.driver		= {
> +		.name	= DRIVER_NAME,
> +		.owner	= THIS_MODULE,
> +	},
> +};
> +
> +static int __init si476x_module_init(void)
> +{
> +	return platform_driver_register(&si476x_radio_driver);
> +}
> +module_init(si476x_module_init);
> +
> +static void __exit si476x_module_exit(void)
> +{
> +	platform_driver_unregister(&si476x_radio_driver);
> +}
> +module_exit(si476x_module_exit);
> +
> +MODULE_AUTHOR("Andrey Smirnov <andrey.smirnov@convergeddevices.net>");
> +MODULE_DESCRIPTION("Driver for Si4761/64/68 AM/FM Radio MFD Cell");
> +MODULE_LICENSE("GPL");
> 

Regards,

	Hans

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 1/3] Add a core driver for SI476x MFD
  2012-09-14  6:44   ` Hans Verkuil
@ 2012-09-21  1:05     ` andrey.smirnov
  2012-09-21  7:31       ` Hans Verkuil
  0 siblings, 1 reply; 13+ messages in thread
From: andrey.smirnov @ 2012-09-21  1:05 UTC (permalink / raw)
  To: Hans Verkuil; +Cc: linux-media, linux-kernel

On 09/13/2012 11:44 PM, Hans Verkuil wrote:
> Hi Andrey!
>
> Thanks for posting this driver. One request for the future: please split this
> patch up in smaller pieces: one for each c source for example. That makes it
> easier to review.

Will do for next version.

> +
> +/**
> + * __core_send_command() - sends a command to si476x and waits its
> + * response
> + * @core:    si476x_device structure for the device we are
> + *            communicating with
> + * @command:  command id
> + * @args:     command arguments we are sending
> + * @argn:     actual size of @args
> + * @response: buffer to place the expected response from the device
> + * @respn:    actual size of @response
> + * @usecs:    amount of time to wait before reading the response (in
> + *            usecs)
> + *
> + * Function returns 0 on succsess and negative error code on
> + * failure
> + */
> +static int __core_send_command(struct si476x_core *core,
> +				    const u8 command,
> +				    const u8 args[],
> +				    const int argn,
> +				    u8 resp[],
> +				    const int respn,
> +				    const int usecs)
> +{
> +	struct i2c_client *client = core->client;
> +	int err;
> +	u8  data[CMD_MAX_ARGS_COUNT + 1];
> +
> +	if (argn > CMD_MAX_ARGS_COUNT) {
> +		err = -ENOMEM;
> +		goto exit;
> Why goto exit? There is no clean up after the exit label, so just return
> immediately. Ditto for all the other goto exit's in this function.

To have only just on point of exit from the function that's just
personal coding style preference.
There are no technical reasons behind that, I can change that.

>
>> +	}
>> +
>> +	if (!client->adapter) {
>> +		err = -ENODEV;
>> +		goto exit;
>> +	}
>> +
>> +	/* First send the command and its arguments */
>> +	data[0] = command;
>> +	memcpy(&data[1], args, argn);
>> +	DBG_BUFFER(&client->dev, "Command:\n", data, argn + 1);
>> +
>> +	err = si476x_i2c_xfer(core, SI476X_I2C_SEND, (char *) data, argn + 1);
>> +	if (err != argn + 1) {
>> +		dev_err(&core->client->dev,
>> +			"Error while sending command 0x%02x\n",
>> +			command);
>> +		err = (err >= 0) ? -EIO : err;
>> +		goto exit;
>> +	}
>> +	/* Set CTS to zero only after the command is send to avoid
>> +	 * possible racing conditions when working in polling mode */
>> +	atomic_set(&core->cts, 0);
>> +
>> +	if (!wait_event_timeout(core->command,
>> +				atomic_read(&core->cts),
>> +				usecs_to_jiffies(usecs) + 1))
>> +		dev_warn(&core->client->dev,
>> +			 "(%s) [CMD 0x%02x] Device took too much time to answer.\n",
>> +			 __func__, command);
>> +
>> +	/*
>> +	  When working in polling mode, for some reason the tuner will
>> +	  report CTS bit as being set in the first status byte read,
>> +	  but all the consequtive ones will return zros until the
>> +	  tuner is actually completed the POWER_UP command. To
>> +	  workaround that we wait for second CTS to be reported
>> +	 */
>> +	if (unlikely(!core->client->irq && command == CMD_POWER_UP)) {
>> +		if (!wait_event_timeout(core->command,
>> +					atomic_read(&core->cts),
>> +					usecs_to_jiffies(usecs) + 1))
>> +			dev_warn(&core->client->dev,
>> +				 "(%s) Power up took too much time.\n",
>> +				 __func__);
>> +	}
>> +
>> +	/* Then get the response */
>> +	err = si476x_i2c_xfer(core, SI476X_I2C_RECV, resp, respn);
>> +	if (err != respn) {
>> +		dev_err(&core->client->dev,
>> +			"Error while reading response for command 0x%02x\n",
>> +			command);
>> +		err = (err >= 0) ? -EIO : err;
>> +		goto exit;
>> +	}
>> +	DBG_BUFFER(&client->dev, "Response:\n", resp, respn);
>> +
>> +	err = 0;
>> +
>> +	if (resp[0] & SI476X_ERR) {
>> +		dev_err(&core->client->dev, "Chip set error flag\n");
>> +		err = si476x_core_parse_and_nag_about_error(core);
>> +		goto exit;
>> +	}
>> +
>> +	if (!(resp[0] & SI476X_CTS))
>> +		err = -EBUSY;
>> +exit:
>> +	return err;
>> +}
>> +
>> +#define CORE_SEND_COMMAND(core, cmd, args, resp, timeout)		\
>> +	__core_send_command(core, cmd, args,				\
>> +			    ARRAY_SIZE(args),				\
>> +			    resp, ARRAY_SIZE(resp),			\
>> +			    timeout)
>> +
>> +
>> +static int __cmd_tune_seek_freq(struct si476x_core *core,
>> +				uint8_t cmd,
>> +				const uint8_t args[], size_t argn,
>> +				uint8_t *resp, size_t respn,
>> +				int (*clear_stcint) (struct si476x_core *core))
>> +{
>> +	int err;
>> +
>> +	atomic_set(&core->stc, 0);
>> +	err = __core_send_command(core, cmd, args, argn,
>> +				  resp, respn,
>> +				  atomic_read(&core->timeouts.command));
>> +	if (!err) {
> Invert the test to simplify indentation.
>
>> +		if (!wait_event_timeout(core->tuning,
>> +		atomic_read(&core->stc),
>> +		usecs_to_jiffies(atomic_read(&core->timeouts.tune)) + 1)) {
> Weird indentation above. Indent the arguments more to the right.

80 symbol line length limit is the reason for that indentation.

>
> Andrey, you should look at the drivers/media/radio/si4713-i2c.c source.
> It is for the same chip family and is much, much smaller.
>
> See if you can use some of the code that's there.

I did when I started writing the driver, that driver and driver for
wl1273 were my two examples. In my initial version of the driver I tried
to blend both si4713 and si476x into one generic driver, but the problem
is: si4713 is a transmitter and si476x are receiver chips, the
"impedance mismatch" in functionality of the two, IMHO, was too much to
justify the unification.

Thanks for review, and I'll try to incorporate your suggestions into my
next version of the patches.

Andrey Smirnov



^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 1/3] Add a core driver for SI476x MFD
  2012-09-21  1:05     ` andrey.smirnov
@ 2012-09-21  7:31       ` Hans Verkuil
  2012-09-21 16:33         ` andrey.smirnov
  0 siblings, 1 reply; 13+ messages in thread
From: Hans Verkuil @ 2012-09-21  7:31 UTC (permalink / raw)
  To: andrey.smirnov; +Cc: linux-media, linux-kernel

On Fri September 21 2012 03:05:41 andrey.smirnov@convergeddevices.net wrote:
> On 09/13/2012 11:44 PM, Hans Verkuil wrote:
> > Hi Andrey!
> >
> > Thanks for posting this driver. One request for the future: please split this
> > patch up in smaller pieces: one for each c source for example. That makes it
> > easier to review.
> 
> Will do for next version.
> 
> > +
> > +/**
> > + * __core_send_command() - sends a command to si476x and waits its
> > + * response
> > + * @core:    si476x_device structure for the device we are
> > + *            communicating with
> > + * @command:  command id
> > + * @args:     command arguments we are sending
> > + * @argn:     actual size of @args
> > + * @response: buffer to place the expected response from the device
> > + * @respn:    actual size of @response
> > + * @usecs:    amount of time to wait before reading the response (in
> > + *            usecs)
> > + *
> > + * Function returns 0 on succsess and negative error code on
> > + * failure
> > + */
> > +static int __core_send_command(struct si476x_core *core,
> > +				    const u8 command,
> > +				    const u8 args[],
> > +				    const int argn,
> > +				    u8 resp[],
> > +				    const int respn,
> > +				    const int usecs)
> > +{
> > +	struct i2c_client *client = core->client;
> > +	int err;
> > +	u8  data[CMD_MAX_ARGS_COUNT + 1];
> > +
> > +	if (argn > CMD_MAX_ARGS_COUNT) {
> > +		err = -ENOMEM;
> > +		goto exit;
> > Why goto exit? There is no clean up after the exit label, so just return
> > immediately. Ditto for all the other goto exit's in this function.
> 
> To have only just on point of exit from the function that's just
> personal coding style preference.
> There are no technical reasons behind that, I can change that.
> 
> >
> >> +	}
> >> +
> >> +	if (!client->adapter) {
> >> +		err = -ENODEV;
> >> +		goto exit;
> >> +	}
> >> +
> >> +	/* First send the command and its arguments */
> >> +	data[0] = command;
> >> +	memcpy(&data[1], args, argn);
> >> +	DBG_BUFFER(&client->dev, "Command:\n", data, argn + 1);
> >> +
> >> +	err = si476x_i2c_xfer(core, SI476X_I2C_SEND, (char *) data, argn + 1);
> >> +	if (err != argn + 1) {
> >> +		dev_err(&core->client->dev,
> >> +			"Error while sending command 0x%02x\n",
> >> +			command);
> >> +		err = (err >= 0) ? -EIO : err;
> >> +		goto exit;
> >> +	}
> >> +	/* Set CTS to zero only after the command is send to avoid
> >> +	 * possible racing conditions when working in polling mode */
> >> +	atomic_set(&core->cts, 0);
> >> +
> >> +	if (!wait_event_timeout(core->command,
> >> +				atomic_read(&core->cts),
> >> +				usecs_to_jiffies(usecs) + 1))
> >> +		dev_warn(&core->client->dev,
> >> +			 "(%s) [CMD 0x%02x] Device took too much time to answer.\n",
> >> +			 __func__, command);
> >> +
> >> +	/*
> >> +	  When working in polling mode, for some reason the tuner will
> >> +	  report CTS bit as being set in the first status byte read,
> >> +	  but all the consequtive ones will return zros until the
> >> +	  tuner is actually completed the POWER_UP command. To
> >> +	  workaround that we wait for second CTS to be reported
> >> +	 */
> >> +	if (unlikely(!core->client->irq && command == CMD_POWER_UP)) {
> >> +		if (!wait_event_timeout(core->command,
> >> +					atomic_read(&core->cts),
> >> +					usecs_to_jiffies(usecs) + 1))
> >> +			dev_warn(&core->client->dev,
> >> +				 "(%s) Power up took too much time.\n",
> >> +				 __func__);
> >> +	}
> >> +
> >> +	/* Then get the response */
> >> +	err = si476x_i2c_xfer(core, SI476X_I2C_RECV, resp, respn);
> >> +	if (err != respn) {
> >> +		dev_err(&core->client->dev,
> >> +			"Error while reading response for command 0x%02x\n",
> >> +			command);
> >> +		err = (err >= 0) ? -EIO : err;
> >> +		goto exit;
> >> +	}
> >> +	DBG_BUFFER(&client->dev, "Response:\n", resp, respn);
> >> +
> >> +	err = 0;
> >> +
> >> +	if (resp[0] & SI476X_ERR) {
> >> +		dev_err(&core->client->dev, "Chip set error flag\n");
> >> +		err = si476x_core_parse_and_nag_about_error(core);
> >> +		goto exit;
> >> +	}
> >> +
> >> +	if (!(resp[0] & SI476X_CTS))
> >> +		err = -EBUSY;
> >> +exit:
> >> +	return err;
> >> +}
> >> +
> >> +#define CORE_SEND_COMMAND(core, cmd, args, resp, timeout)		\
> >> +	__core_send_command(core, cmd, args,				\
> >> +			    ARRAY_SIZE(args),				\
> >> +			    resp, ARRAY_SIZE(resp),			\
> >> +			    timeout)
> >> +
> >> +
> >> +static int __cmd_tune_seek_freq(struct si476x_core *core,
> >> +				uint8_t cmd,
> >> +				const uint8_t args[], size_t argn,
> >> +				uint8_t *resp, size_t respn,
> >> +				int (*clear_stcint) (struct si476x_core *core))
> >> +{
> >> +	int err;
> >> +
> >> +	atomic_set(&core->stc, 0);
> >> +	err = __core_send_command(core, cmd, args, argn,
> >> +				  resp, respn,
> >> +				  atomic_read(&core->timeouts.command));
> >> +	if (!err) {
> > Invert the test to simplify indentation.
> >
> >> +		if (!wait_event_timeout(core->tuning,
> >> +		atomic_read(&core->stc),
> >> +		usecs_to_jiffies(atomic_read(&core->timeouts.tune)) + 1)) {
> > Weird indentation above. Indent the arguments more to the right.
> 
> 80 symbol line length limit is the reason for that indentation.

It's not a limit, it's a warning only. Usually readability improves if such
long lines are split up or otherwise shortened, but if readability becomes
worse because of that, then just leave in the long line.

> 
> >
> > Andrey, you should look at the drivers/media/radio/si4713-i2c.c source.
> > It is for the same chip family and is much, much smaller.
> >
> > See if you can use some of the code that's there.
> 
> I did when I started writing the driver, that driver and driver for
> wl1273 were my two examples. In my initial version of the driver I tried
> to blend both si4713 and si476x into one generic driver, but the problem
> is: si4713 is a transmitter and si476x are receiver chips, the
> "impedance mismatch" in functionality of the two, IMHO, was too much to
> justify the unification.

But the way the commands are handled, etc. should be the same or very similar.
That's the main area where I suspect you can reuse code from those other
drivers.

> Thanks for review, and I'll try to incorporate your suggestions into my
> next version of the patches.

Thanks!

Regards,

	Hans

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 1/3] Add a core driver for SI476x MFD
  2012-09-21  7:31       ` Hans Verkuil
@ 2012-09-21 16:33         ` andrey.smirnov
  2012-09-21 16:46           ` Hans Verkuil
  0 siblings, 1 reply; 13+ messages in thread
From: andrey.smirnov @ 2012-09-21 16:33 UTC (permalink / raw)
  To: Hans Verkuil; +Cc: linux-media, linux-kernel

On 09/21/2012 12:31 AM, Hans Verkuil wrote:
> On Fri September 21 2012 03:05:41 andrey.smirnov@convergeddevices.net wrote:
>> On 09/13/2012 11:44 PM, Hans Verkuil wrote:
>>> Hi Andrey!
>>>
>>> Thanks for posting this driver. One request for the future: please split this
>>> patch up in smaller pieces: one for each c source for example. That makes it
>>> easier to review.
>> Will do for next version.
>>
>>> +
>>> +/**
>>> + * __core_send_command() - sends a command to si476x and waits its
>>> + * response
>>> + * @core:    si476x_device structure for the device we are
>>> + *            communicating with
>>> + * @command:  command id
>>> + * @args:     command arguments we are sending
>>> + * @argn:     actual size of @args
>>> + * @response: buffer to place the expected response from the device
>>> + * @respn:    actual size of @response
>>> + * @usecs:    amount of time to wait before reading the response (in
>>> + *            usecs)
>>> + *
>>> + * Function returns 0 on succsess and negative error code on
>>> + * failure
>>> + */
>>> +static int __core_send_command(struct si476x_core *core,
>>> +				    const u8 command,
>>> +				    const u8 args[],
>>> +				    const int argn,
>>> +				    u8 resp[],
>>> +				    const int respn,
>>> +				    const int usecs)
>>> +{
>>> +	struct i2c_client *client = core->client;
>>> +	int err;
>>> +	u8  data[CMD_MAX_ARGS_COUNT + 1];
>>> +
>>> +	if (argn > CMD_MAX_ARGS_COUNT) {
>>> +		err = -ENOMEM;
>>> +		goto exit;
>>> Why goto exit? There is no clean up after the exit label, so just return
>>> immediately. Ditto for all the other goto exit's in this function.
>> To have only just on point of exit from the function that's just
>> personal coding style preference.
>> There are no technical reasons behind that, I can change that.
>>
>>>> +	}
>>>> +
>>>> +	if (!client->adapter) {
>>>> +		err = -ENODEV;
>>>> +		goto exit;
>>>> +	}
>>>> +
>>>> +	/* First send the command and its arguments */
>>>> +	data[0] = command;
>>>> +	memcpy(&data[1], args, argn);
>>>> +	DBG_BUFFER(&client->dev, "Command:\n", data, argn + 1);
>>>> +
>>>> +	err = si476x_i2c_xfer(core, SI476X_I2C_SEND, (char *) data, argn + 1);
>>>> +	if (err != argn + 1) {
>>>> +		dev_err(&core->client->dev,
>>>> +			"Error while sending command 0x%02x\n",
>>>> +			command);
>>>> +		err = (err >= 0) ? -EIO : err;
>>>> +		goto exit;
>>>> +	}
>>>> +	/* Set CTS to zero only after the command is send to avoid
>>>> +	 * possible racing conditions when working in polling mode */
>>>> +	atomic_set(&core->cts, 0);
>>>> +
>>>> +	if (!wait_event_timeout(core->command,
>>>> +				atomic_read(&core->cts),
>>>> +				usecs_to_jiffies(usecs) + 1))
>>>> +		dev_warn(&core->client->dev,
>>>> +			 "(%s) [CMD 0x%02x] Device took too much time to answer.\n",
>>>> +			 __func__, command);
>>>> +
>>>> +	/*
>>>> +	  When working in polling mode, for some reason the tuner will
>>>> +	  report CTS bit as being set in the first status byte read,
>>>> +	  but all the consequtive ones will return zros until the
>>>> +	  tuner is actually completed the POWER_UP command. To
>>>> +	  workaround that we wait for second CTS to be reported
>>>> +	 */
>>>> +	if (unlikely(!core->client->irq && command == CMD_POWER_UP)) {
>>>> +		if (!wait_event_timeout(core->command,
>>>> +					atomic_read(&core->cts),
>>>> +					usecs_to_jiffies(usecs) + 1))
>>>> +			dev_warn(&core->client->dev,
>>>> +				 "(%s) Power up took too much time.\n",
>>>> +				 __func__);
>>>> +	}
>>>> +
>>>> +	/* Then get the response */
>>>> +	err = si476x_i2c_xfer(core, SI476X_I2C_RECV, resp, respn);
>>>> +	if (err != respn) {
>>>> +		dev_err(&core->client->dev,
>>>> +			"Error while reading response for command 0x%02x\n",
>>>> +			command);
>>>> +		err = (err >= 0) ? -EIO : err;
>>>> +		goto exit;
>>>> +	}
>>>> +	DBG_BUFFER(&client->dev, "Response:\n", resp, respn);
>>>> +
>>>> +	err = 0;
>>>> +
>>>> +	if (resp[0] & SI476X_ERR) {
>>>> +		dev_err(&core->client->dev, "Chip set error flag\n");
>>>> +		err = si476x_core_parse_and_nag_about_error(core);
>>>> +		goto exit;
>>>> +	}
>>>> +
>>>> +	if (!(resp[0] & SI476X_CTS))
>>>> +		err = -EBUSY;
>>>> +exit:
>>>> +	return err;
>>>> +}
>>>> +
>>>> +#define CORE_SEND_COMMAND(core, cmd, args, resp, timeout)		\
>>>> +	__core_send_command(core, cmd, args,				\
>>>> +			    ARRAY_SIZE(args),				\
>>>> +			    resp, ARRAY_SIZE(resp),			\
>>>> +			    timeout)
>>>> +
>>>> +
>>>> +static int __cmd_tune_seek_freq(struct si476x_core *core,
>>>> +				uint8_t cmd,
>>>> +				const uint8_t args[], size_t argn,
>>>> +				uint8_t *resp, size_t respn,
>>>> +				int (*clear_stcint) (struct si476x_core *core))
>>>> +{
>>>> +	int err;
>>>> +
>>>> +	atomic_set(&core->stc, 0);
>>>> +	err = __core_send_command(core, cmd, args, argn,
>>>> +				  resp, respn,
>>>> +				  atomic_read(&core->timeouts.command));
>>>> +	if (!err) {
>>> Invert the test to simplify indentation.
>>>
>>>> +		if (!wait_event_timeout(core->tuning,
>>>> +		atomic_read(&core->stc),
>>>> +		usecs_to_jiffies(atomic_read(&core->timeouts.tune)) + 1)) {
>>> Weird indentation above. Indent the arguments more to the right.
>> 80 symbol line length limit is the reason for that indentation.
> It's not a limit, it's a warning only. Usually readability improves if such
> long lines are split up or otherwise shortened, but if readability becomes
> worse because of that, then just leave in the long line.
>
>>> Andrey, you should look at the drivers/media/radio/si4713-i2c.c source.
>>> It is for the same chip family and is much, much smaller.
>>>
>>> See if you can use some of the code that's there.
>> I did when I started writing the driver, that driver and driver for
>> wl1273 were my two examples. In my initial version of the driver I tried
>> to blend both si4713 and si476x into one generic driver, but the problem
>> is: si4713 is a transmitter and si476x are receiver chips, the
>> "impedance mismatch" in functionality of the two, IMHO, was too much to
>> justify the unification.
> But the way the commands are handled, etc. should be the same or very similar.
> That's the main area where I suspect you can reuse code from those other
> drivers.

To reuse the si4713_send_command function from si4713 driver I would
have to modify the way IRQs are handled by that driver and basically
replace its code for mine. And the reason for that is because si4761 is
a receiver, I cannot just rely on timeouts in the case of driver working
in "no-IRQ" mode(current implementation in si4713 driver). I need a
polling loop that would allow me to receive RDS and monitor the status
of the chip. Plus having a polling loop allows me to have almost
identical implementation of chip events handling for both cases(IRQ and
no-IRQ). I don't feel comfortable making such drastic changes to si4713
driver without having access to the actual hardware and being ability to
test it.

I really did try to amalgamate two drivers into a single one(and even
received an earful from my, at that time, supervisor for wasting my time
on it). But as I mentioned earlier to unite both drivers I would have to
modify si4713's code and without any actual hardware I cannot do it.

Andrey


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 1/3] Add a core driver for SI476x MFD
  2012-09-21 16:33         ` andrey.smirnov
@ 2012-09-21 16:46           ` Hans Verkuil
  0 siblings, 0 replies; 13+ messages in thread
From: Hans Verkuil @ 2012-09-21 16:46 UTC (permalink / raw)
  To: andrey.smirnov; +Cc: linux-media, linux-kernel

On Fri September 21 2012 18:33:45 andrey.smirnov@convergeddevices.net wrote:
> On 09/21/2012 12:31 AM, Hans Verkuil wrote:
> > On Fri September 21 2012 03:05:41 andrey.smirnov@convergeddevices.net wrote:
> >> On 09/13/2012 11:44 PM, Hans Verkuil wrote:
> >>> Hi Andrey!
> >>>
> >>> Thanks for posting this driver. One request for the future: please split this
> >>> patch up in smaller pieces: one for each c source for example. That makes it
> >>> easier to review.
> >> Will do for next version.
> >>
> >>> +
> >>> +/**
> >>> + * __core_send_command() - sends a command to si476x and waits its
> >>> + * response
> >>> + * @core:    si476x_device structure for the device we are
> >>> + *            communicating with
> >>> + * @command:  command id
> >>> + * @args:     command arguments we are sending
> >>> + * @argn:     actual size of @args
> >>> + * @response: buffer to place the expected response from the device
> >>> + * @respn:    actual size of @response
> >>> + * @usecs:    amount of time to wait before reading the response (in
> >>> + *            usecs)
> >>> + *
> >>> + * Function returns 0 on succsess and negative error code on
> >>> + * failure
> >>> + */
> >>> +static int __core_send_command(struct si476x_core *core,
> >>> +				    const u8 command,
> >>> +				    const u8 args[],
> >>> +				    const int argn,
> >>> +				    u8 resp[],
> >>> +				    const int respn,
> >>> +				    const int usecs)
> >>> +{
> >>> +	struct i2c_client *client = core->client;
> >>> +	int err;
> >>> +	u8  data[CMD_MAX_ARGS_COUNT + 1];
> >>> +
> >>> +	if (argn > CMD_MAX_ARGS_COUNT) {
> >>> +		err = -ENOMEM;
> >>> +		goto exit;
> >>> Why goto exit? There is no clean up after the exit label, so just return
> >>> immediately. Ditto for all the other goto exit's in this function.
> >> To have only just on point of exit from the function that's just
> >> personal coding style preference.
> >> There are no technical reasons behind that, I can change that.
> >>
> >>>> +	}
> >>>> +
> >>>> +	if (!client->adapter) {
> >>>> +		err = -ENODEV;
> >>>> +		goto exit;
> >>>> +	}
> >>>> +
> >>>> +	/* First send the command and its arguments */
> >>>> +	data[0] = command;
> >>>> +	memcpy(&data[1], args, argn);
> >>>> +	DBG_BUFFER(&client->dev, "Command:\n", data, argn + 1);
> >>>> +
> >>>> +	err = si476x_i2c_xfer(core, SI476X_I2C_SEND, (char *) data, argn + 1);
> >>>> +	if (err != argn + 1) {
> >>>> +		dev_err(&core->client->dev,
> >>>> +			"Error while sending command 0x%02x\n",
> >>>> +			command);
> >>>> +		err = (err >= 0) ? -EIO : err;
> >>>> +		goto exit;
> >>>> +	}
> >>>> +	/* Set CTS to zero only after the command is send to avoid
> >>>> +	 * possible racing conditions when working in polling mode */
> >>>> +	atomic_set(&core->cts, 0);
> >>>> +
> >>>> +	if (!wait_event_timeout(core->command,
> >>>> +				atomic_read(&core->cts),
> >>>> +				usecs_to_jiffies(usecs) + 1))
> >>>> +		dev_warn(&core->client->dev,
> >>>> +			 "(%s) [CMD 0x%02x] Device took too much time to answer.\n",
> >>>> +			 __func__, command);
> >>>> +
> >>>> +	/*
> >>>> +	  When working in polling mode, for some reason the tuner will
> >>>> +	  report CTS bit as being set in the first status byte read,
> >>>> +	  but all the consequtive ones will return zros until the
> >>>> +	  tuner is actually completed the POWER_UP command. To
> >>>> +	  workaround that we wait for second CTS to be reported
> >>>> +	 */
> >>>> +	if (unlikely(!core->client->irq && command == CMD_POWER_UP)) {
> >>>> +		if (!wait_event_timeout(core->command,
> >>>> +					atomic_read(&core->cts),
> >>>> +					usecs_to_jiffies(usecs) + 1))
> >>>> +			dev_warn(&core->client->dev,
> >>>> +				 "(%s) Power up took too much time.\n",
> >>>> +				 __func__);
> >>>> +	}
> >>>> +
> >>>> +	/* Then get the response */
> >>>> +	err = si476x_i2c_xfer(core, SI476X_I2C_RECV, resp, respn);
> >>>> +	if (err != respn) {
> >>>> +		dev_err(&core->client->dev,
> >>>> +			"Error while reading response for command 0x%02x\n",
> >>>> +			command);
> >>>> +		err = (err >= 0) ? -EIO : err;
> >>>> +		goto exit;
> >>>> +	}
> >>>> +	DBG_BUFFER(&client->dev, "Response:\n", resp, respn);
> >>>> +
> >>>> +	err = 0;
> >>>> +
> >>>> +	if (resp[0] & SI476X_ERR) {
> >>>> +		dev_err(&core->client->dev, "Chip set error flag\n");
> >>>> +		err = si476x_core_parse_and_nag_about_error(core);
> >>>> +		goto exit;
> >>>> +	}
> >>>> +
> >>>> +	if (!(resp[0] & SI476X_CTS))
> >>>> +		err = -EBUSY;
> >>>> +exit:
> >>>> +	return err;
> >>>> +}
> >>>> +
> >>>> +#define CORE_SEND_COMMAND(core, cmd, args, resp, timeout)		\
> >>>> +	__core_send_command(core, cmd, args,				\
> >>>> +			    ARRAY_SIZE(args),				\
> >>>> +			    resp, ARRAY_SIZE(resp),			\
> >>>> +			    timeout)
> >>>> +
> >>>> +
> >>>> +static int __cmd_tune_seek_freq(struct si476x_core *core,
> >>>> +				uint8_t cmd,
> >>>> +				const uint8_t args[], size_t argn,
> >>>> +				uint8_t *resp, size_t respn,
> >>>> +				int (*clear_stcint) (struct si476x_core *core))
> >>>> +{
> >>>> +	int err;
> >>>> +
> >>>> +	atomic_set(&core->stc, 0);
> >>>> +	err = __core_send_command(core, cmd, args, argn,
> >>>> +				  resp, respn,
> >>>> +				  atomic_read(&core->timeouts.command));
> >>>> +	if (!err) {
> >>> Invert the test to simplify indentation.
> >>>
> >>>> +		if (!wait_event_timeout(core->tuning,
> >>>> +		atomic_read(&core->stc),
> >>>> +		usecs_to_jiffies(atomic_read(&core->timeouts.tune)) + 1)) {
> >>> Weird indentation above. Indent the arguments more to the right.
> >> 80 symbol line length limit is the reason for that indentation.
> > It's not a limit, it's a warning only. Usually readability improves if such
> > long lines are split up or otherwise shortened, but if readability becomes
> > worse because of that, then just leave in the long line.
> >
> >>> Andrey, you should look at the drivers/media/radio/si4713-i2c.c source.
> >>> It is for the same chip family and is much, much smaller.
> >>>
> >>> See if you can use some of the code that's there.
> >> I did when I started writing the driver, that driver and driver for
> >> wl1273 were my two examples. In my initial version of the driver I tried
> >> to blend both si4713 and si476x into one generic driver, but the problem
> >> is: si4713 is a transmitter and si476x are receiver chips, the
> >> "impedance mismatch" in functionality of the two, IMHO, was too much to
> >> justify the unification.
> > But the way the commands are handled, etc. should be the same or very similar.
> > That's the main area where I suspect you can reuse code from those other
> > drivers.
> 
> To reuse the si4713_send_command function from si4713 driver I would
> have to modify the way IRQs are handled by that driver and basically
> replace its code for mine. And the reason for that is because si4761 is
> a receiver, I cannot just rely on timeouts in the case of driver working
> in "no-IRQ" mode(current implementation in si4713 driver). I need a
> polling loop that would allow me to receive RDS and monitor the status
> of the chip. Plus having a polling loop allows me to have almost
> identical implementation of chip events handling for both cases(IRQ and
> no-IRQ). I don't feel comfortable making such drastic changes to si4713
> driver without having access to the actual hardware and being ability to
> test it.
> 
> I really did try to amalgamate two drivers into a single one(and even
> received an earful from my, at that time, supervisor for wasting my time
> on it). But as I mentioned earlier to unite both drivers I would have to
> modify si4713's code and without any actual hardware I cannot do it.

OK, good to know. Thank you for the explanation, and thanks for looking into
this. I'm OK with your approach, although I will take a closer look at the
code handling commands when you post the next version. In a first review I
generally only look at obvious things, in a second review I look more closely
at the code itself. My impression during the first review was that the code
that dealt with the commands could probably be simplified or shortened, but
I didn't look all that closely at it.

Regards,

	Hans

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 0/3] A driver for Si476x series of chips
  2012-09-13 22:40 [PATCH 0/3] A driver for Si476x series of chips Andrey Smirnov
                   ` (2 preceding siblings ...)
  2012-09-13 22:40 ` [PATCH 3/3] Add a codec " Andrey Smirnov
@ 2012-09-25 11:39 ` Mauro Carvalho Chehab
  3 siblings, 0 replies; 13+ messages in thread
From: Mauro Carvalho Chehab @ 2012-09-25 11:39 UTC (permalink / raw)
  To: Andrey Smirnov; +Cc: linux-media, linux-kernel

Hi Andrey,

Em Qui, 2012-09-13 às 15:40 -0700, Andrey Smirnov escreveu:
This patchset contains a driver for a Silicon Laboratories 476x series
> of radio tuners. The driver itself is implemented as an MFD devices
> comprised of three parts:
>  1. Core device that provides all the other devices with basic
>  functionality and locking scheme.
>  2. Radio device that translates between V4L2 subsystem requests into
>  Core device commands.
>  3. Codec device that does similar to the earlier described task, but
>  for ALSA SoC subsystem.
> 
As this driver touches on 3 sub-systems (mfd, media and alsa), you need to copy not only media ML, but also mfd and alsa ones, as you'll need that one of the 3 involved maintainers to submit your patches with the ack of the other two ones, for the parts that are under their umbrella.

As the main functionality here is related to media, I suspect that I'll be the one that will be submitting the driver. So, you'll need to c/c the MFD maintainer for the stuff under drivers/mfd/, and the alsa maintainer, for the stuff under sound/[1].

Regards,
Mauro

[1] From MAINTAINERS file:

MULTIFUNCTION DEVICES (MFD)
M:	Samuel Ortiz <sameo@linux.intel.com>
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git
S:	Supported
F:	drivers/mfd/

SOUND
M:	Jaroslav Kysela <perex@perex.cz>
M:	Takashi Iwai <tiwai@suse.de>
L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
W:	http://www.alsa-project.org/
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
T:	git git://git.alsa-project.org/alsa-kernel.git
S:	Maintained
F:	Documentation/sound/
F:	include/sound/
F:	sound/




> This driver has been tested to work in two different sytems:
>  1. A custom Tegra-based ARM board(design is based on Harmony board)
>  running linux kernel 3.1.10 kernel
>  2. A standalone USB-connected board that has a dedicated Cortex M3
>  working as a transparent USB to I2C bridge which was connected to a
>  off-the-shelf x86-64 laptop running Ubuntu with 3.2.0 kernel.
> 
> As far as SubmitChecklist is concerned following criteria should be
> satisfied: 2b, 3, 5, 7, 9, 10
> 
> Andrey Smirnov (3):
>   Add a core driver for SI476x MFD
>   Add a V4L2 driver for SI476X MFD
>   Add a codec driver for SI476X MFD
> 
>  drivers/media/radio/Kconfig        |   17 +
>  drivers/media/radio/radio-si476x.c | 1307 +++++++++++++++++++++++++++++++
>  drivers/mfd/Kconfig                |   14 +
>  drivers/mfd/Makefile               |    3 +
>  drivers/mfd/si476x-cmd.c           | 1509 ++++++++++++++++++++++++++++++++++++
>  drivers/mfd/si476x-i2c.c           | 1033 ++++++++++++++++++++++++
>  drivers/mfd/si476x-prop.c          |  477 ++++++++++++
>  include/linux/mfd/si476x-core.h    |  532 +++++++++++++
>  include/media/si476x.h             |  461 +++++++++++
>  sound/soc/codecs/Kconfig           |    4 +
>  sound/soc/codecs/Makefile          |    2 +
>  sound/soc/codecs/si476x.c          |  346 +++++++++
>  12 files changed, 5705 insertions(+)
>  create mode 100644 drivers/media/radio/radio-si476x.c
>  create mode 100644 drivers/mfd/si476x-cmd.c
>  create mode 100644 drivers/mfd/si476x-i2c.c
>  create mode 100644 drivers/mfd/si476x-prop.c
>  create mode 100644 include/linux/mfd/si476x-core.h
>  create mode 100644 include/media/si476x.h
>  create mode 100644 sound/soc/codecs/si476x.c
> 
> 

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 1/3] Add a core driver for SI476x MFD
  2012-09-13 22:40 ` [PATCH 1/3] Add a core driver for SI476x MFD Andrey Smirnov
  2012-09-14  6:44   ` Hans Verkuil
@ 2012-10-01 17:20   ` Mark Brown
  1 sibling, 0 replies; 13+ messages in thread
From: Mark Brown @ 2012-10-01 17:20 UTC (permalink / raw)
  To: Andrey Smirnov; +Cc: linux-media, linux-kernel

On Thu, Sep 13, 2012 at 03:40:11PM -0700, Andrey Smirnov wrote:

> +	core = kzalloc(sizeof(*core), GFP_KERNEL);

devm_kzalloc()

> +	if (!core) {
> +		pr_err("si476x-core: failed to allocate " \
> +		       "'struct si476x_core'\n");
> +		return -ENOMEM;
> +	}

Splitting error messages over multiple lines like this just makes things
hard to grep for.

> +	core->supplies.vio1 = regulator_get(&client->dev, "vio1");
> +	if (IS_ERR_OR_NULL(core->supplies.vio1)) {
> +		dev_info(&client->dev, "No vio1 regulator found\n");
> +		core->supplies.vio1 = NULL;
> +	}

This and all the usages of the regulator API in the driver are broken,
the driver should treat failures to get the supplies as errors.  There
are more than enough ways to stub things out in the core.

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 3/3] Add a codec driver for SI476X MFD
  2012-09-13 22:40 ` [PATCH 3/3] Add a codec " Andrey Smirnov
@ 2012-10-01 17:29   ` Mark Brown
  0 siblings, 0 replies; 13+ messages in thread
From: Mark Brown @ 2012-10-01 17:29 UTC (permalink / raw)
  To: Andrey Smirnov; +Cc: linux-media, linux-kernel

On Thu, Sep 13, 2012 at 03:40:13PM -0700, Andrey Smirnov wrote:
> This commit add a sound codec driver for Silicon Laboratories 476x
> series of AM/FM radio chips.

*Always* CC both maintainers and lists on patches.  There's a few
problems here, though none of them terribly substantial.

>  	select SND_SOC_UDA1380 if I2C
>  	select SND_SOC_WL1273 if MFD_WL1273_CORE
> +	select SND_SOC_SI476X if MFD_SI476X_CORE
>  	select SND_SOC_WM1250_EV1 if I2C


Keep the Makefile and Kconfig sorted.

> +struct si476x_codec {
> +	struct si476x_core *core;
> +};

control_data.

> +static int si476x_codec_set_daudio_params(struct snd_soc_codec *codec,
> +					  int width, int rate)
> +{

Just inline this into the one user.

> +	int err;
> +	u16 digital_io_output_format = \
> +		snd_soc_read(codec,
> +			     SI476X_DIGITAL_IO_OUTPUT_FORMAT);

Throughout the driver you're randomly using \ for no visible reason -
don't do that.

> +	if ((rate < 32000) || (rate > 48000)) {
> +		dev_dbg(codec->dev, "Rate: %d is not supported\n", rate);

dev_err.

> +	digital_io_output_format &= SI476X_DIGITAL_IO_OUTPUT_WIDTH_MASK;
> +	digital_io_output_format |= (width << 11) | (width << 8);
> +
> +	return snd_soc_write(codec, SI476X_DIGITAL_IO_OUTPUT_FORMAT,
> +			     digital_io_output_format);

snd_soc_update_bits().

> +static int si476x_codec_volume_get(struct snd_kcontrol *kcontrol,
> +				   struct snd_ctl_elem_value *ucontrol)
> +{
> +	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
> +
> +	ucontrol->value.integer.value[0] =
> +		snd_soc_read(codec, SI476X_AUDIO_VOLUME);
> +	return 0;
> +}

Why are you open coding this?  Looks like a standard register...

> +static int si476x_codec_digital_mute(struct snd_soc_dai *codec_dai, int mute)
> +{
> +	if (mute)
> +		snd_soc_write(codec_dai->codec, SI476X_AUDIO_MUTE, 0x3);
> +
> +	return 0;
> +}

This will never disable the mute once it's been activated; are you sure
this code has been tested?

> +	switch (params_format(params)) {
> +	case SNDRV_PCM_FORMAT_S8:
> +		width = SI476X_PCM_FORMAT_S8;
> +	case SNDRV_PCM_FORMAT_S16_LE:

Missing break;

> +static int si476x_codec_probe(struct snd_soc_codec *codec)
> +{
> +	struct si476x_core **core = codec->dev->platform_data;
> +	struct si476x_codec *si476x;
> +
> +	if (!core) {
> +		dev_err(codec->dev, "Platform data is missing.\n");
> +		return -EINVAL;
> +	}

You should use dev->parent to find the parent rather than use platform
data like this.

> +	si476x = kzalloc(sizeof(*si476x), GFP_KERNEL);
> +	if (si476x == NULL) {

devm_kzalloc(), and this should be in the device level probe (as should
the previous check for the core).  Though as the struct ought to be
empty now this'll presumably go away.

> +static int __init si476x_init(void)
> +{
> +	return platform_driver_register(&si476x_platform_driver);
> +}
> +module_init(si476x_init);

module_platform_driver()

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2012-10-01 17:29 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-13 22:40 [PATCH 0/3] A driver for Si476x series of chips Andrey Smirnov
2012-09-13 22:40 ` [PATCH 1/3] Add a core driver for SI476x MFD Andrey Smirnov
2012-09-14  6:44   ` Hans Verkuil
2012-09-21  1:05     ` andrey.smirnov
2012-09-21  7:31       ` Hans Verkuil
2012-09-21 16:33         ` andrey.smirnov
2012-09-21 16:46           ` Hans Verkuil
2012-10-01 17:20   ` Mark Brown
2012-09-13 22:40 ` [PATCH 2/3] Add a V4L2 driver for SI476X MFD Andrey Smirnov
2012-09-14  7:17   ` Hans Verkuil
2012-09-13 22:40 ` [PATCH 3/3] Add a codec " Andrey Smirnov
2012-10-01 17:29   ` Mark Brown
2012-09-25 11:39 ` [PATCH 0/3] A driver for Si476x series of chips Mauro Carvalho Chehab

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).