diff --git a/packages/linux-drivers/media_build/patches/media_build-02-add-to-backports.patch b/packages/linux-drivers/media_build/patches/media_build-02-add-to-backports.patch index 87e0524391..5321820b79 100644 --- a/packages/linux-drivers/media_build/patches/media_build-02-add-to-backports.patch +++ b/packages/linux-drivers/media_build/patches/media_build-02-add-to-backports.patch @@ -1,15 +1,12 @@ -diff --git a/media_build/backports/backports.txt b/media_build/backports/backports.txt -index 2a6006b..8c7c3de 100644 --- a/media_build/backports/backports.txt +++ b/media_build/backports/backports.txt -@@ -25,6 +25,10 @@ +@@ -25,6 +25,9 @@ add pr_fmt.patch add debug.patch add drx39xxj.patch ++add linux-202-lnbp22_patch_for_more_power_if_rotor.patch +add linux-203-stb0899_enable_low_symbol_rate.patch -+add linux-212-mantis_stb0899_faster_lock.patch +add linux-222-stb0899_signal_quality.patch -+add linux-227-ds3000-invalid-symbol-rate.patch - + [4.8.255] add v4.8_user_pages_flag.patch diff --git a/packages/linux-drivers/media_build/sources/media_build/backports/linux-202-lnbp22_patch_for_more_power_if_rotor.patch b/packages/linux-drivers/media_build/sources/media_build/backports/linux-202-lnbp22_patch_for_more_power_if_rotor.patch index d8111ab0ae..f4d48b9739 100755 --- a/packages/linux-drivers/media_build/sources/media_build/backports/linux-202-lnbp22_patch_for_more_power_if_rotor.patch +++ b/packages/linux-drivers/media_build/sources/media_build/backports/linux-202-lnbp22_patch_for_more_power_if_rotor.patch @@ -6,10 +6,9 @@ and https://github.com/LibreELEC/LibreELEC.tv/pull/1118 tested with TT S2-3650CI and a HH90 rotor -diff -Naur linux-4.9.orig/drivers/media/dvb-frontends/lnbp22.c linux-4.9/drivers/media/dvb-frontends/lnbp22.c ---- linux-4.9.orig/drivers/media/dvb-frontends/lnbp22.c 2017-01-07 18:58:55.306001049 +0100 -+++ linux-4.9/drivers/media/dvb-frontends/lnbp22.c 2017-01-07 19:39:06.204887989 +0100 -@@ -48,47 +48,95 @@ +--- a/drivers/media/dvb-frontends/lnbp22.c ++++ b/drivers/media/dvb-frontends/lnbp22.c +@@ -48,47 +48,95 @@ struct lnbp22 { struct i2c_adapter *i2c; }; @@ -68,7 +67,6 @@ diff -Naur linux-4.9.orig/drivers/media/dvb-frontends/lnbp22.c linux-4.9/drivers - break; - default: - return -EINVAL; -- } + case SEC_VOLTAGE_OFF: + lnbp22->config[3] &= ~LNBP22_EN; + return lnbp22_write_config(fe, lnbp22->config); @@ -105,9 +103,7 @@ diff -Naur linux-4.9.orig/drivers/media/dvb-frontends/lnbp22.c linux-4.9/drivers + return status; + } + while( (config[0] & (1<<2)) && retries-- ); - -- dprintk(1, "%s: 0x%02x)\n", __func__, lnbp22->config[3]); -- return (i2c_transfer(lnbp22->i2c, &msg, 1) == 1) ? 0 : -EIO; ++ + dprintk(1, "%s status=0x%02X\n", __FUNCTION__, config[0]); + + if( retries < 0 ) @@ -115,7 +111,10 @@ diff -Naur linux-4.9.orig/drivers/media/dvb-frontends/lnbp22.c linux-4.9/drivers + + if( config[0] & (1<<3) ) + return -ENOLINK; /* open loop */ -+ } + } +- +- dprintk(1, "%s: 0x%02x)\n", __func__, lnbp22->config[3]); +- return (i2c_transfer(lnbp22->i2c, &msg, 1) == 1) ? 0 : -EIO; + return status; } @@ -131,7 +130,7 @@ diff -Naur linux-4.9.orig/drivers/media/dvb-frontends/lnbp22.c linux-4.9/drivers dprintk(1, "%s: %d\n", __func__, (int)arg); if (arg) -@@ -96,7 +144,7 @@ +@@ -96,7 +144,7 @@ static int lnbp22_enable_high_lnb_voltage(struct dvb_frontend *fe, long arg) else lnbp22->config[3] &= ~LNBP22_LLC; @@ -140,7 +139,7 @@ diff -Naur linux-4.9.orig/drivers/media/dvb-frontends/lnbp22.c linux-4.9/drivers } static void lnbp22_release(struct dvb_frontend *fe) -@@ -118,20 +166,14 @@ +@@ -118,20 +166,14 @@ struct dvb_frontend *lnbp22_attach(struct dvb_frontend *fe, return NULL; /* default configuration */ diff --git a/packages/linux-drivers/media_build/sources/media_build/backports/linux-203-stb0899_enable_low_symbol_rate.patch b/packages/linux-drivers/media_build/sources/media_build/backports/linux-203-stb0899_enable_low_symbol_rate.patch index f302b6ce1b..3624c9fa00 100644 --- a/packages/linux-drivers/media_build/sources/media_build/backports/linux-203-stb0899_enable_low_symbol_rate.patch +++ b/packages/linux-drivers/media_build/sources/media_build/backports/linux-203-stb0899_enable_low_symbol_rate.patch @@ -1,7 +1,6 @@ -diff -Naur linux-3.7.2/drivers/media/dvb-frontends/stb0899_drv.c linux-3.7.2.patch/drivers/media/dvb-frontends/stb0899_drv.c ---- linux-3.7.2/drivers/media/dvb-frontends/stb0899_drv.c 2013-01-11 18:19:28.000000000 +0100 -+++ linux-3.7.2.patch/drivers/media/dvb-frontends/stb0899_drv.c 2013-01-16 10:25:43.479645317 +0100 -@@ -1581,7 +1581,7 @@ +--- a/drivers/media/dvb-frontends/stb0899_drv.c ++++ b/drivers/media/dvb-frontends/stb0899_drv.c +@@ -1618,7 +1618,7 @@ static const struct dvb_frontend_ops stb0899_ops = { .frequency_max = 2150000, .frequency_stepsize = 0, .frequency_tolerance = 0, diff --git a/packages/linux-drivers/media_build/sources/media_build/backports/linux-222-stb0899_signal_quality.patch b/packages/linux-drivers/media_build/sources/media_build/backports/linux-222-stb0899_signal_quality.patch index fd6539d2bf..2e2ab8e6f7 100644 --- a/packages/linux-drivers/media_build/sources/media_build/backports/linux-222-stb0899_signal_quality.patch +++ b/packages/linux-drivers/media_build/sources/media_build/backports/linux-222-stb0899_signal_quality.patch @@ -1,7 +1,6 @@ -diff -Naur linux-3.7.2/drivers/media/dvb-frontends/stb0899_drv.c linux-3.7.2.patch/drivers/media/dvb-frontends/stb0899_drv.c ---- linux-3.7.2/drivers/media/dvb-frontends/stb0899_drv.c 2013-01-11 18:19:28.000000000 +0100 -+++ linux-3.7.2.patch/drivers/media/dvb-frontends/stb0899_drv.c 2013-01-16 10:33:10.323380937 +0100 -@@ -971,6 +971,16 @@ +--- a/drivers/media/dvb-frontends/stb0899_drv.c ++++ b/drivers/media/dvb-frontends/stb0899_drv.c +@@ -976,6 +976,16 @@ static int stb0899_read_signal_strength(struct dvb_frontend *fe, u16 *strength) *strength = stb0899_table_lookup(stb0899_dvbsrf_tab, ARRAY_SIZE(stb0899_dvbsrf_tab) - 1, val); *strength += 750; @@ -18,7 +17,7 @@ diff -Naur linux-3.7.2/drivers/media/dvb-frontends/stb0899_drv.c linux-3.7.2.pat dprintk(state->verbose, FE_DEBUG, 1, "AGCIQVALUE = 0x%02x, C = %d * 0.1 dBm", val & 0xff, *strength); } -@@ -983,6 +993,7 @@ +@@ -988,6 +998,7 @@ static int stb0899_read_signal_strength(struct dvb_frontend *fe, u16 *strength) *strength = stb0899_table_lookup(stb0899_dvbs2rf_tab, ARRAY_SIZE(stb0899_dvbs2rf_tab) - 1, val); *strength += 950; @@ -26,7 +25,7 @@ diff -Naur linux-3.7.2/drivers/media/dvb-frontends/stb0899_drv.c linux-3.7.2.pat dprintk(state->verbose, FE_DEBUG, 1, "IF_AGC_GAIN = 0x%04x, C = %d * 0.1 dBm", val & 0x3fff, *strength); } -@@ -1016,6 +1027,16 @@ +@@ -1021,6 +1032,16 @@ static int stb0899_read_snr(struct dvb_frontend *fe, u16 *snr) val = MAKEWORD16(buf[0], buf[1]); *snr = stb0899_table_lookup(stb0899_cn_tab, ARRAY_SIZE(stb0899_cn_tab) - 1, val); @@ -43,7 +42,7 @@ diff -Naur linux-3.7.2/drivers/media/dvb-frontends/stb0899_drv.c linux-3.7.2.pat dprintk(state->verbose, FE_DEBUG, 1, "NIR = 0x%02x%02x = %u, C/N = %d * 0.1 dBm\n", buf[0], buf[1], val, *snr); } -@@ -1040,6 +1061,16 @@ +@@ -1045,6 +1066,16 @@ static int stb0899_read_snr(struct dvb_frontend *fe, u16 *snr) val = (quantn - estn) / 10; } *snr = val;