From: Gon Solo <gonsolo@gmail.com>
To: mchehab+samsung@kernel.org
Cc: linux-media@vger.kernel.org, mchehab@infradead.org, jp@jpvw.nl,
crope@iki.fi, sean@mess.org, linux-kernel@vger.kernel.org,
Gon Solo <gonsolo@gmail.com>
Subject: [PATCH 2/4] si2157: Add option for not downloading firmware.
Date: Thu, 10 Oct 2019 11:51:01 +0200 [thread overview]
Message-ID: <20191010095103.3803-3-gonsolo@gmail.com> (raw)
In-Reply-To: <20191010091848.GA2898@Limone>
While at it, convert to kernel-doc format and use bits instead of bools.
Signed-off-by: Gon Solo <gonsolo@gmail.com>
---
drivers/media/tuners/si2157.c | 6 ++++++
drivers/media/tuners/si2157.h | 33 +++++++++++++++++-------------
drivers/media/tuners/si2157_priv.h | 5 +++--
3 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c
index e87040d6eca7..898e0f9f8b70 100644
--- a/drivers/media/tuners/si2157.c
+++ b/drivers/media/tuners/si2157.c
@@ -118,6 +118,11 @@ static int si2157_init(struct dvb_frontend *fe)
goto err;
}
+ if (dev->dont_load_firmware) {
+ dev_info(&client->dev, "device is buggy, skipping firmware download\n");
+ goto skip_fw_download;
+ }
+
/* query chip revision */
memcpy(cmd.args, "\x02", 1);
cmd.wlen = 1;
@@ -440,6 +445,7 @@ static int si2157_probe(struct i2c_client *client,
i2c_set_clientdata(client, dev);
dev->fe = cfg->fe;
dev->inversion = cfg->inversion;
+ dev->dont_load_firmware = cfg->dont_load_firmware;
dev->if_port = cfg->if_port;
dev->chiptype = (u8)id->driver_data;
dev->if_frequency = 5000000; /* default value of property 0x0706 */
diff --git a/drivers/media/tuners/si2157.h b/drivers/media/tuners/si2157.h
index c22ca784f43f..ffdece3c2eaa 100644
--- a/drivers/media/tuners/si2157.h
+++ b/drivers/media/tuners/si2157.h
@@ -11,29 +11,34 @@
#include <media/media-device.h>
#include <media/dvb_frontend.h>
-/*
- * I2C address
- * 0x60
+/**
+ * struct si2157_config - configuration parameters for si2157
+ *
+ * @fe:
+ * frontend returned by driver
+ * @mdev:
+ * media device returned by driver
+ * @inversion:
+ * spectral inversion
+ * @dont_load_firmware:
+ * Instead of uploading a new firmware, use the existing one
+ * @if_port:
+ * Port selection
+ * Select the RF interface to use (pins 9+11 or 12+13)
+ *
+ * Note:
+ * The I2C address of this demod is 0x60.
*/
struct si2157_config {
- /*
- * frontend
- */
struct dvb_frontend *fe;
#if defined(CONFIG_MEDIA_CONTROLLER)
struct media_device *mdev;
#endif
- /*
- * Spectral Inversion
- */
- bool inversion;
+ unsigned int inversion:1;
+ unsigned int dont_load_firmware:1;
- /*
- * Port selection
- * Select the RF interface to use (pins 9+11 or 12+13)
- */
u8 if_port;
};
diff --git a/drivers/media/tuners/si2157_priv.h b/drivers/media/tuners/si2157_priv.h
index 2bda903358da..778f81b39996 100644
--- a/drivers/media/tuners/si2157_priv.h
+++ b/drivers/media/tuners/si2157_priv.h
@@ -23,8 +23,9 @@ enum si2157_pads {
struct si2157_dev {
struct mutex i2c_mutex;
struct dvb_frontend *fe;
- bool active;
- bool inversion;
+ unsigned int active:1;
+ unsigned int inversion:1;
+ unsigned int dont_load_firmware:1;
u8 chiptype;
u8 if_port;
u32 if_frequency;
--
2.20.1
next prev parent reply other threads:[~2019-10-10 9:51 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-30 10:32 DVB-T2 Stick Gonsolo
2019-02-19 21:30 ` Sean Young
2019-10-01 22:19 ` Gonsolo
2019-10-01 23:52 ` Mauro Carvalho Chehab
2019-10-02 14:13 ` [PATCH] si2157: Add support for Logilink VG0022A Gon Solo
2019-10-02 14:13 ` Gon Solo
2019-10-02 14:27 ` Sean Young
2019-10-02 14:44 ` Gonsolo
2019-10-02 15:06 ` Sean Young
2019-10-02 15:21 ` Gonsolo
2019-10-02 17:23 ` JP
2019-10-02 18:49 ` Mauro Carvalho Chehab
2019-10-03 8:06 ` [PATCH 0/1] Testing timing patch " Gon Solo
2019-10-03 8:06 ` [PATCH 1/1] Test Mauros timing patch Gon Solo
2019-10-03 10:13 ` [PATCH] si2157: Add support for Logilink VG0022A Gonsolo
2019-10-03 10:57 ` Gonsolo
2019-10-03 11:17 ` Mauro Carvalho Chehab
2019-10-03 11:41 ` Gonsolo
2019-10-03 12:49 ` Mauro Carvalho Chehab
2019-10-03 12:52 ` Mauro Carvalho Chehab
2019-10-03 13:02 ` Gon Solo
2019-10-03 13:53 ` Gonsolo
2019-10-03 14:05 ` Mauro Carvalho Chehab
2019-10-03 14:29 ` Gonsolo
2019-10-03 12:01 ` Gon Solo
2019-10-03 12:12 ` Mauro Carvalho Chehab
2019-10-03 12:20 ` Gon Solo
2019-10-03 12:45 ` [PATCH 0/3] " Gon Solo
2019-10-03 12:45 ` [PATCH 1/3] [PATCH] af9035: Better explain how i2c bus speed is computed Gon Solo
2019-10-03 12:45 ` [PATCH 2/3] [PATCH] s2157: Handle bogus chip version Gon Solo
2019-10-03 12:45 ` [PATCH 3/3] [PATCH] af9035: Add Logilink VG0022A id Gon Solo
2019-10-03 11:05 ` [PATCH] si2157: Add support for Logilink VG0022A Mauro Carvalho Chehab
2019-10-03 15:00 ` Gonsolo
2019-10-03 15:02 ` Mauro Carvalho Chehab
2019-10-03 15:17 ` Gonsolo
2019-10-03 16:03 ` Gon Solo
2019-10-03 16:09 ` Mauro Carvalho Chehab
2019-10-03 16:23 ` Gon Solo
2019-10-03 17:42 ` Mauro Carvalho Chehab
2019-10-03 17:49 ` Gonsolo
2019-10-03 18:32 ` Gon Solo
2019-10-03 18:42 ` JP
2019-10-03 18:50 ` Gonsolo
2019-10-03 18:53 ` Gonsolo
2019-10-03 19:19 ` Gonsolo
2019-10-03 19:39 ` Mauro Carvalho Chehab
2019-10-03 19:44 ` Mauro Carvalho Chehab
2019-10-03 19:51 ` Gonsolo
2019-10-03 20:03 ` Mauro Carvalho Chehab
2019-10-03 20:32 ` Gonsolo
2019-10-04 11:50 ` JP
2019-10-04 12:08 ` Mauro Carvalho Chehab
2019-10-04 13:15 ` [PATCH 1/4] media: si2168: use bits instead of bool for flags Mauro Carvalho Chehab
2019-10-04 13:15 ` [PATCH 2/4] media: si2168: add support for not loading a firmware Mauro Carvalho Chehab
2019-10-04 13:15 ` [PATCH 3/4] media: af9035: add support for Logilink VG0022A Mauro Carvalho Chehab
2019-10-09 21:44 ` Gon Solo
2019-10-09 22:04 ` Gon Solo
2019-10-10 8:23 ` Gon Solo
2019-10-10 9:18 ` Gon Solo
2019-10-10 9:50 ` [PATCH 0/4] Add " Gon Solo
2019-10-10 10:10 ` Mauro Carvalho Chehab
2019-10-10 9:51 ` [PATCH 1/4] si2168: Use bits and convert to kernel-doc format Gon Solo
2019-10-10 9:51 ` Gon Solo [this message]
2019-10-10 9:51 ` [PATCH 3/4] af9035: Make speed computation clear Gon Solo
2019-10-10 9:51 ` [PATCH 4/4] Add support for Logilink VG0022A Gon Solo
2019-10-10 11:44 ` Gon Solo
2019-11-15 18:06 ` Gon Solo
2019-10-04 13:15 ` [PATCH 4/4] media: af9035: add the formula used for the I2C speed Mauro Carvalho Chehab
2019-10-10 10:55 ` [PATCH 1/4] media: si2168: use bits instead of bool for flags Gon Solo
2019-10-10 11:34 ` Mauro Carvalho Chehab
2019-10-10 11:42 ` Mauro Carvalho Chehab
2019-10-04 13:50 ` [PATCH] si2157: Add support for Logilink VG0022A JP
2019-10-04 14:16 ` Mauro Carvalho Chehab
2019-10-03 19:40 ` Gonsolo
2019-10-03 19:52 ` Mauro Carvalho Chehab
2019-10-03 19:57 ` Gonsolo
2019-10-02 15:00 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191010095103.3803-3-gonsolo@gmail.com \
--to=gonsolo@gmail.com \
--cc=crope@iki.fi \
--cc=jp@jpvw.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab+samsung@kernel.org \
--cc=mchehab@infradead.org \
--cc=sean@mess.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).