Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f2627c2 authored by Sean Young's avatar Sean Young Committed by Mauro Carvalho Chehab
Browse files

[media] winbond-cir: only enable higher sample resolution if needed 



A sample resolution of 2us generates more than 300 interrupts per key
and this resolution is not needed unless carrier reports are enabled.
Revert to a resolution of 10us unless carrier reports are needed. This
generates up to a fifth of the interrupts.

Signed-off-by: default avatarSean Young <sean@mess.org>
Acked-by: default avatarDavid Härdeman <david@hardeman.nu>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 3e85a44a

drivers/media/rc/winbond-cir.c

+19 −8
Original line number Diff line number Diff line
@@ -154,6 +154,8 @@ 
#define WBCIR_CNTR_R		0x02

/* Invert TX */

#define WBCIR_IRTX_INV		0x04

/* Receiver oversampling */

#define WBCIR_RX_T_OV		0x40



/* Valid banks for the SP3 UART */

enum wbcir_bank {
@@ -394,7 +396,8 @@ wbcir_irq_rx(struct wbcir_data *data, struct pnp_dev *device) 
		if (data->rxstate == WBCIR_RXSTATE_ERROR)

			continue;



		duration = ((irdata & 0x7F) + 1) * 2;

		duration = ((irdata & 0x7F) + 1) *

			(data->carrier_report_enabled ? 2 : 10);

		rawir.pulse = irdata & 0x80 ? false : true;

		rawir.duration = US_TO_NS(duration);
@@ -550,6 +553,17 @@ wbcir_set_carrier_report(struct rc_dev *dev, int enable) 
		wbcir_set_bits(data->ebase + WBCIR_REG_ECEIR_CCTL,

				WBCIR_CNTR_EN, WBCIR_CNTR_EN | WBCIR_CNTR_R);



	/* Set a higher sampling resolution if carrier reports are enabled */

	wbcir_select_bank(data, WBCIR_BANK_2);

	data->dev->rx_resolution = US_TO_NS(enable ? 2 : 10);

	outb(enable ? 0x03 : 0x0f, data->sbase + WBCIR_REG_SP3_BGDL);

	outb(0x00, data->sbase + WBCIR_REG_SP3_BGDH);



	/* Enable oversampling if carrier reports are enabled */

	wbcir_select_bank(data, WBCIR_BANK_7);

	wbcir_set_bits(data->sbase + WBCIR_REG_SP3_RCCFG,

				enable ? WBCIR_RX_T_OV : 0, WBCIR_RX_T_OV);



	data->carrier_report_enabled = enable;

	spin_unlock_irqrestore(&data->spinlock, flags);
@@ -931,8 +945,8 @@ wbcir_init_hw(struct wbcir_data *data) 
	/* prescaler 1.0, tx/rx fifo lvl 16 */

	outb(0x30, data->sbase + WBCIR_REG_SP3_EXCR2);



	/* Set baud divisor to sample every 2 ns */

	outb(0x03, data->sbase + WBCIR_REG_SP3_BGDL);

	/* Set baud divisor to sample every 10 us */

	outb(0x0f, data->sbase + WBCIR_REG_SP3_BGDL);

	outb(0x00, data->sbase + WBCIR_REG_SP3_BGDH);



	/* Set CEIR mode */
@@ -941,12 +955,9 @@ wbcir_init_hw(struct wbcir_data *data) 
	inb(data->sbase + WBCIR_REG_SP3_LSR); /* Clear LSR */

	inb(data->sbase + WBCIR_REG_SP3_MSR); /* Clear MSR */



	/*

	 * Disable RX demod, enable run-length enc/dec, set freq span and

	 * enable over-sampling

	 */

	/* Disable RX demod, enable run-length enc/dec, set freq span */

	wbcir_select_bank(data, WBCIR_BANK_7);

	outb(0xd0, data->sbase + WBCIR_REG_SP3_RCCFG);

	outb(0x90, data->sbase + WBCIR_REG_SP3_RCCFG);



	/* Disable timer */

	wbcir_select_bank(data, WBCIR_BANK_4);