V4L/DVB (13352): stv090x: fixes errors and typos in register definitions

Signed-off-by: Andreas Regel <andreas.regel@gmx.de>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 34 insertions, 36 deletions

diff --git a/drivers/media/dvb/frontends/stv090x_reg.h b/drivers/media/dvb/frontends/stv090x_reg.h
index 57b6abbbd32d..2502855dd784 100644
--- a/drivers/media/dvb/frontends/stv090x_reg.h
+++ b/drivers/media/dvb/frontends/stv090x_reg.h
@@ -44,7 +44,7 @@
 #define STV090x_OFFST_OUTSERRS2_HZ_FIELD        5
 #define STV090x_WIDTH_OUTSERRS2_HZ_FIELD        1
 #define STV090x_OFFST_OUTSERRS3_HZ_FIELD        4
-#define STV090x_WIDTH_OUTPARRS3_HZ_FIELD        1
+#define STV090x_WIDTH_OUTSERRS3_HZ_FIELD        1
 #define STV090x_OFFST_OUTPARRS3_HZ_FIELD        3
 #define STV090x_WIDTH_OUTPARRS3_HZ_FIELD        1
 
@@ -113,24 +113,24 @@
 #define STV090x_IRQMASK3                        0xf124
 #define STV090x_OFFST_MPLL_LOCK_FIELD           5
 #define STV090x_WIDTH_MPLL_LOCK_FIELD           1
-#define STV090x_OFFST_MSTREAM_LCK_3_FIELD       2
-#define STV090x_WIDTH_MSTREAM_LCK_3_FIELD       3
-#define STV090x_OFFST_MSTREAM_LCK_2_FIELD       2
-#define STV090x_WIDTH_MSTREAM_LCK_2_FIELD       3
+#define STV090x_OFFST_MSTREAM_LCK_3_FIELD       4
+#define STV090x_WIDTH_MSTREAM_LCK_3_FIELD       1
+#define STV090x_OFFST_MSTREAM_LCK_2_FIELD       3
+#define STV090x_WIDTH_MSTREAM_LCK_2_FIELD       1
 #define STV090x_OFFST_MSTREAM_LCK_1_FIELD       2
-#define STV090x_WIDTH_MSTREAM_LCK_1_FIELD       3
+#define STV090x_WIDTH_MSTREAM_LCK_1_FIELD       1
 #define STV090x_OFFST_MDVBS1_PRF_2_FIELD        1
 #define STV090x_WIDTH_MDVBS1_PRF_2_FIELD        1
 #define STV090x_OFFST_MDVBS1_PRF_1_FIELD        0
 #define STV090x_WIDTH_MDVBS1_PRF_1_FIELD        1
 
 #define STV090x_IRQMASK2                        0xf125
-#define STV090x_OFFST_MSPY_ENDSIM_3_FIELD       5
-#define STV090x_WIDTH_MSPY_ENDSIM_3_FIELD       3
-#define STV090x_OFFST_MSPY_ENDSIM_2_FIELD       5
-#define STV090x_WIDTH_MSPY_ENDSIM_2_FIELD       3
+#define STV090x_OFFST_MSPY_ENDSIM_3_FIELD       7
+#define STV090x_WIDTH_MSPY_ENDSIM_3_FIELD       1
+#define STV090x_OFFST_MSPY_ENDSIM_2_FIELD       6
+#define STV090x_WIDTH_MSPY_ENDSIM_2_FIELD       1
 #define STV090x_OFFST_MSPY_ENDSIM_1_FIELD       5
-#define STV090x_WIDTH_MSPY_ENDSIM_1_FIELD       3
+#define STV090x_WIDTH_MSPY_ENDSIM_1_FIELD       1
 #define STV090x_OFFST_MPKTDEL_ERROR_2_FIELD     4
 #define STV090x_WIDTH_MPKTDEL_ERROR_2_FIELD     1
 #define STV090x_OFFST_MPKTDEL_LOCKB_2_FIELD     3
@@ -370,7 +370,7 @@
 #define STV090x_OFFST_SELX1RATIO_FIELD          5
 #define STV090x_WIDTH_SELX1RATIO_FIELD          1
 #define STV090x_OFFST_STOP_PLL_FIELD            3
-#define STV090x_WIDTH_SELX1RATIO_FIELD          1
+#define STV090x_WIDTH_STOP_PLL_FIELD            1
 #define STV090x_OFFST_BYPASSPLLFSK_FIELD        2
 #define STV090x_WIDTH_BYPASSPLLFSK_FIELD        1
 #define STV090x_OFFST_SELOSCI_FIELD             1
@@ -616,7 +616,7 @@
 #define STV090x_OFFST_Px_CONT_TONE_FIELD        4
 #define STV090x_WIDTH_Px_CONT_TONE_FIELD        1
 #define STV090x_OFFST_Px_FIFO_4BREADY_FIELD     3
-#define STV090x_WIDTH_Px_FIFO_4BREADY_FIELD     2
+#define STV090x_WIDTH_Px_FIFO_4BREADY_FIELD     1
 #define STV090x_OFFST_Px_FIFO_EMPTY_FIELD       2
 #define STV090x_WIDTH_Px_FIFO_EMPTY_FIELD       1
 #define STV090x_OFFST_Px_ABORT_DISRX_FIELD      0
@@ -847,12 +847,10 @@
 #define STV090x_WIDTH_Px_DVBS2_ENABLE_FIELD     1
 #define STV090x_OFFST_Px_DVBS1_ENABLE_FIELD     6
 #define STV090x_WIDTH_Px_DVBS1_ENABLE_FIELD     1
-#define STV090x_OFFST_Px_CFR_AUTOSCAN_FIELD     5 /* check */
-#define STV090x_WIDTH_Px_CFR_AUTOSCAN_FIELD     1
-#define STV090x_OFFST_Px_SCAN_ENABLE_FIELD      4 /* check */
+#define STV090x_OFFST_Px_SCAN_ENABLE_FIELD      4
 #define STV090x_WIDTH_Px_SCAN_ENABLE_FIELD      1
-#define STV090x_OFFST_Px_TUN_AUTOSCAN_FIELD     3
-#define STV090x_WIDTH_Px_TUN_AUTOSCAN_FIELD     1
+#define STV090x_OFFST_Px_CFR_AUTOSCAN_FIELD     3
+#define STV090x_WIDTH_Px_CFR_AUTOSCAN_FIELD     1
 #define STV090x_OFFST_Px_NOFORCE_RELOCK_FIELD   2
 #define STV090x_WIDTH_Px_NOFORCE_RELOCK_FIELD   1
 #define STV090x_OFFST_Px_TUN_RNG_FIELD          0
@@ -885,7 +883,7 @@
 #define STV090x_P2_DMDFLYW                      STV090x_Px_DMDFLYW(2)
 #define STV090x_OFFST_Px_I2C_IRQVAL_FIELD       4
 #define STV090x_WIDTH_Px_I2C_IRQVAL_FIELD       4
-#define STV090x_OFFST_Px_FLYWHEEL_CPT_FIELD     0 /* check */
+#define STV090x_OFFST_Px_FLYWHEEL_CPT_FIELD     0
 #define STV090x_WIDTH_Px_FLYWHEEL_CPT_FIELD     4
 
 #define STV090x_Px_DSTATUS3(__x)                (0xF41D - (__x - 1) * 0x200)
@@ -1048,12 +1046,12 @@
 #define STV090x_P1_CFRINC1                      STV090x_Px_CFRINC1(1)
 #define STV090x_P2_CFRINC1                      STV090x_Px_CFRINC1(2)
 #define STV090x_OFFST_Px_CFR_INC1_FIELD         0
-#define STV090x_WIDTH_Px_CFR_INC1_FIELD         7
+#define STV090x_WIDTH_Px_CFR_INC1_FIELD         7 /* check */
 
 #define STV090x_Px_CFRINC0(__x)                 (0xF44B - (__x - 1) * 0x200)
 #define STV090x_P1_CFRINC0                      STV090x_Px_CFRINC0(1)
 #define STV090x_P2_CFRINC0                      STV090x_Px_CFRINC0(2)
-#define STV090x_OFFST_Px_CFR_INC0_FIELD         4
+#define STV090x_OFFST_Px_CFR_INC0_FIELD         4 /* check */
 #define STV090x_WIDTH_Px_CFR_INC0_FIELD         4
 
 #define STV090x_Pn_CFRy(__x, __y)               (0xF44E - (__x - 1) * 0x200 - __y * 0x1)
@@ -1145,14 +1143,14 @@
 #define STV090x_Px_SFRINIT1(__x)                (0xF45E - (__x - 1) * 0x200)
 #define STV090x_P1_SFRINIT1                     STV090x_Px_SFRINIT1(1)
 #define STV090x_P2_SFRINIT1                     STV090x_Px_SFRINIT1(2)
-#define STV090x_OFFST_Px_SFR_INIT_FIELD         0
-#define STV090x_WIDTH_Px_SFR_INIT_FIELD         8
+#define STV090x_OFFST_Px_SFR_INIT1_FIELD        0
+#define STV090x_WIDTH_Px_SFR_INIT1_FIELD        7
 
 #define STV090x_Px_SFRINIT0(__x)                (0xF45F - (__x - 1) * 0x200)
 #define STV090x_P1_SFRINIT0                     STV090x_Px_SFRINIT0(1)
 #define STV090x_P2_SFRINIT0                     STV090x_Px_SFRINIT0(2)
-#define STV090x_OFFST_Px_SFR_INIT_FIELD         0
-#define STV090x_WIDTH_Px_SFR_INIT_FIELD         8
+#define STV090x_OFFST_Px_SFR_INIT0_FIELD        0
+#define STV090x_WIDTH_Px_SFR_INIT0_FIELD        8
 
 #define STV090x_Px_SFRUP1(__x)                  (0xF460 - (__x - 1) * 0x200)
 #define STV090x_P1_SFRUP1                       STV090x_Px_SFRUP1(1)
@@ -1178,7 +1176,7 @@
 #define STV090x_OFFST_Px_SYMB_FREQ_LOW0_FIELD   0
 #define STV090x_WIDTH_Px_SYMB_FREQ_LOW0_FIELD   8
 
-#define STV090x_Px_SFRy(__x, __y)               (0xF464 - (__x-1) * 0x200 + (3 - __y))
+#define STV090x_Px_SFRy(__x, __y)               (0xF467 - (__x-1) * 0x200 - __y)
 #define STV090x_P1_SFR0                         STV090x_Px_SFRy(1, 0)
 #define STV090x_P1_SFR1                         STV090x_Px_SFRy(1, 1)
 #define STV090x_P1_SFR2                         STV090x_Px_SFRy(1, 2)
@@ -1188,7 +1186,7 @@
 #define STV090x_P2_SFR2                         STV090x_Px_SFRy(2, 2)
 #define STV090x_P2_SFR3                         STV090x_Px_SFRy(2, 3)
 #define STV090x_OFFST_Px_SYMB_FREQ_FIELD        0
-#define STV090x_WIDTH_Px_SYMB_FREQ_FIELD        32
+#define STV090x_WIDTH_Px_SYMB_FREQ_FIELD        8
 
 #define STV090x_Px_TMGREG2(__x)                 (0xF468 - (__x - 1) * 0x200)
 #define STV090x_P1_TMGREG2                      STV090x_Px_TMGREG2(1)
@@ -1198,7 +1196,7 @@
 
 #define STV090x_Px_TMGREG1(__x)                 (0xF469 - (__x - 1) * 0x200)
 #define STV090x_P1_TMGREG1                      STV090x_Px_TMGREG1(1)
-#define STV090x_P2_TMGREG1                              STV090x_Px_TMGREG1(2)
+#define STV090x_P2_TMGREG1                      STV090x_Px_TMGREG1(2)
 #define STV090x_OFFST_Px_TMGREG_FIELD           0
 #define STV090x_WIDTH_Px_TMGREG_FIELD           8
 
@@ -1230,7 +1228,7 @@
 #define STV090x_OFFST_Px_MU_EQUALDFE_FIELD      0
 #define STV090x_WIDTH_Px_MU_EQUALDFE_FIELD      3
 
-#define STV090x_Px_EQUAIy(__x, __y)             (0xf470 - (__x - 1) * 0x200 + (__y - 1))
+#define STV090x_Px_EQUAIy(__x, __y)     (0xf470 - (__x-1) * 0x200 + 2 * (__y-1))
 #define STV090x_P1_EQUAI1                       STV090x_Px_EQUAIy(1, 1)
 #define STV090x_P1_EQUAI2                       STV090x_Px_EQUAIy(1, 2)
 #define STV090x_P1_EQUAI3                       STV090x_Px_EQUAIy(1, 3)
@@ -1251,7 +1249,7 @@
 #define STV090x_OFFST_Px_EQUA_ACCIy_FIELD       0
 #define STV090x_WIDTH_Px_EQUA_ACCIy_FIELD       8
 
-#define STV090x_Px_EQUAQy(__x, __y)             (0xf471 - (__x - 1) * 0x200 + (__y - 1))
+#define STV090x_Px_EQUAQy(__x, __y)     (0xf471 - (__x-1) * 0x200 + 2 * (__y-1))
 #define STV090x_P1_EQUAQ1                       STV090x_Px_EQUAQy(1, 1)
 #define STV090x_P1_EQUAQ2                       STV090x_Px_EQUAQy(1, 2)
 #define STV090x_P1_EQUAQ3                       STV090x_Px_EQUAQy(1, 3)
@@ -1390,7 +1388,7 @@
 #define STV090x_OFFST_Px_CAR2S2_16A_ALPH_E_FIELD        0
 #define STV090x_WIDTH_Px_CAR2S2_16A_ALPH_E_FIELD        4
 
-#define STV090x_Px_ACLC2S232A(__x)              (0xf499 - (__x - 1) * 0x200)
+#define STV090x_Px_ACLC2S232A(__x)              (0xf49A - (__x - 1) * 0x200)
 #define STV090x_P1_ACLC2S232A                   STV090x_Px_ACLC2S232A(1)
 #define STV090x_P2_ACLC2S232A                   STV090x_Px_ACLC2S232A(2)
 #define STV090x_OFFST_Px_CAR2S2_32A_ALPH_M_FIELD        4
@@ -1414,7 +1412,7 @@
 #define STV090x_OFFST_Px_CAR2S2_8_BETA_E_FIELD  0
 #define STV090x_WIDTH_Px_CAR2S2_8_BETA_E_FIELD  4
 
-#define STV090x_Px_BCLC2S216A(__x)              (0xf49d - (__x - 1) * 0x200)
+#define STV090x_Px_BCLC2S216A(__x)              (0xf49e - (__x - 1) * 0x200)
 #define STV090x_P1_BCLC2S216A                   STV090x_Px_BCLC2S216A(1)
 #define STV090x_P2_BCLC2S216A                   STV090x_Px_BCLC2S216A(1)
 #define STV090x_OFFST_Px_CAR2S2_16A_BETA_M_FIELD        4
@@ -1422,7 +1420,7 @@
 #define STV090x_OFFST_Px_CAR2S2_16A_BETA_E_FIELD        0
 #define STV090x_WIDTH_Px_CAR2S2_16A_BETA_E_FIELD        4
 
-#define STV090x_Px_BCLC2S232A(__x)              (0xf49d - (__x - 1) * 0x200)
+#define STV090x_Px_BCLC2S232A(__x)              (0xf49f - (__x - 1) * 0x200)
 #define STV090x_P1_BCLC2S232A                   STV090x_Px_BCLC2S232A(1)
 #define STV090x_P2_BCLC2S232A                   STV090x_Px_BCLC2S232A(1)
 #define STV090x_OFFST_Px_CAR2S2_32A_BETA_M_FIELD        4
@@ -1458,7 +1456,7 @@
 #define STV090x_P1_MODCODLST1                   STV090x_Px_MODCODLST1(1)
 #define STV090x_P2_MODCODLST1                   STV090x_Px_MODCODLST1(2)
 #define STV090x_OFFST_Px_DIS_MODCOD29_FIELD     4
-#define STV090x_WIDTH_Px_DIS_MODCOD29T_FIELD    4
+#define STV090x_WIDTH_Px_DIS_MODCOD29_FIELD     4
 #define STV090x_OFFST_Px_DIS_32PSK_9_10_FIELD   0
 #define STV090x_WIDTH_Px_DIS_32PSK_9_10_FIELD   4
 
@@ -2180,7 +2178,7 @@
 #define STV090x_WIDTH_Px_TSFIFOSPEED_STORE_FIELD        1
 #define STV090x_OFFST_Px_DILXX_RESET_FIELD              5
 #define STV090x_WIDTH_Px_DILXX_RESET_FIELD              1
-#define STV090x_OFFST_Px_TSSERIAL_IMPOS_FIELD           5
+#define STV090x_OFFST_Px_TSSERIAL_IMPOS_FIELD           4
 #define STV090x_WIDTH_Px_TSSERIAL_IMPOS_FIELD           1
 #define STV090x_OFFST_Px_SCRAMBDETECT_FIELD             1
 #define STV090x_WIDTH_Px_SCRAMBDETECT_FIELD             1
@@ -2190,7 +2188,7 @@
 #define STV090x_P1_TSBITRATE1                           STV090x_Px_TSBITRATEy(1, 1)
 #define STV090x_P2_TSBITRATE0                           STV090x_Px_TSBITRATEy(2, 0)
 #define STV090x_P2_TSBITRATE1                           STV090x_Px_TSBITRATEy(2, 1)
-#define STV090x_OFFST_Px_TSFIFO_BITRATE_FIELD           7
+#define STV090x_OFFST_Px_TSFIFO_BITRATE_FIELD           0
 #define STV090x_WIDTH_Px_TSFIFO_BITRATE_FIELD           8
 
 #define STV090x_Px_ERRCTRL1(__x)                        (0xF598 - (__x - 1) * 0x200)