lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] rc-core: fix winbond-cir issues

Browse Source 
The conversion of winbond-cir to use rc-core seems to have missed a
a few bits and pieces which were in my local tree. Kudos to
Juan Jesús García de Soria Lucena <skandalfo@gmail.com> for noticing.

[mchehab@redhat.com: fix two UTF-8 violations]
Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
David Härdeman
2011-03-30 11:20:14 -03:00
committed by Mauro Carvalho Chehab
parent 7eb7571546
commit b87f2eddfa
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/media/rc/winbond-cir.c
View File

@@ -6,8 +6,8 @@
* could probably support others (Winbond WEC102X, NatSemi, etc) * could probably support others (Winbond WEC102X, NatSemi, etc)
* with minor modifications. * with minor modifications.
* *
* Original Author: David H<EFBFBD>rdeman <david@hardeman.nu> * Original Author: David Härdeman <david@hardeman.nu>
* Copyright (C) 2009 - 2010 David H<EFBFBD>rdeman <david@hardeman.nu> * Copyright (C) 2009 - 2011 David Härdeman <david@hardeman.nu>
* *
* Dedicated to my daughter Matilda, without whose loving attention this * Dedicated to my daughter Matilda, without whose loving attention this
* driver would have been finished in half the time and with a fraction * driver would have been finished in half the time and with a fraction
@@ -876,18 +876,8 @@ wbcir_init_hw(struct wbcir_data *data)
/* prescaler 1.0, tx/rx fifo lvl 16 */ /* prescaler 1.0, tx/rx fifo lvl 16 */
outb(0x30, data->sbase + WBCIR_REG_SP3_EXCR2); outb(0x30, data->sbase + WBCIR_REG_SP3_EXCR2);
/* Set baud divisor to generate one byte per bit/cell */ /* Set baud divisor to sample every 10 us */
switch (protocol) { outb(0x0F, data->sbase + WBCIR_REG_SP3_BGDL);
case IR_PROTOCOL_RC5:
outb(0xA7, data->sbase + WBCIR_REG_SP3_BGDL);
break;
case IR_PROTOCOL_RC6:
outb(0x53, data->sbase + WBCIR_REG_SP3_BGDL);
break;
case IR_PROTOCOL_NEC:
outb(0x69, data->sbase + WBCIR_REG_SP3_BGDL);
break;
}
outb(0x00, data->sbase + WBCIR_REG_SP3_BGDH); outb(0x00, data->sbase + WBCIR_REG_SP3_BGDH);
/* Set CEIR mode */ /* Set CEIR mode */
@@ -896,9 +886,9 @@ wbcir_init_hw(struct wbcir_data *data)
inb(data->sbase + WBCIR_REG_SP3_LSR); /* Clear LSR */ inb(data->sbase + WBCIR_REG_SP3_LSR); /* Clear LSR */
inb(data->sbase + WBCIR_REG_SP3_MSR); /* Clear MSR */ inb(data->sbase + WBCIR_REG_SP3_MSR); /* Clear MSR */
/* Disable RX demod, run-length encoding/decoding, set freq span */ /* Disable RX demod, enable run-length enc/dec, set freq span */
wbcir_select_bank(data, WBCIR_BANK_7); wbcir_select_bank(data, WBCIR_BANK_7);
outb(0x10, data->sbase + WBCIR_REG_SP3_RCCFG); outb(0x90, data->sbase + WBCIR_REG_SP3_RCCFG);
/* Disable timer */ /* Disable timer */
wbcir_select_bank(data, WBCIR_BANK_4); wbcir_select_bank(data, WBCIR_BANK_4);