]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - drivers/media/i2c/saa7115.c
[media] saa7115: Implement i2c_board_info.platform_data
[karo-tx-linux.git] / drivers / media / i2c / saa7115.c
index 7fd766ec64c8d5059f01e593dd52c6479ccc21dd..5cc48f751b3acb364095e922b469d81c90826980 100644 (file)
@@ -225,19 +225,59 @@ static const unsigned char saa7111_init[] = {
        0x00, 0x00
 };
 
-/* SAA7113/GM7113C init codes
- * It's important that R_14... R_17 == 0x00
- * for the gm7113c chip to deliver stable video
- */
+/* This table has one illegal value, and some values that are not
+   correct according to the datasheet initialization table.
+
+   If you need a table with legal/default values tell the driver in
+   i2c_board_info.platform_data, and you will get the gm7113c_init
+   table instead. */
+
+/* SAA7113 Init codes */
 static const unsigned char saa7113_init[] = {
        R_01_INC_DELAY, 0x08,
        R_02_INPUT_CNTL_1, 0xc2,
        R_03_INPUT_CNTL_2, 0x30,
        R_04_INPUT_CNTL_3, 0x00,
        R_05_INPUT_CNTL_4, 0x00,
-       R_06_H_SYNC_START, 0x89,
+       R_06_H_SYNC_START, 0x89,        /* Illegal value -119,
+                                        * min. value = -108 (0x94) */
+       R_07_H_SYNC_STOP, 0x0d,
+       R_08_SYNC_CNTL, 0x88,           /* Not datasheet default.
+                                        * HTC = VTR mode, should be 0x98 */
+       R_09_LUMA_CNTL, 0x01,
+       R_0A_LUMA_BRIGHT_CNTL, 0x80,
+       R_0B_LUMA_CONTRAST_CNTL, 0x47,
+       R_0C_CHROMA_SAT_CNTL, 0x40,
+       R_0D_CHROMA_HUE_CNTL, 0x00,
+       R_0E_CHROMA_CNTL_1, 0x01,
+       R_0F_CHROMA_GAIN_CNTL, 0x2a,
+       R_10_CHROMA_CNTL_2, 0x08,       /* Not datsheet default.
+                                        * VRLN enabled, should be 0x00 */
+       R_11_MODE_DELAY_CNTL, 0x0c,
+       R_12_RT_SIGNAL_CNTL, 0x07,      /* Not datasheet default,
+                                        * should be 0x01 */
+       R_13_RT_X_PORT_OUT_CNTL, 0x00,
+       R_14_ANAL_ADC_COMPAT_CNTL, 0x00,
+       R_15_VGATE_START_FID_CHG, 0x00,
+       R_16_VGATE_STOP, 0x00,
+       R_17_MISC_VGATE_CONF_AND_MSB, 0x00,
+
+       0x00, 0x00
+};
+
+/* GM7113C is a clone of the SAA7113 chip
+   This init table is copied out of the saa7113 datasheet.
+   In R_08 we enable "Automatic Field Detection" [AUFD],
+   this is disabled when saa711x_set_v4lstd is called. */
+static const unsigned char gm7113c_init[] = {
+       R_01_INC_DELAY, 0x08,
+       R_02_INPUT_CNTL_1, 0xc0,
+       R_03_INPUT_CNTL_2, 0x33,
+       R_04_INPUT_CNTL_3, 0x00,
+       R_05_INPUT_CNTL_4, 0x00,
+       R_06_H_SYNC_START, 0xe9,
        R_07_H_SYNC_STOP, 0x0d,
-       R_08_SYNC_CNTL, 0x88,
+       R_08_SYNC_CNTL, 0x98,
        R_09_LUMA_CNTL, 0x01,
        R_0A_LUMA_BRIGHT_CNTL, 0x80,
        R_0B_LUMA_CONTRAST_CNTL, 0x47,
@@ -245,9 +285,9 @@ static const unsigned char saa7113_init[] = {
        R_0D_CHROMA_HUE_CNTL, 0x00,
        R_0E_CHROMA_CNTL_1, 0x01,
        R_0F_CHROMA_GAIN_CNTL, 0x2a,
-       R_10_CHROMA_CNTL_2, 0x08,
+       R_10_CHROMA_CNTL_2, 0x00,
        R_11_MODE_DELAY_CNTL, 0x0c,
-       R_12_RT_SIGNAL_CNTL, 0x07,
+       R_12_RT_SIGNAL_CNTL, 0x01,
        R_13_RT_X_PORT_OUT_CNTL, 0x00,
        R_14_ANAL_ADC_COMPAT_CNTL, 0x00,
        R_15_VGATE_START_FID_CHG, 0x00,
@@ -462,24 +502,6 @@ static const unsigned char saa7115_cfg_50hz_video[] = {
 
 /* ============== SAA7715 VIDEO templates (end) =======  */
 
-/* ============== GM7113C VIDEO templates =============  */
-static const unsigned char gm7113c_cfg_60hz_video[] = {
-       R_08_SYNC_CNTL, 0x68,                   /* 0xBO: auto detection, 0x68 = NTSC */
-       R_0E_CHROMA_CNTL_1, 0x07,               /* video autodetection is on */
-
-       0x00, 0x00
-};
-
-static const unsigned char gm7113c_cfg_50hz_video[] = {
-       R_08_SYNC_CNTL, 0x28,                   /* 0x28 = PAL */
-       R_0E_CHROMA_CNTL_1, 0x07,
-
-       0x00, 0x00
-};
-
-/* ============== GM7113C VIDEO templates (end) =======  */
-
-
 static const unsigned char saa7115_cfg_vbi_on[] = {
        R_80_GLOBAL_CNTL_1, 0x00,                       /* reset tasks */
        R_88_POWER_SAVE_ADC_PORT_CNTL, 0xd0,            /* reset scaler */
@@ -964,17 +986,24 @@ static void saa711x_set_v4lstd(struct v4l2_subdev *sd, v4l2_std_id std)
        // This works for NTSC-M, SECAM-L and the 50Hz PAL variants.
        if (std & V4L2_STD_525_60) {
                v4l2_dbg(1, debug, sd, "decoder set standard 60 Hz\n");
-               if (state->ident == GM7113C)
-                       saa711x_writeregs(sd, gm7113c_cfg_60hz_video);
-               else
+               if (state->ident == GM7113C) {
+                       u8 reg = saa711x_read(sd, R_08_SYNC_CNTL);
+                       reg &= ~(SAA7113_R_08_FSEL | SAA7113_R_08_AUFD);
+                       reg |= SAA7113_R_08_FSEL;
+                       saa711x_write(sd, R_08_SYNC_CNTL, reg);
+               } else {
                        saa711x_writeregs(sd, saa7115_cfg_60hz_video);
+               }
                saa711x_set_size(sd, 720, 480);
        } else {
                v4l2_dbg(1, debug, sd, "decoder set standard 50 Hz\n");
-               if (state->ident == GM7113C)
-                       saa711x_writeregs(sd, gm7113c_cfg_50hz_video);
-               else
+               if (state->ident == GM7113C) {
+                       u8 reg = saa711x_read(sd, R_08_SYNC_CNTL);
+                       reg &= ~(SAA7113_R_08_FSEL | SAA7113_R_08_AUFD);
+                       saa711x_write(sd, R_08_SYNC_CNTL, reg);
+               } else {
                        saa711x_writeregs(sd, saa7115_cfg_50hz_video);
+               }
                saa711x_set_size(sd, 720, 576);
        }
 
@@ -1596,6 +1625,65 @@ static const struct v4l2_subdev_ops saa711x_ops = {
 
 /* ----------------------------------------------------------------------- */
 
+static void saa711x_write_platform_data(struct saa711x_state *state,
+                                       struct saa7115_platform_data *data)
+{
+       struct v4l2_subdev *sd = &state->sd;
+       u8 work;
+
+       if (state->ident != GM7113C &&
+           state->ident != SAA7113)
+               return;
+
+       if (data->saa7113_r08_htc) {
+               work = saa711x_read(sd, R_08_SYNC_CNTL);
+               work &= ~SAA7113_R_08_HTC_MASK;
+               work |= ((*data->saa7113_r08_htc) << SAA7113_R_08_HTC_OFFSET);
+               saa711x_write(sd, R_08_SYNC_CNTL, work);
+       }
+
+       if (data->saa7113_r10_vrln) {
+               work = saa711x_read(sd, R_10_CHROMA_CNTL_2);
+               work &= ~SAA7113_R_10_VRLN_MASK;
+               if (*data->saa7113_r10_vrln)
+                       work |= (1 << SAA7113_R_10_VRLN_OFFSET);
+               saa711x_write(sd, R_10_CHROMA_CNTL_2, work);
+       }
+
+       if (data->saa7113_r10_ofts) {
+               work = saa711x_read(sd, R_10_CHROMA_CNTL_2);
+               work &= ~SAA7113_R_10_OFTS_MASK;
+               work |= (*data->saa7113_r10_ofts << SAA7113_R_10_OFTS_OFFSET);
+               saa711x_write(sd, R_10_CHROMA_CNTL_2, work);
+       }
+
+       if (data->saa7113_r12_rts0) {
+               work = saa711x_read(sd, R_12_RT_SIGNAL_CNTL);
+               work &= ~SAA7113_R_12_RTS0_MASK;
+               work |= (*data->saa7113_r12_rts0 << SAA7113_R_12_RTS0_OFFSET);
+
+               /* According to the datasheet,
+                * SAA7113_RTS_DOT_IN should only be used on RTS1 */
+               WARN_ON(*data->saa7113_r12_rts0 == SAA7113_RTS_DOT_IN);
+               saa711x_write(sd, R_12_RT_SIGNAL_CNTL, work);
+       }
+
+       if (data->saa7113_r12_rts1) {
+               work = saa711x_read(sd, R_12_RT_SIGNAL_CNTL);
+               work &= ~SAA7113_R_12_RTS1_MASK;
+               work |= (*data->saa7113_r12_rts1 << SAA7113_R_12_RTS1_OFFSET);
+               saa711x_write(sd, R_12_RT_SIGNAL_CNTL, work);
+       }
+
+       if (data->saa7113_r13_adlsb) {
+               work = saa711x_read(sd, R_13_RT_X_PORT_OUT_CNTL);
+               work &= ~SAA7113_R_13_ADLSB_MASK;
+               if (*data->saa7113_r13_adlsb)
+                       work |= (1 << SAA7113_R_13_ADLSB_OFFSET);
+               saa711x_write(sd, R_13_RT_X_PORT_OUT_CNTL, work);
+       }
+}
+
 /**
  * saa711x_detect_chip - Detects the saa711x (or clone) variant
  * @client:            I2C client structure.
@@ -1704,6 +1792,7 @@ static int saa711x_probe(struct i2c_client *client,
        struct saa711x_state *state;
        struct v4l2_subdev *sd;
        struct v4l2_ctrl_handler *hdl;
+       struct saa7115_platform_data *pdata;
        int ident;
        char name[CHIP_VER_SIZE + 1];
 
@@ -1767,21 +1856,31 @@ static int saa711x_probe(struct i2c_client *client,
 
        /* init to 60hz/48khz */
        state->crystal_freq = SAA7115_FREQ_24_576_MHZ;
+       pdata = client->dev.platform_data;
        switch (state->ident) {
        case SAA7111:
        case SAA7111A:
                saa711x_writeregs(sd, saa7111_init);
                break;
        case GM7113C:
+               saa711x_writeregs(sd, gm7113c_init);
+               break;
        case SAA7113:
-               saa711x_writeregs(sd, saa7113_init);
+               if (pdata && pdata->saa7113_force_gm7113c_init)
+                       saa711x_writeregs(sd, gm7113c_init);
+               else
+                       saa711x_writeregs(sd, saa7113_init);
                break;
        default:
                state->crystal_freq = SAA7115_FREQ_32_11_MHZ;
                saa711x_writeregs(sd, saa7115_init_auto_input);
        }
-       if (state->ident > SAA7111A)
+       if (state->ident > SAA7111A && state->ident != GM7113C)
                saa711x_writeregs(sd, saa7115_init_misc);
+
+       if (pdata)
+               saa711x_write_platform_data(state, pdata);
+
        saa711x_set_v4lstd(sd, V4L2_STD_NTSC);
        v4l2_ctrl_handler_setup(hdl);