[media] af9035: implement TUA9001 GPIOs correctly (51639be3) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/media/usb/dvb-usb-v2/af9035.c

+48 −17

Original line number	Diff line number	Diff line
		@@ -583,6 +583,52 @@ static int af9035_read_config_it9135(struct dvb_usb_device *d)
		return ret;
		}

		static int af9035_tua9001_tuner_callback(struct dvb_usb_device *d,
		int cmd, int arg)
		{
		int ret;
		u8 val;

		dev_dbg(&d->udev->dev, "%s: cmd=%d arg=%d\n", __func__, cmd, arg);

		/*
		* CEN always enabled by hardware wiring
		* RESETN GPIOT3
		* RXEN GPIOT2
		*/

		switch (cmd) {
		case TUA9001_CMD_RESETN:
		if (arg)
		val = 0x00;
		else
		val = 0x01;

		ret = af9035_wr_reg_mask(d, 0x00d8e7, val, 0x01);
		if (ret < 0)
		goto err;
		break;
		case TUA9001_CMD_RXEN:
		if (arg)
		val = 0x01;
		else
		val = 0x00;

		ret = af9035_wr_reg_mask(d, 0x00d8eb, val, 0x01);
		if (ret < 0)
		goto err;
		break;
		}

		return 0;

		err:
		dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);

		return ret;
		}


		static int af9035_fc0011_tuner_callback(struct dvb_usb_device *d,
		int cmd, int arg)
		{
		@@ -655,6 +701,8 @@ static int af9035_tuner_callback(struct dvb_usb_device *d, int cmd, int arg)
		switch (state->af9033_config[0].tuner) {
		case AF9033_TUNER_FC0011:
		return af9035_fc0011_tuner_callback(d, cmd, arg);
		case AF9033_TUNER_TUA9001:
		return af9035_tua9001_tuner_callback(d, cmd, arg);
		default:
		break;
		}
		@@ -779,23 +827,6 @@ static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
		if (ret < 0)
		goto err;

		/* reset tuner */
		ret = af9035_wr_reg_mask(d, 0x00d8e7, 0x00, 0x01);
		if (ret < 0)
		goto err;

		usleep_range(2000, 20000);

		ret = af9035_wr_reg_mask(d, 0x00d8e7, 0x01, 0x01);
		if (ret < 0)
		goto err;

		/* activate tuner RX */
		/* TODO: use callback for TUA9001 RXEN */
		ret = af9035_wr_reg_mask(d, 0x00d8eb, 0x01, 0x01);
		if (ret < 0)
		goto err;

		/* attach tuner */
		fe = dvb_attach(tua9001_attach, adap->fe[0],
		&d->i2c_adap, &af9035_tua9001_config);