mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-23 05:18:55 +00:00
150ac0c2af
AR-1 - Adding support category for distributions AR-4 - Remove Allwinner legacy AR-5 - Drop Udoo family and move Udoo board into newly created imx6 family AR-9 - Rename sunxi-next to sunxi-legacy AR-10 - Rename sunxi-dev to sunxi-current AR-11 - Adding Radxa Rockpi S support AR-13 - Rename rockchip64-default to rockchip64-legacy AR-14 - Add rockchip64-current as mainline source AR-15 - Drop Rockchip 4.19.y NEXT, current become 5.3.y AR-16 - Rename RK3399 default to legacy AR-17 - Rename Odroid XU4 next and default to legacy 4.14.y, add DEV 5.4.y AR-18 - Add Odroid N2 current mainline AR-19 - Move Odroid C1 to meson family AR-20 - Rename mvebu64-default to mvebu64-legacy AR-21 - Rename mvebu-default to mvebu-legacy AR-22 - Rename mvebu-next to mvebu-current AR-23 - Drop meson64 default and next, current becomes former DEV 5.3.y AR-24 - Drop cubox family and move Cubox/Hummingboard boards under imx6 AR-26 - Adjust motd AR-27 - Enabling distribution release status AR-28 - Added new GCC compilers AR-29 - Implementing Ubuntu Eoan AR-30 - Add desktop packages per board or family AR-31 - Remove (Ubuntu/Debian) distribution name from image filename AR-32 - Move arch configs from configuration.sh to separate arm64 and armhf config files AR-33 - Revision numbers for beta builds changed to day_in_the_year AR-34 - Patches support linked patches AR-35 - Break meson64 family into gxbb and gxl AR-36 - Add Nanopineo2 Black AR-38 - Upgrade option from old branches to new one via armbian-config AR-41 - Show full timezone info AR-43 - Merge Odroid N2 to meson64 AR-44 - Enable FORCE_BOOTSCRIPT_UPDATE for all builds
94 lines
3.2 KiB
Diff
94 lines
3.2 KiB
Diff
Some devices require a higher TS clock frequency to demodulate some
|
|
muxes. This adds two optional parameters to control the TS clock
|
|
frequency mode as well as the frequency.
|
|
|
|
Signed-off-by: Thomas Hollstegge <thomas.hollstegge@gmail.com>
|
|
---
|
|
drivers/media/dvb-frontends/si2168.c | 20 +++++++++++++++++++-
|
|
drivers/media/dvb-frontends/si2168.h | 8 ++++++++
|
|
drivers/media/dvb-frontends/si2168_priv.h | 2 ++
|
|
3 files changed, 29 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c
|
|
index 324493e..b05e677 100644
|
|
--- a/drivers/media/dvb-frontends/si2168.c
|
|
+++ b/drivers/media/dvb-frontends/si2168.c
|
|
@@ -92,13 +92,15 @@ static int si2168_ts_bus_ctrl(struct dvb_frontend *fe, int acquire)
|
|
dev_dbg(&client->dev, "%s acquire: %d\n", __func__, acquire);
|
|
|
|
/* set TS_MODE property */
|
|
- memcpy(cmd.args, "\x14\x00\x01\x10\x10\x00", 6);
|
|
+ memcpy(cmd.args, "\x14\x00\x01\x10\x00\x00", 6);
|
|
if (acquire)
|
|
cmd.args[4] |= dev->ts_mode;
|
|
else
|
|
cmd.args[4] |= SI2168_TS_TRISTATE;
|
|
if (dev->ts_clock_gapped)
|
|
cmd.args[4] |= 0x40;
|
|
+ cmd.args[4] |= (dev->ts_clock_mode & 0x03) << 4;
|
|
+
|
|
cmd.wlen = 6;
|
|
cmd.rlen = 4;
|
|
ret = si2168_cmd_execute(client, &cmd);
|
|
@@ -398,6 +400,18 @@ static int si2168_set_frontend(struct dvb_frontend *fe)
|
|
if (ret)
|
|
goto err;
|
|
|
|
+ /* set TS frequency */
|
|
+ if (dev->ts_clock_freq) {
|
|
+ memcpy(cmd.args, "\x14\x00\x0d\x10", 4);
|
|
+ cmd.args[4] = ((dev->ts_clock_freq / 10000) >> 0) & 0xff;
|
|
+ cmd.args[5] = ((dev->ts_clock_freq / 10000) >> 8) & 0xff;
|
|
+ cmd.wlen = 6;
|
|
+ cmd.rlen = 4;
|
|
+ ret = si2168_cmd_execute(client, &cmd);
|
|
+ if (ret)
|
|
+ goto err;
|
|
+ }
|
|
+
|
|
memcpy(cmd.args, "\x14\x00\x08\x10\xd7\x05", 6);
|
|
cmd.args[5] |= dev->ts_clock_inv ? 0x00 : 0x10;
|
|
cmd.wlen = 6;
|
|
@@ -806,6 +820,10 @@ static int si2168_probe(struct i2c_client *client,
|
|
dev->ts_mode = config->ts_mode;
|
|
dev->ts_clock_inv = config->ts_clock_inv;
|
|
dev->ts_clock_gapped = config->ts_clock_gapped;
|
|
+ dev->ts_clock_mode = config->ts_clock_mode;
|
|
+ if (dev->ts_clock_mode == 0)
|
|
+ dev->ts_clock_mode = SI2168_TS_CLOCK_MODE_AUTO_ADAPT;
|
|
+ dev->ts_clock_freq = config->ts_clock_freq;
|
|
dev->spectral_inversion = config->spectral_inversion;
|
|
|
|
dev_info(&client->dev, "Silicon Labs Si2168-%c%d%d successfully identified\n",
|
|
diff --git a/drivers/media/dvb-frontends/si2168.h b/drivers/media/dvb-frontends/si2168.h
|
|
index d519edd..3f52ee8 100644
|
|
--- a/drivers/media/dvb-frontends/si2168.h
|
|
+++ b/drivers/media/dvb-frontends/si2168.h
|
|
@@ -47,6 +47,14 @@ struct si2168_config {
|
|
/* TS clock gapped */
|
|
bool ts_clock_gapped;
|
|
|
|
+ /* TS clock mode */
|
|
+#define SI2168_TS_CLOCK_MODE_AUTO_ADAPT 0x01
|
|
+#define SI2168_TS_CLOCK_MODE_MANUAL 0x02
|
|
+ u8 ts_clock_mode;
|
|
+
|
|
+ /* TS clock frequency (for manual mode) */
|
|
+ u32 ts_clock_freq;
|
|
+
|
|
/* Inverted spectrum */
|
|
bool spectral_inversion;
|
|
};
|
|
diff --git a/drivers/media/dvb-frontends/si2168_priv.h b/drivers/media/dvb-frontends/si2168_priv.h
|
|
index 2d362e1..8173d6c 100644
|
|
--- a/drivers/media/dvb-frontends/si2168_priv.h
|
|
+++ b/drivers/media/dvb-frontends/si2168_priv.h
|
|
@@ -48,6 +48,8 @@ struct si2168_dev {
|
|
u8 ts_mode;
|
|
bool ts_clock_inv;
|
|
bool ts_clock_gapped;
|
|
+ u8 ts_clock_mode;
|
|
+ u32 ts_clock_freq;
|
|
bool spectral_inversion;
|
|
};
|
|
|