View | Details | Raw Unified | Return to bug 110901
Collapse All | Expand All

(-)a/drivers/bluetooth/hci_bcm.c (+1 lines)
Lines 816-821 static const struct hci_uart_proto bcm_proto = { Link Here
816 
static const struct acpi_device_id bcm_acpi_match[] = {
 816 
static const struct acpi_device_id bcm_acpi_match[] = {
817 
	{ "BCM2E39", 0 },
 817 
	{ "BCM2E39", 0 },
818 
	{ "BCM2E67", 0 },
 818 
	{ "BCM2E67", 0 },
819 
	{ "BCM2E7C", 0 },
819 
	{ },
 820 
	{ },
820 
};
 821 
};
821 
MODULE_DEVICE_TABLE(acpi, bcm_acpi_match);
 822 
MODULE_DEVICE_TABLE(acpi, bcm_acpi_match);
(-)a/drivers/tty/serial/8250/8250_pci.c (+19 lines)
Lines 1379-1384 ce4100_serial_setup(struct serial_private *priv, Link Here
1379 
#define PCI_DEVICE_ID_INTEL_BSW_UART1	0x228a
 1379 
#define PCI_DEVICE_ID_INTEL_BSW_UART1	0x228a
1380 
#define PCI_DEVICE_ID_INTEL_BSW_UART2	0x228c
 1380 
#define PCI_DEVICE_ID_INTEL_BSW_UART2	0x228c
1381 

          1381
          

        

            

              
              
              1382
              
#define PCI_DEVICE_ID_INTEL_BDW_UART1	0x9ce3

            

            

              1383
              
#define PCI_DEVICE_ID_INTEL_BDW_UART2	0x9ce4

            

            

              1384
              

            

        

          1382
          
#define BYT_PRV_CLK			0x800

          1385
          
#define BYT_PRV_CLK			0x800

        

        

          1383
          
#define BYT_PRV_CLK_EN			(1 << 0)

          1386
          
#define BYT_PRV_CLK_EN			(1 << 0)

        

        

          1384
          
#define BYT_PRV_CLK_M_VAL_SHIFT		1

          1387
          
#define BYT_PRV_CLK_M_VAL_SHIFT		1

        

  

    
      
            Lines 1461-1471
          byt_serial_setup(struct serial_private *priv,
      
      
        Link Here
      
    
  

        

          1461
          
	switch (pdev->device) {

          1464
          
	switch (pdev->device) {

        

        

          1462
          
	case PCI_DEVICE_ID_INTEL_BYT_UART1:

          1465
          
	case PCI_DEVICE_ID_INTEL_BYT_UART1:

        

        

          1463
          
	case PCI_DEVICE_ID_INTEL_BSW_UART1:

          1466
          
	case PCI_DEVICE_ID_INTEL_BSW_UART1:

        

            

              
              
              1467
              
	case PCI_DEVICE_ID_INTEL_BDW_UART1:

            

        

          1464
          
		rx_param->src_id = 3;

          1468
          
		rx_param->src_id = 3;

        

        

          1465
          
		tx_param->dst_id = 2;

          1469
          
		tx_param->dst_id = 2;

        

        

          1466
          
		break;

          1470
          
		break;

        

        

          1467
          
	case PCI_DEVICE_ID_INTEL_BYT_UART2:

          1471
          
	case PCI_DEVICE_ID_INTEL_BYT_UART2:

        

        

          1468
          
	case PCI_DEVICE_ID_INTEL_BSW_UART2:

          1472
          
	case PCI_DEVICE_ID_INTEL_BSW_UART2:

        

            

              
              
              1473
              
	case PCI_DEVICE_ID_INTEL_BDW_UART2:

            

        

          1469
          
		rx_param->src_id = 5;

          1474
          
		rx_param->src_id = 5;

        

        

          1470
          
		tx_param->dst_id = 4;

          1475
          
		tx_param->dst_id = 4;

        

        

          1471
          
		break;

          1476
          
		break;

        

  

    
      
            Lines 2062-2067
          static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
      
      
        Link Here
      
    
  

        

          2062
          
		.subdevice	= PCI_ANY_ID,

          2067
          
		.subdevice	= PCI_ANY_ID,

        

        

          2063
          
		.setup		= byt_serial_setup,

          2068
          
		.setup		= byt_serial_setup,

        

        

          2064
          
	},

          2069
          
	},

        

            

              
              
              2070
              
	{

            

            

              2071
              
		.vendor		= PCI_VENDOR_ID_INTEL,

            

            

              2072
              
		.device		= PCI_DEVICE_ID_INTEL_BDW_UART1,

            

            

              2073
              
		.subvendor	= PCI_ANY_ID,

            

            

              2074
              
		.subdevice	= PCI_ANY_ID,

            

            

              2075
              
		.setup		= byt_serial_setup,

            

            

              2076
              
	},

            

            

              2077
              
	{

            

            

              2078
              
		.vendor		= PCI_VENDOR_ID_INTEL,

            

            

              2079
              
		.device		= PCI_DEVICE_ID_INTEL_BDW_UART2,

            

            

              2080
              
		.subvendor	= PCI_ANY_ID,

            

            

              2081
              
		.subdevice	= PCI_ANY_ID,

            

            

              2082
              
		.setup		= byt_serial_setup,

            

            

              2083
              
	},

            

        

          2065
          
	/*

          2084
          
	/*

        

        

          2066
          
	 * ITE

          2085
          
	 * ITE

        

        

          2067
          
	 */

          2086
          
	 */

        






  

  Return to bug 110901