[RAMEN9610-20040][9609] media: radio: Sync p branch update

Change-Id: I61ccfb5d760fa1d3fbb3adc2800347a08380238e
Signed-off-by: Yunsu Kim <iamyunsu.kim@samsung.com>

diff --git a/drivers/media/radio/s610/fm_low.c b/drivers/media/radio/s610/fm_low.c
index 5fd70f4bdc1273576f2502af2cfb9ab5c4e354e7..c56298ab81b62e8279ac72dde1caab89cc4eeaa5 100755 (executable)
--- a/drivers/media/radio/s610/fm_low.c
+++ b/drivers/media/radio/s610/fm_low.c
@@ -250,8 +250,8 @@ static bool is_freq_in_spur(int freq, u32 *freq_array, int max_freq) {
        return FALSE;
 }
 
-#define AGC_CONFIG_WBRSSI_DISABLE      0x10D1
-#define AGC_CONFIG_WBRSSI_ENABLE       0x105F
+#define AGC_CONFIG_WBRSSI_DISABLE      0x20D1
+#define AGC_CONFIG_WBRSSI_ENABLE       0x201F
 
 void enable_agc_config_wbrssi(struct s610_radio *radio, bool onoff)
 {

diff --git a/drivers/media/radio/s610/radio-s610.c b/drivers/media/radio/s610/radio-s610.c
index c86c45bf4b580f1127c8be084d96cd961d2b9341..9436058a58cd3e17bea33566526c58e669887770 100755 (executable)
--- a/drivers/media/radio/s610/radio-s610.c
+++ b/drivers/media/radio/s610/radio-s610.c
@@ -1450,7 +1450,14 @@ static int s610_radio_s_ctrl(struct v4l2_ctrl *ctrl)
                        __func__, ctrl->val,  ret);
                break;
        case V4L2_CID_S610_REG_RW:
-               fmspeedy_set_reg(radio->speedy_reg_addr, (u32)ctrl->val);
+               if ((radio->speedy_reg_addr >= 0xFFF210)
+                               && (radio->speedy_reg_addr <= 0xFFF3DF))
+                       fmspeedy_set_reg(radio->speedy_reg_addr, (u32)ctrl->val);
+               else
+                       dev_err(radio->v4l2dev.dev,
+                               "%s(), V4L2_CID_S610_REG_RW, skip addr:0x%xh\n",
+                                       __func__, radio->speedy_reg_addr);
+
                FDEBUG(radio, "%s(), REG_RW  val:0x%xh, ret : %d\n",
                        __func__, ctrl->val, ret);
                break;

diff --git a/drivers/media/radio/s610/radio-s610.h b/drivers/media/radio/s610/radio-s610.h
index 008927ac58ed355ff8bd859e026f6efdefdf207c..8e9a715642cf6a9073381b4e911786ffdcb447d2 100755 (executable)
--- a/drivers/media/radio/s610/radio-s610.h
+++ b/drivers/media/radio/s610/radio-s610.h
@@ -11,7 +11,7 @@
 /*#undef       ENABLE_IF_WORK_QUEUE*/
 
 #define        USE_FM_LNA_ENABLE
-/*#undef       USE_FM_LNA_ENABLE*/
+#undef USE_FM_LNA_ENABLE
 
 #define        RDS_POLLING_ENABLE