Commit 6d940a71 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' 

  - Mark expected switch fall-through (Mathieu Malaterre)

  - Use of_node_name_eq() for node name comparisons (Rob Herring)

  - Add ACS and pciehp quirks for HXT SD4800 (Shunyong Yang)

  - Consolidate Rohm Vendor ID definitions (Andy Shevchenko)

  - Use u32 (not __u32) for things not exposed to userspace (Logan
    Gunthorpe)

  - Fix locking semantics of bus and slot reset interfaces (Alex
    Williamson)

  - Update PCIEPORTBUS Kconfig help text (Hou Zhiqiang)

* pci/misc:
  PCI: Update PCIEPORTBUS Kconfig help text
  PCI: Fix "try" semantics of bus and slot reset
  PCI: Clean up usage of __u32 type
  genirq/msi: Clean up usage of __u8/__u16 types
  PCI: Move Rohm Vendor ID to generic list
  PCI: pciehp: Add HXT quirk for Command Completed errata
  PCI: Add ACS quirk for HXT SD4800
  PCI: Add HXT vendor ID
  PCI: Use of_node_name_eq() for node name comparisons
  PCI: Mark expected switch fall-through
parents 58a79db4 8f55ed3f

drivers/dma/pch_dma.c

+0 −1
Original line number Diff line number Diff line
@@ -972,7 +972,6 @@ static void pch_dma_remove(struct pci_dev *pdev) 
}



/* PCI Device ID of DMA device */

#define PCI_VENDOR_ID_ROHM             0x10DB

#define PCI_DEVICE_ID_EG20T_PCH_DMA_8CH        0x8810

#define PCI_DEVICE_ID_EG20T_PCH_DMA_4CH        0x8815

#define PCI_DEVICE_ID_ML7213_DMA1_8CH	0x8026

drivers/gpio/gpio-ml-ioh.c

+0 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ 


#define IOH_IRQ_BASE		0



#define PCI_VENDOR_ID_ROHM             0x10DB



struct ioh_reg_comn {

	u32	ien;

	u32	istatus;

drivers/gpio/gpio-pch.c

+0 −1
Original line number Diff line number Diff line
@@ -437,7 +437,6 @@ static int __maybe_unused pch_gpio_resume(struct device *dev) 


static SIMPLE_DEV_PM_OPS(pch_gpio_pm_ops, pch_gpio_suspend, pch_gpio_resume);



#define PCI_VENDOR_ID_ROHM             0x10DB

static const struct pci_device_id pch_gpio_pcidev_id[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8803) },

	{ PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8014) },

drivers/i2c/busses/i2c-eg20t.c

+0 −1
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ static wait_queue_head_t pch_event; 
static DEFINE_MUTEX(pch_mutex);



/* Definition for ML7213 by LAPIS Semiconductor */

#define PCI_VENDOR_ID_ROHM		0x10DB

#define PCI_DEVICE_ID_ML7213_I2C	0x802D

#define PCI_DEVICE_ID_ML7223_I2C	0x8010

#define PCI_DEVICE_ID_ML7831_I2C	0x8817

drivers/misc/pch_phub.c

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ 
#define CLKCFG_UARTCLKSEL			(1 << 18)



/* Macros for ML7213 */

#define PCI_VENDOR_ID_ROHM			0x10db

#define PCI_DEVICE_ID_ROHM_ML7213_PHUB		0x801A



/* Macros for ML7223 */