Commit 715d341c authored by Manu Abraham's avatar Manu Abraham Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13709): [Mantis/VP-1034] Switch 13/18v for the VP-1034 properly 



Signed-off-by: default avatarManu Abraham <manu@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent da7365f4

drivers/media/dvb/mantis/mantis_i2c.c

+7 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static int mantis_ack_wait(struct mantis_pci *mantis) 
					     mantis->mantis_int_stat & MANTIS_INT_I2CDONE,

					     msecs_to_jiffies(50)) == -ERESTARTSYS) {



		dprintk(verbose, MANTIS_DEBUG, 1, "I2C Transfer failed, Master !I2CDONE");

		dprintk(verbose, MANTIS_DEBUG, 1, "Master !I2CDONE");

		rc = -EREMOTEIO;

	}

	while (!(mantis->mantis_int_stat & MANTIS_INT_I2CRACK)) {
@@ -62,7 +62,9 @@ static int mantis_i2c_read(struct mantis_pci *mantis, const struct i2c_msg *msg) 
{

	u32 rxd, i;



	dprintk(verbose, MANTIS_INFO, 0, "        %s:  Address=[0x%02x] <R>[ ", __func__, msg->addr);

	dprintk(verbose, MANTIS_INFO, 0, "        %s:  Address=[0x%02x] <R>[ ",

		__func__, msg->addr);



	for (i = 0; i < msg->len; i++) {

		rxd = (msg->addr << 25) | (1 << 24)

					| MANTIS_I2C_RATE_3
@@ -92,7 +94,9 @@ static int mantis_i2c_write(struct mantis_pci *mantis, const struct i2c_msg *msg 
	int i;

	u32 txd = 0;



	dprintk(verbose, MANTIS_INFO, 0, "        %s: Address=[0x%02x] <W>[ ", __func__, msg->addr);

	dprintk(verbose, MANTIS_INFO, 0, "        %s: Address=[0x%02x] <W>[ ",

		__func__, msg->addr);



	for (i = 0; i < msg->len; i++) {

		dprintk(verbose, MANTIS_INFO, 0, "%02x ", msg->buf[i]);

		txd = (msg->addr << 25) | (msg->buf[i] << 8)

drivers/media/dvb/mantis/mantis_vp1034.c

+4 −2
Original line number Diff line number Diff line
@@ -40,12 +40,14 @@ int vp1034_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage) 


	switch (voltage) {

	case SEC_VOLTAGE_13:

		mmwrite((mmread(MANTIS_GPIF_ADDR)) | voltage, MANTIS_GPIF_ADDR);

		dprintk(verbose, MANTIS_ERROR, 1, "Polarization=[13V]");

		gpio_set_bits(mantis, 13, 1);

		gpio_set_bits(mantis, 14, 0);

		break;

	case SEC_VOLTAGE_18:

		mmwrite((mmread(MANTIS_GPIF_ADDR)) & voltage, MANTIS_GPIF_ADDR);

		dprintk(verbose, MANTIS_ERROR, 1, "Polarization=[18V]");

		gpio_set_bits(mantis, 13, 1);

		gpio_set_bits(mantis, 14, 1);

		break;

	case SEC_VOLTAGE_OFF:

		dprintk(verbose, MANTIS_ERROR, 1, "Frontend (dummy) POWERDOWN");