V4L/DVB (9744): em28xx: cleanup XCLK register usage

Convert over to setting the XCLK register usage with the new em28xx_write_reg()
function.

Thanks to Ray Lu from Empia for providing the em2860/2880 datasheet.

Signed-off-by: Devin Heitmueller <devin.heitmueller@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 5751b66..f3f8469 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1396,7 +1396,9 @@ void em28xx_pre_card_setup(struct em28xx *dev)
        case EM2882_BOARD_PINNACLE_HYBRID_PRO:
        case EM2883_BOARD_KWORLD_HYBRID_A316:
        case EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600:
-               em28xx_write_regs(dev, EM28XX_R0F_XCLK,    "\x27", 1);
+               em28xx_write_reg(dev, EM28XX_R0F_XCLK,
+                                EM28XX_XCLK_IR_RC5_MODE |
+                                EM28XX_XCLK_FREQUENCY_12MHZ);
                em28xx_write_reg(dev, EM28XX_R06_I2C_CLK,
                                 EM28XX_I2C_CLK_WAIT_ENABLE |
                                 EM28XX_I2C_FREQ_100_KHZ);
@@ -1410,7 +1412,9 @@ void em28xx_pre_card_setup(struct em28xx *dev)
                break;
 
        case EM2882_BOARD_TERRATEC_HYBRID_XS:
-               em28xx_write_regs(dev, EM28XX_R0F_XCLK,    "\x27", 1);
+               em28xx_write_reg(dev, EM28XX_R0F_XCLK,
+                                EM28XX_XCLK_IR_RC5_MODE |
+                                EM28XX_XCLK_FREQUENCY_12MHZ);
                em28xx_write_reg(dev, EM28XX_R06_I2C_CLK,
                                 EM28XX_I2C_CLK_WAIT_ENABLE |
                                 EM28XX_I2C_FREQ_100_KHZ);
@@ -1432,7 +1436,9 @@ void em28xx_pre_card_setup(struct em28xx *dev)
        case EM2880_BOARD_KWORLD_DVB_310U:
        case EM2870_BOARD_KWORLD_350U:
        case EM2881_BOARD_DNT_DA2_HYBRID:
-               em28xx_write_regs(dev, EM28XX_R0F_XCLK,    "\x27", 1);
+               em28xx_write_reg(dev, EM28XX_R0F_XCLK,
+                                EM28XX_XCLK_IR_RC5_MODE |
+                                EM28XX_XCLK_FREQUENCY_12MHZ);
                em28xx_write_reg(dev, EM28XX_R06_I2C_CLK,
                                 EM28XX_I2C_CLK_WAIT_ENABLE |
                                 EM28XX_I2C_FREQ_100_KHZ);
@@ -1451,7 +1457,9 @@ void em28xx_pre_card_setup(struct em28xx *dev)
 
        case EM2880_BOARD_MSI_DIGIVOX_AD:
        case EM2880_BOARD_MSI_DIGIVOX_AD_II:
-               em28xx_write_regs(dev, EM28XX_R0F_XCLK,    "\x27", 1);
+               em28xx_write_reg(dev, EM28XX_R0F_XCLK,
+                                EM28XX_XCLK_IR_RC5_MODE |
+                                EM28XX_XCLK_FREQUENCY_12MHZ);
                em28xx_write_reg(dev, EM28XX_R06_I2C_CLK,
                                 EM28XX_I2C_CLK_WAIT_ENABLE |
                                 EM28XX_I2C_FREQ_100_KHZ);
@@ -1466,11 +1474,14 @@ void em28xx_pre_card_setup(struct em28xx *dev)
 
        case EM2750_BOARD_UNKNOWN:
        case EM2750_BOARD_DLCW_130:
-               em28xx_write_regs(dev, EM28XX_R0F_XCLK, "\x0a", 1);
+               em28xx_write_reg(dev, EM28XX_R0F_XCLK,
+                                EM28XX_XCLK_FREQUENCY_48MHZ);
                break;
 
        case EM2861_BOARD_PLEXTOR_PX_TV100U:
-               em28xx_write_regs(dev, EM28XX_R0F_XCLK, "\x27", 1);
+               em28xx_write_reg(dev, EM28XX_R0F_XCLK,
+                                EM28XX_XCLK_IR_RC5_MODE |
+                                EM28XX_XCLK_FREQUENCY_12MHZ);
                em28xx_write_reg(dev, EM28XX_R06_I2C_CLK,
                                 EM28XX_I2C_CLK_WAIT_ENABLE |
                                 EM28XX_I2C_FREQ_100_KHZ);
@@ -1481,7 +1492,9 @@ void em28xx_pre_card_setup(struct em28xx *dev)
 
        case EM2861_BOARD_KWORLD_PVRTV_300U:
        case EM2880_BOARD_KWORLD_DVB_305U:
-               em28xx_write_regs(dev, EM28XX_R0F_XCLK, "\x27", 1);
+               em28xx_write_reg(dev, EM28XX_R0F_XCLK,
+                                EM28XX_XCLK_IR_RC5_MODE |
+                                EM28XX_XCLK_FREQUENCY_12MHZ);
                em28xx_write_reg(dev, EM28XX_R06_I2C_CLK,
                                 EM28XX_I2C_CLK_WAIT_ENABLE |
                                 EM28XX_I2C_FREQ_100_KHZ);
@@ -1493,7 +1506,9 @@ void em28xx_pre_card_setup(struct em28xx *dev)
                break;
 
        case EM2870_BOARD_KWORLD_355U:
-               em28xx_write_regs(dev, EM28XX_R0F_XCLK, "\x27", 1);
+               em28xx_write_reg(dev, EM28XX_R0F_XCLK,
+                                EM28XX_XCLK_IR_RC5_MODE |
+                                EM28XX_XCLK_FREQUENCY_12MHZ);
                em28xx_write_reg(dev, EM28XX_R06_I2C_CLK,
                                 EM28XX_I2C_CLK_WAIT_ENABLE |
                                 EM28XX_I2C_FREQ_100_KHZ);
@@ -1504,7 +1519,9 @@ void em28xx_pre_card_setup(struct em28xx *dev)
                break;
 
        case EM2870_BOARD_COMPRO_VIDEOMATE:
-               em28xx_write_regs(dev, EM28XX_R0F_XCLK, "\x27", 1);
+               em28xx_write_reg(dev, EM28XX_R0F_XCLK,
+                                EM28XX_XCLK_IR_RC5_MODE |
+                                EM28XX_XCLK_FREQUENCY_12MHZ);
                em28xx_write_reg(dev, EM28XX_R06_I2C_CLK,
                                 EM28XX_I2C_CLK_WAIT_ENABLE |
                                 EM28XX_I2C_FREQ_100_KHZ);
@@ -1525,7 +1542,9 @@ void em28xx_pre_card_setup(struct em28xx *dev)
                break;
 
        case EM2870_BOARD_TERRATEC_XS_MT2060:
-               em28xx_write_regs(dev, EM28XX_R0F_XCLK, "\x27", 1);
+               em28xx_write_reg(dev, EM28XX_R0F_XCLK,
+                                EM28XX_XCLK_IR_RC5_MODE |
+                                EM28XX_XCLK_FREQUENCY_12MHZ);
                em28xx_write_reg(dev, EM28XX_R06_I2C_CLK,
                                 EM28XX_I2C_CLK_WAIT_ENABLE |
                                 EM28XX_I2C_FREQ_100_KHZ);
@@ -1553,12 +1572,17 @@ void em28xx_pre_card_setup(struct em28xx *dev)
                em28xx_write_regs(dev, 0x08, "\xfe", 1);
                mdelay(70);
                /* switch em2880 rc protocol */
-               em28xx_write_regs(dev, EM28XX_R0F_XCLK, "\x22", 1);
+               /* djh - I have serious doubts this is right... */
+               em28xx_write_reg(dev, EM28XX_R0F_XCLK,
+                                EM28XX_XCLK_IR_RC5_MODE |
+                                EM28XX_XCLK_FREQUENCY_10MHZ);
                /* should be added ir_codes here */
                break;
 
        case EM2820_BOARD_GADMEI_UTV310:
-               em28xx_write_regs(dev, EM28XX_R0F_XCLK, "\x27", 1);
+               em28xx_write_reg(dev, EM28XX_R0F_XCLK,
+                                EM28XX_XCLK_IR_RC5_MODE |
+                                EM28XX_XCLK_FREQUENCY_12MHZ);
                em28xx_write_reg(dev, EM28XX_R06_I2C_CLK,
                                 EM28XX_I2C_CLK_WAIT_ENABLE |
                                 EM28XX_I2C_FREQ_100_KHZ);
@@ -1567,8 +1591,9 @@ void em28xx_pre_card_setup(struct em28xx *dev)
                break;
 
        case EM2860_BOARD_GADMEI_UTV330:
-               /* Turn on IR */
-               em28xx_write_regs(dev, EM28XX_R0F_XCLK, "\x07", 1);
+               em28xx_write_reg(dev, EM28XX_R0F_XCLK,
+                                EM28XX_XCLK_IR_RC5_MODE |
+                                EM28XX_XCLK_FREQUENCY_12MHZ);
                em28xx_write_reg(dev, EM28XX_R06_I2C_CLK,
                                 EM28XX_I2C_CLK_WAIT_ENABLE |
                                 EM28XX_I2C_FREQ_100_KHZ);
@@ -1576,7 +1601,9 @@ void em28xx_pre_card_setup(struct em28xx *dev)
                break;
 
        case EM2820_BOARD_MSI_VOX_USB_2:
-               em28xx_write_regs(dev, EM28XX_R0F_XCLK, "\x27", 1);
+               em28xx_write_reg(dev, EM28XX_R0F_XCLK,
+                                EM28XX_XCLK_IR_RC5_MODE |
+                                EM28XX_XCLK_FREQUENCY_12MHZ);
                em28xx_write_reg(dev, EM28XX_R06_I2C_CLK,
                                 EM28XX_I2C_CLK_WAIT_ENABLE |
                                 EM28XX_I2C_FREQ_100_KHZ);

diff --git a/drivers/media/video/em28xx/em28xx-reg.h b/drivers/media/video/em28xx/em28xx-reg.h
index 98e9505..45d588c 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-reg.h
+++ b/drivers/media/video/em28xx/em28xx-reg.h
@@ -51,6 +51,24 @@
 #define EM28XX_R0E_AUDIOSRC    0x0e
 #define EM28XX_R0F_XCLK        0x0f
 
+/* em28xx XCLK Register (0x0f) */
+#define EM28XX_XCLK_AUDIO_UNMUTE       0x80 /* otherwise audio muted */
+#define EM28XX_XCLK_I2S_MSB_TIMING     0x40 /* otherwise standard timing */
+#define EM28XX_XCLK_IR_RC5_MODE                0x20 /* otherwise NEC mode */
+#define EM28XX_XCLK_IR_NEC_CHK_PARITY  0x10
+#define EM28XX_XCLK_FREQUENCY_30MHZ    0x00 /* Freq. select (bits [3-0]) */
+#define EM28XX_XCLK_FREQUENCY_15MHZ    0x01
+#define EM28XX_XCLK_FREQUENCY_10MHZ    0x02
+#define EM28XX_XCLK_FREQUENCY_7_5MHZ   0x03
+#define EM28XX_XCLK_FREQUENCY_6MHZ     0x04
+#define EM28XX_XCLK_FREQUENCY_5MHZ     0x05
+#define EM28XX_XCLK_FREQUENCY_4_3MHZ   0x06
+#define EM28XX_XCLK_FREQUENCY_12MHZ    0x07
+#define EM28XX_XCLK_FREQUENCY_20MHZ    0x08
+#define EM28XX_XCLK_FREQUENCY_20MHZ_2  0x09
+#define EM28XX_XCLK_FREQUENCY_48MHZ    0x0a
+#define EM28XX_XCLK_FREQUENCY_24MHZ    0x0b
+
 #define EM28XX_R10_VINMODE     0x10
 #define EM28XX_R11_VINCTRL     0x11
 #define EM28XX_R12_VINENABLE   0x12    /* */