1 files changed, 20 insertions, 49 deletions

diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
index cfcc1fe68c5c..4b33143788d6 100644
--- a/drivers/media/video/tuner-xc2028.c
+++ b/drivers/media/video/tuner-xc2028.c
@@ -189,6 +189,26 @@ static int check_firmware(struct i2c_client *c)
         if (xc2028->firm_type & t->std)
                 return 0;
 
+        send_seq (c, {0x12, 0x39});
+        send_seq (c, {0x0c, 0x80, 0xf0, 0xf7, 0x3e, 0x75, 0xc1, 0x8a, 0xe4});
+        send_seq (c, {0x0c, 0x02, 0x00});
+        send_seq (c, {0x05, 0x0f, 0xee, 0xaa, 0x5f, 0xea, 0x90});
+        send_seq (c, {0x06, 0x00, 0x0a, 0x4d, 0x8c, 0xf2, 0xd8, 0xcf, 0x30});
+        send_seq (c, {0x06, 0x79, 0x9f});
+        send_seq (c, {0x0b, 0x0d, 0xa4, 0x6c});
+        send_seq (c, {0x0a, 0x01, 0x67, 0x24, 0x40, 0x08, 0xc3, 0x20, 0x10});
+        send_seq (c, {0x0a, 0x64, 0x3c, 0xfa, 0xf7, 0xe1, 0x0c, 0x2c});
+        send_seq (c, {0x09, 0x0b});
+        send_seq (c, {0x10, 0x13});
+        send_seq (c, {0x16, 0x12});
+        send_seq (c, {0x1f, 0x02});
+        send_seq (c, {0x21, 0x02});
+        send_seq (c, {0x01, 0x02});
+        send_seq (c, {0x2b, 0x10});
+        send_seq (c, {0x02, 0x02});
+        send_seq (c, {0x02, 0x03});
+        send_seq (c, {0x00, 0x8c});
+
         if (t->std & V4L2_STD_MN)
                 name=firmware_MN;
         else
@@ -249,55 +269,6 @@ static void set_tv_freq(struct i2c_client *c, unsigned int freq)
         }
         msleep(10);
 
-        send_seq (c, {0x12, 0x39});
-        send_seq (c, {0x0c, 0x80, 0xf0, 0xf7, 0x3e, 0x75, 0xc1, 0x8a, 0xe4});
-        send_seq (c, {0x0c, 0x02, 0x00});
-        send_seq (c, {0x05, 0x0f, 0xee, 0xaa, 0x5f, 0xea, 0x90});
-        send_seq (c, {0x06, 0x00, 0x0a, 0x4d, 0x8c, 0xf2, 0xd8, 0xcf, 0x30});
-        send_seq (c, {0x06, 0x79, 0x9f});
-        send_seq (c, {0x0b, 0x0d, 0xa4, 0x6c});
-        send_seq (c, {0x0a, 0x01, 0x67, 0x24, 0x40, 0x08, 0xc3, 0x20, 0x10});
-        send_seq (c, {0x0a, 0x64, 0x3c, 0xfa, 0xf7, 0xe1, 0x0c, 0x2c});
-        send_seq (c, {0x09, 0x0b});
-        send_seq (c, {0x10, 0x13});
-        send_seq (c, {0x16, 0x12});
-        send_seq (c, {0x1f, 0x02});
-        send_seq (c, {0x21, 0x02});
-        send_seq (c, {0x01, 0x02});
-        send_seq (c, {0x2b, 0x10});
-        send_seq (c, {0x02, 0x02});
-        send_seq (c, {0x02, 0x03});
-        send_seq (c, {0x00, 0x8c});
-
-        send_seq (c, {0x00, 0x01, 0x00, 0x00});
-        send_seq (c, {0x00, 0xcc, 0x20, 0x06});
-        send_seq (c, {0x2b, 0x1a});
-        send_seq (c, {0x2b, 0x1b});
-        send_seq (c, {0x14, 0x01, 0x1b, 0x19, 0xb5, 0x29, 0xab, 0x09, 0x55});
-        send_seq (c, {0x14, 0x44, 0x05, 0x65});
-        send_seq (c, {0x13, 0x18, 0x08, 0x00, 0x00, 0x6c, 0x18, 0x16, 0x8c});
-        send_seq (c, {0x13, 0x49, 0x2a, 0xab});
-        send_seq (c, {0x0d, 0x01, 0x4b, 0x03, 0x97, 0x55, 0xc7, 0xd7, 0x00});
-        send_seq (c, {0x0d, 0xa1, 0xeb, 0x8f, 0x5c});
-        send_seq (c, {0x1a, 0x00, 0x00, 0x16, 0x8a, 0x40, 0x00, 0x00, 0x00, 0x20});
-        send_seq (c, {0x2d, 0x01});
-        send_seq (c, {0x18, 0x00});
-        send_seq (c, {0x1b, 0x0d, 0x86, 0x51, 0xd2, 0x35, 0xa4, 0x92, 0xa5});
-        send_seq (c, {0x1b, 0xb5, 0x25, 0x65});
-        send_seq (c, {0x1d, 0x00});
-        send_seq (c, {0x0f, 0x00, 0x29, 0x56, 0xb0, 0x00, 0xb6});
-        send_seq (c, {0x20, 0x00});
-        send_seq (c, {0x1e, 0x09, 0x02, 0x5b, 0x6c, 0x00, 0x4b, 0x81, 0x56});
-        send_seq (c, {0x1e, 0x46, 0x69, 0x0b});
-        send_seq (c, {0x22, 0x32});
-        send_seq (c, {0x23, 0x0a});
-        send_seq (c, {0x25, 0x00, 0x09, 0x90, 0x09, 0x06, 0x64, 0x02, 0x41});
-        send_seq (c, {0x26, 0xcc});
-        send_seq (c, {0x29, 0x40});
-        send_seq (c, {0x21, 0x03});
-        send_seq (c, {0x00, 0x8c});
-        send_seq (c, {0x00, 0x00, 0x00, 0x00});
-
         /* CMD= Set frequency */
         send_seq(c, {0x00, 0x02, 0x00, 0x00});
         if (t->tuner_callback) {