From e1b6fd74f2577137d2fa2bb295b17ed76730691a Mon Sep 17 00:00:00 2001 From: himta ram Date: Thu, 30 Jul 2020 13:54:28 +0530 Subject: [PATCH] RTC6226: extend the seek timeout to 15 sec Seek time out is set to 7 sec and when lower Channel Spacing is configured. RTC6226 chip is taking more then 7 sec to scan the whole band range. Set the seek timeout to 15 sec so that scan can be performed within the seek timeout value. Set the Tune time out value to 3 sec. CRs-Fixed: 2744390 Change-Id: Id79f21aaac049b78ec22b8f90c533deac4bc448b Signed-off-by: himta ram --- drivers/media/radio/rtc6226/radio-rtc6226-common.c | 8 ++++---- drivers/media/radio/rtc6226/radio-rtc6226.h | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/media/radio/rtc6226/radio-rtc6226-common.c b/drivers/media/radio/rtc6226/radio-rtc6226-common.c index 072cc59e6942..16b1f4b54d0a 100644 --- a/drivers/media/radio/rtc6226/radio-rtc6226-common.c +++ b/drivers/media/radio/rtc6226/radio-rtc6226-common.c @@ -333,7 +333,7 @@ void rtc6226_scan(struct work_struct *work) goto seek_tune_fail; /* wait for tune to complete. */ if (!wait_for_completion_timeout(&radio->completion, - msecs_to_jiffies(WAIT_TIMEOUT_MSEC))) { + msecs_to_jiffies(TUNE_TIMEOUT_MSEC))) { FMDERR("In %s, didn't receive STC for tune\n", __func__); rtc6226_q_event(radio, RTC6226_EVT_ERROR); return; @@ -360,7 +360,7 @@ void rtc6226_scan(struct work_struct *work) } /* wait for seek to complete */ if (!wait_for_completion_timeout(&radio->completion, - msecs_to_jiffies(WAIT_TIMEOUT_MSEC))) { + msecs_to_jiffies(SEEK_TIMEOUT_MSEC))) { FMDERR("%s:timeout didn't receive STC for seek\n", __func__); rtc6226_get_all_registers(radio); @@ -433,7 +433,7 @@ void rtc6226_scan(struct work_struct *work) goto seek_tune_fail; } if (!wait_for_completion_timeout(&radio->completion, - msecs_to_jiffies(WAIT_TIMEOUT_MSEC))) { + msecs_to_jiffies(SEEK_TIMEOUT_MSEC))) { FMDERR("timeout didn't receive STC for seek\n"); rtc6226_q_event(radio, RTC6226_EVT_ERROR); return; @@ -489,7 +489,7 @@ seek_cancelled: __func__, retval); else { if (!wait_for_completion_timeout(&radio->completion, - msecs_to_jiffies(WAIT_TIMEOUT_MSEC))) + msecs_to_jiffies(TUNE_TIMEOUT_MSEC))) FMDERR("%s: didn't receive STD for tune\n", __func__); else FMDERR("%s: received STD for tune\n", __func__); diff --git a/drivers/media/radio/rtc6226/radio-rtc6226.h b/drivers/media/radio/rtc6226/radio-rtc6226.h index 6b1abd30dbc2..c1e3de812e91 100644 --- a/drivers/media/radio/rtc6226/radio-rtc6226.h +++ b/drivers/media/radio/rtc6226/radio-rtc6226.h @@ -199,7 +199,8 @@ #define SEEK_PENDING 2 #define SCAN_PENDING 3 #define START_SCAN 1 -#define WAIT_TIMEOUT_MSEC 7000 +#define TUNE_TIMEOUT_MSEC 3000 +#define SEEK_TIMEOUT_MSEC 15000 #define RTC6226_MIN_SRCH_MODE 0x00 #define RTC6226_MAX_SRCH_MODE 0x02