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

Commit a0f75f9d authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' into next 

* pci/misc:
  MAINTAINERS: Add ACPI folks for ACPI-related things under drivers/pci
  PCI: Add CircuitCo vendor ID and subsystem ID
  PCI: Use pdev->pm_cap instead of pci_find_capability(..,PCI_CAP_ID_PM)
parents b5969138 15fd830d

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -242,6 +242,9 @@ F: drivers/acpi/ 
F:	drivers/pnp/pnpacpi/

F:	include/linux/acpi.h

F:	include/acpi/

F:	drivers/pci/*acpi*

F:	drivers/pci/*/*acpi*

F:	drivers/pci/*/*/*acpi*



ACPI FAN DRIVER

M:	Zhang Rui <rui.zhang@intel.com>

drivers/pci/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -805,7 +805,7 @@ pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state) 
{

	pci_power_t ret;



	if (!pci_find_capability(dev, PCI_CAP_ID_PM))

	if (!dev->pm_cap)

		return PCI_D0;



	ret = platform_pci_choose_state(dev);

drivers/pci/quirks.c

+2 −4
Original line number Diff line number Diff line
@@ -1834,7 +1834,6 @@ static void quirk_e100_interrupt(struct pci_dev *dev) 
	u16 command, pmcsr;

	u8 __iomem *csr;

	u8 cmd_hi;

	int pm;



	switch (dev->device) {

	/* PCI IDs taken from drivers/net/e100.c */
@@ -1872,9 +1871,8 @@ static void quirk_e100_interrupt(struct pci_dev *dev) 
	 * Check that the device is in the D0 power state. If it's not,

	 * there is no point to look any further.

	 */

	pm = pci_find_capability(dev, PCI_CAP_ID_PM);

	if (pm) {

		pci_read_config_word(dev, pm + PCI_PM_CTRL, &pmcsr);

	if (dev->pm_cap) {

		pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);

		if ((pmcsr & PCI_PM_CTRL_STATE_MASK) != PCI_D0)

			return;

	}

include/linux/pci_ids.h

+3 −0
Original line number Diff line number Diff line
@@ -2476,6 +2476,9 @@ 


#define PCI_VENDOR_ID_ASMEDIA		0x1b21



#define PCI_VENDOR_ID_CIRCUITCO		0x1cc8

#define PCI_SUBSYSTEM_ID_CIRCUITCO_MINNOWBOARD	0x0001



#define PCI_VENDOR_ID_TEKRAM		0x1de1

#define PCI_DEVICE_ID_TEKRAM_DC290	0xdc29