From a9c36cbccb0040bb2b24daa9eefd509e1684f277 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 18 Sep 2012 18:28:50 +0200 Subject: [PATCH] linux: update to linux-3.5.3 Signed-off-by: Stephan Raue --- packages/linux/meta | 2 +- ...h => linux-3.5.3-003-no_dev_console.patch} | 0 ....3-004_lower_undefined_mode_timeout.patch} | 0 ...atch => linux-3.5.3-006_enable_utf8.patch} | 0 ...h => linux-3.5.3-007_die_floppy_die.patch} | 0 ...09_disable_i8042_check_on_apple_mac.patch} | 0 ...nux-3.5.3-053-spinelplus-remote-0.1.patch} | 0 ...1056c5564eec8a1b169c6e84ff3.5.34c13.patch} | 0 ....5.3-071-silence_i915_agp-module-0.1.patch | 12 ++ ...-203-stb0899_enable_low_symbol_rate.patch} | 0 ...add_Formosa_eHome_Infrared_Receiver.patch} | 0 ...3.5.3-212-mantis_stb0899_faster_lock.patch | 141 ++++++++++++++++++ 12 files changed, 154 insertions(+), 1 deletion(-) rename packages/linux/patches/{linux-3.5.2-003-no_dev_console.patch => linux-3.5.3-003-no_dev_console.patch} (100%) rename packages/linux/patches/{linux-3.5.2-004_lower_undefined_mode_timeout.patch => linux-3.5.3-004_lower_undefined_mode_timeout.patch} (100%) rename packages/linux/patches/{linux-3.5.2-006_enable_utf8.patch => linux-3.5.3-006_enable_utf8.patch} (100%) rename packages/linux/patches/{linux-3.5.2-007_die_floppy_die.patch => linux-3.5.3-007_die_floppy_die.patch} (100%) rename packages/linux/patches/{linux-3.5.2-009_disable_i8042_check_on_apple_mac.patch => linux-3.5.3-009_disable_i8042_check_on_apple_mac.patch} (100%) rename packages/linux/patches/{linux-3.5.2-053-spinelplus-remote-0.1.patch => linux-3.5.3-053-spinelplus-remote-0.1.patch} (100%) rename packages/linux/patches/{linux-3.5.2-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.5.24c13.patch => linux-3.5.3-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.5.34c13.patch} (100%) create mode 100644 packages/linux/patches/linux-3.5.3-071-silence_i915_agp-module-0.1.patch rename packages/linux/patches/{linux-3.5.2-203-stb0899_enable_low_symbol_rate.patch => linux-3.5.3-203-stb0899_enable_low_symbol_rate.patch} (100%) rename packages/linux/patches/{linux-3.5.2-204-add_Formosa_eHome_Infrared_Receiver.patch => linux-3.5.3-204-add_Formosa_eHome_Infrared_Receiver.patch} (100%) create mode 100644 packages/linux/patches/linux-3.5.3-212-mantis_stb0899_faster_lock.patch diff --git a/packages/linux/meta b/packages/linux/meta index 9e77318ee6..4969eb937f 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="linux" -PKG_VERSION="3.5.2" +PKG_VERSION="3.5.3" if [ "$LINUX" = "3.2" ]; then PKG_VERSION="3.2.28" fi diff --git a/packages/linux/patches/linux-3.5.2-003-no_dev_console.patch b/packages/linux/patches/linux-3.5.3-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/linux-3.5.2-003-no_dev_console.patch rename to packages/linux/patches/linux-3.5.3-003-no_dev_console.patch diff --git a/packages/linux/patches/linux-3.5.2-004_lower_undefined_mode_timeout.patch b/packages/linux/patches/linux-3.5.3-004_lower_undefined_mode_timeout.patch similarity index 100% rename from packages/linux/patches/linux-3.5.2-004_lower_undefined_mode_timeout.patch rename to packages/linux/patches/linux-3.5.3-004_lower_undefined_mode_timeout.patch diff --git a/packages/linux/patches/linux-3.5.2-006_enable_utf8.patch b/packages/linux/patches/linux-3.5.3-006_enable_utf8.patch similarity index 100% rename from packages/linux/patches/linux-3.5.2-006_enable_utf8.patch rename to packages/linux/patches/linux-3.5.3-006_enable_utf8.patch diff --git a/packages/linux/patches/linux-3.5.2-007_die_floppy_die.patch b/packages/linux/patches/linux-3.5.3-007_die_floppy_die.patch similarity index 100% rename from packages/linux/patches/linux-3.5.2-007_die_floppy_die.patch rename to packages/linux/patches/linux-3.5.3-007_die_floppy_die.patch diff --git a/packages/linux/patches/linux-3.5.2-009_disable_i8042_check_on_apple_mac.patch b/packages/linux/patches/linux-3.5.3-009_disable_i8042_check_on_apple_mac.patch similarity index 100% rename from packages/linux/patches/linux-3.5.2-009_disable_i8042_check_on_apple_mac.patch rename to packages/linux/patches/linux-3.5.3-009_disable_i8042_check_on_apple_mac.patch diff --git a/packages/linux/patches/linux-3.5.2-053-spinelplus-remote-0.1.patch b/packages/linux/patches/linux-3.5.3-053-spinelplus-remote-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.5.2-053-spinelplus-remote-0.1.patch rename to packages/linux/patches/linux-3.5.3-053-spinelplus-remote-0.1.patch diff --git a/packages/linux/patches/linux-3.5.2-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.5.24c13.patch b/packages/linux/patches/linux-3.5.3-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.5.34c13.patch similarity index 100% rename from packages/linux/patches/linux-3.5.2-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.5.24c13.patch rename to packages/linux/patches/linux-3.5.3-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.5.34c13.patch diff --git a/packages/linux/patches/linux-3.5.3-071-silence_i915_agp-module-0.1.patch b/packages/linux/patches/linux-3.5.3-071-silence_i915_agp-module-0.1.patch new file mode 100644 index 0000000000..81bbc8c362 --- /dev/null +++ b/packages/linux/patches/linux-3.5.3-071-silence_i915_agp-module-0.1.patch @@ -0,0 +1,12 @@ +diff -Naur linux-2.6.39-rc5/drivers/gpu/drm/i915/i915_drv.c linux-2.6.39-rc5.patch/drivers/gpu/drm/i915/i915_drv.c +--- linux-2.6.39-rc5/drivers/gpu/drm/i915/i915_drv.c 2011-04-27 05:48:50.000000000 +0200 ++++ linux-2.6.39-rc5.patch/drivers/gpu/drm/i915/i915_drv.c 2011-04-29 02:51:28.773622809 +0200 +@@ -760,7 +760,7 @@ + static int __init i915_init(void) + { + if (!intel_agp_enabled) { +- DRM_ERROR("drm/i915 can't work without intel_agp module!\n"); ++ DRM_INFO("drm/i915 can't work without intel_agp module!\n"); + return -ENODEV; + } + diff --git a/packages/linux/patches/linux-3.5.2-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/linux-3.5.3-203-stb0899_enable_low_symbol_rate.patch similarity index 100% rename from packages/linux/patches/linux-3.5.2-203-stb0899_enable_low_symbol_rate.patch rename to packages/linux/patches/linux-3.5.3-203-stb0899_enable_low_symbol_rate.patch diff --git a/packages/linux/patches/linux-3.5.2-204-add_Formosa_eHome_Infrared_Receiver.patch b/packages/linux/patches/linux-3.5.3-204-add_Formosa_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/linux-3.5.2-204-add_Formosa_eHome_Infrared_Receiver.patch rename to packages/linux/patches/linux-3.5.3-204-add_Formosa_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/linux-3.5.3-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/linux-3.5.3-212-mantis_stb0899_faster_lock.patch new file mode 100644 index 0000000000..23e28aea88 --- /dev/null +++ b/packages/linux/patches/linux-3.5.3-212-mantis_stb0899_faster_lock.patch @@ -0,0 +1,141 @@ +diff --git a/drivers/media/dvb/frontends/stb0899_algo.c b/drivers/media/dvb/frontends/stb0899_algo.c +index 2da55ec..3efde1e 100644 +--- a/drivers/media/dvb/frontends/stb0899_algo.c ++++ b/drivers/media/dvb/frontends/stb0899_algo.c +@@ -206,7 +206,6 @@ static enum stb0899_status stb0899_check_tmg(struct stb0899_state *state) + static enum stb0899_status stb0899_search_tmg(struct stb0899_state *state) + { + struct stb0899_internal *internal = &state->internal; +- struct stb0899_params *params = &state->params; + + short int derot_step, derot_freq = 0, derot_limit, next_loop = 3; + int index = 0; +@@ -216,10 +215,9 @@ static enum stb0899_status stb0899_search_tmg(struct stb0899_state *state) + + /* timing loop computation & symbol rate optimisation */ + derot_limit = (internal->sub_range / 2L) / internal->mclk; +- derot_step = (params->srate / 2L) / internal->mclk; ++ derot_step = internal->derot_step * 4; /* dertot_step = decreasing delta */ + + while ((stb0899_check_tmg(state) != TIMINGOK) && next_loop) { +- index++; + derot_freq += index * internal->direction * derot_step; /* next derot zig zag position */ + + if (abs(derot_freq) > derot_limit) +@@ -230,6 +228,7 @@ static enum stb0899_status stb0899_search_tmg(struct stb0899_state *state) + STB0899_SETFIELD_VAL(CFRL, cfr[1], LSB(state->config->inversion * derot_freq)); + stb0899_write_regs(state, STB0899_CFRM, cfr, 2); /* derotator frequency */ + } ++ index++; + internal->direction = -internal->direction; /* Change zigzag direction */ + } + +@@ -278,14 +277,18 @@ static enum stb0899_status stb0899_search_carrier(struct stb0899_state *state) + { + struct stb0899_internal *internal = &state->internal; + +- short int derot_freq = 0, last_derot_freq = 0, derot_limit, next_loop = 3; ++ short int derot_freq = 0, last_derot_freq = 0, derot_limit, derot_step, next_loop = 3; + int index = 0; ++ int base_freq; + u8 cfr[2]; + u8 reg; + + internal->status = NOCARRIER; + derot_limit = (internal->sub_range / 2L) / internal->mclk; + derot_freq = internal->derot_freq; ++ derot_step = internal->derot_step * 2; ++ last_derot_freq = internal->derot_freq; ++ base_freq = internal->derot_freq; + + reg = stb0899_read_reg(state, STB0899_CFD); + STB0899_SETFIELD_VAL(CFD_ON, reg, 1); +@@ -294,11 +297,10 @@ static enum stb0899_status stb0899_search_carrier(struct stb0899_state *state) + do { + dprintk(state->verbose, FE_DEBUG, 1, "Derot Freq=%d, mclk=%d", derot_freq, internal->mclk); + if (stb0899_check_carrier(state) == NOCARRIER) { +- index++; + last_derot_freq = derot_freq; +- derot_freq += index * internal->direction * internal->derot_step; /* next zig zag derotator position */ ++ derot_freq += index * internal->direction * derot_step; /* next zig zag derotator position */ + +- if(abs(derot_freq) > derot_limit) ++ if (derot_freq > base_freq + derot_limit || derot_freq < base_freq - derot_limit) + next_loop--; + + if (next_loop) { +@@ -310,9 +312,10 @@ static enum stb0899_status stb0899_search_carrier(struct stb0899_state *state) + STB0899_SETFIELD_VAL(CFRL, cfr[1], LSB(state->config->inversion * derot_freq)); + stb0899_write_regs(state, STB0899_CFRM, cfr, 2); /* derotator frequency */ + } ++ index++; ++ internal->direction = -internal->direction; /* Change zigzag direction */ + } + +- internal->direction = -internal->direction; /* Change zigzag direction */ + } while ((internal->status != CARRIEROK) && next_loop); + + if (internal->status == CARRIEROK) { +@@ -338,6 +341,7 @@ static enum stb0899_status stb0899_check_data(struct stb0899_state *state) + int lock = 0, index = 0, dataTime = 500, loop; + u8 reg; + ++ msleep(1); + internal->status = NODATA; + + /* RESET FEC */ +@@ -348,6 +352,7 @@ static enum stb0899_status stb0899_check_data(struct stb0899_state *state) + reg = stb0899_read_reg(state, STB0899_TSTRES); + STB0899_SETFIELD_VAL(FRESACS, reg, 0); + stb0899_write_reg(state, STB0899_TSTRES, reg); ++ msleep(1); + + if (params->srate <= 2000000) + dataTime = 2000; +@@ -360,6 +365,7 @@ static enum stb0899_status stb0899_check_data(struct stb0899_state *state) + + stb0899_write_reg(state, STB0899_DSTATUS2, 0x00); /* force search loop */ + while (1) { ++ msleep(1); // Alex: added 1 mSec + /* WARNING! VIT LOCKED has to be tested before VIT_END_LOOOP */ + reg = stb0899_read_reg(state, STB0899_VSTATUS); + lock = STB0899_GETFIELD(VSTATUS_LOCKEDVIT, reg); +@@ -387,20 +393,21 @@ static enum stb0899_status stb0899_search_data(struct stb0899_state *state) + short int derot_freq, derot_step, derot_limit, next_loop = 3; + u8 cfr[2]; + u8 reg; +- int index = 1; ++ int index = 0; ++ int base_freq; + + struct stb0899_internal *internal = &state->internal; +- struct stb0899_params *params = &state->params; + +- derot_step = (params->srate / 4L) / internal->mclk; ++ derot_step = internal->derot_step; + derot_limit = (internal->sub_range / 2L) / internal->mclk; + derot_freq = internal->derot_freq; ++ base_freq = internal->derot_freq; + + do { + if ((internal->status != CARRIEROK) || (stb0899_check_data(state) != DATAOK)) { + + derot_freq += index * internal->direction * derot_step; /* next zig zag derotator position */ +- if (abs(derot_freq) > derot_limit) ++ if (derot_freq > base_freq + derot_limit || derot_freq < base_freq - derot_limit) + next_loop--; + + if (next_loop) { +@@ -414,9 +421,9 @@ static enum stb0899_status stb0899_search_data(struct stb0899_state *state) + stb0899_write_regs(state, STB0899_CFRM, cfr, 2); /* derotator frequency */ + + stb0899_check_carrier(state); +- index++; + } + } ++ index++; + internal->direction = -internal->direction; /* change zig zag direction */ + } while ((internal->status != DATAOK) && next_loop); + +-- +1.7.1