Commit 1fa98174 authored by Matthew Garrett's avatar Matthew Garrett Committed by David S. Miller

nsc-ircc: default to dongle type 9 on IBM hardware

This is necessary to set the dongle type on the nsc driver in order to get
it to work correctly.  Thinkpads all appear to use dongle type 9.  This
patch defaults nsc devices with an IBM PnP descriptor to use type 9.
Signed-off-by: default avatarMatthew Garrett <mjg59@srcf.ucam.org>
Signed-off-by: default avatarBen Collins <ben.collins@canonical.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 5aa10cad
...@@ -151,8 +151,8 @@ static char *dongle_types[] = { ...@@ -151,8 +151,8 @@ static char *dongle_types[] = {
static chipio_t pnp_info; static chipio_t pnp_info;
static const struct pnp_device_id nsc_ircc_pnp_table[] = { static const struct pnp_device_id nsc_ircc_pnp_table[] = {
{ .id = "NSC6001", .driver_data = 0 }, { .id = "NSC6001", .driver_data = 0 },
{ .id = "IBM0071", .driver_data = 0 },
{ .id = "HWPC224", .driver_data = 0 }, { .id = "HWPC224", .driver_data = 0 },
{ .id = "IBM0071", .driver_data = NSC_FORCE_DONGLE_TYPE9 },
{ } { }
}; };
...@@ -930,7 +930,10 @@ static int nsc_ircc_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *i ...@@ -930,7 +930,10 @@ static int nsc_ircc_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *i
pnp_info.dma = -1; pnp_info.dma = -1;
pnp_succeeded = 1; pnp_succeeded = 1;
/* There don't seem to be any way to get the cfg_base. if (id->driver_data & NSC_FORCE_DONGLE_TYPE9)
dongle_id = 0x9;
/* There doesn't seem to be any way of getting the cfg_base.
* On my box, cfg_base is in the PnP descriptor of the * On my box, cfg_base is in the PnP descriptor of the
* motherboard. Oh well... Jean II */ * motherboard. Oh well... Jean II */
......
...@@ -35,6 +35,9 @@ ...@@ -35,6 +35,9 @@
#include <linux/types.h> #include <linux/types.h>
#include <asm/io.h> #include <asm/io.h>
/* Features for chips (set in driver_data) */
#define NSC_FORCE_DONGLE_TYPE9 0x00000001
/* DMA modes needed */ /* DMA modes needed */
#define DMA_TX_MODE 0x08 /* Mem to I/O, ++, demand. */ #define DMA_TX_MODE 0x08 /* Mem to I/O, ++, demand. */
#define DMA_RX_MODE 0x04 /* I/O to mem, ++, demand. */ #define DMA_RX_MODE 0x04 /* I/O to mem, ++, demand. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment