These changes are a raw update to a vanilla kernel 4.1.10, with the

[kvmfornfv.git] / kernel / drivers / tty / serial / 8250 / 8250_pnp.c

diff --git a/kernel/drivers/tty/serial/8250/8250_pnp.c b/kernel/drivers/tty/serial/8250/8250_pnp.c
index 50a09cd..658b392 100644 (file)
--- a/kernel/drivers/tty/serial/8250/8250_pnp.c
+++ b/kernel/drivers/tty/serial/8250/8250_pnp.c
@@ -41,6 +41,12 @@ static const struct pnp_device_id pnp_dev_table[] = {
        {       "AEI1240",              0       },
        /* Rockwell 56K ACF II Fax+Data+Voice Modem */
        {       "AKY1021",              0 /*SPCI_FL_NO_SHIRQ*/  },
+       /*
+        * ALi Fast Infrared Controller
+        * Native driver (ali-ircc) is broken so at least
+        * it can be used with irtty-sir.
+        */
+       {       "ALI5123",              0       },
        /* AZT3005 PnP SOUND DEVICE */
        {       "AZT4001",              0       },
        /* Best Data Products Inc. Smart One 336F PnP Modem */
@@ -364,6 +370,11 @@ static const struct pnp_device_id pnp_dev_table[] = {
        /* Winbond CIR port, should not be probed. We should keep track
           of it to prevent the legacy serial driver from probing it */
        {       "WEC1022",              CIR_PORT        },
+       /*
+        * SMSC IrCC SIR/FIR port, should not be probed by serial driver
+        * as well so its own driver can bind to it.
+        */
+       {       "SMCF010",              CIR_PORT        },
        {       "",                     0       }
 };