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

Merge branch 'pci/host-dra7xx' into next 

* pci/host-dra7xx:
  PCI: dwc: dra7xx: Use RW1C for IRQSTATUS_MSI and IRQSTATUS_MAIN
  PCI: dwc: dra7xx: Depend on appropriate SoC or compile test
parents f011a5f8 40aa52c4

drivers/pci/dwc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ config PCIE_DW_EP 


config PCI_DRA7XX

	bool "TI DRA7xx PCIe controller"

	depends on SOC_DRA7XX || COMPILE_TEST

	depends on (PCI && PCI_MSI_IRQ_DOMAIN) || PCI_ENDPOINT

	depends on OF && HAS_IOMEM && TI_PIPE3

	help

drivers/pci/dwc/pci-dra7xx.c

+2 −2
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static int dra7xx_pcie_establish_link(struct dw_pcie *pci) 
static void dra7xx_pcie_enable_msi_interrupts(struct dra7xx_pcie *dra7xx)

{

	dra7xx_pcie_writel(dra7xx, PCIECTRL_DRA7XX_CONF_IRQSTATUS_MSI,

			   ~LEG_EP_INTERRUPTS & ~MSI);

			   LEG_EP_INTERRUPTS | MSI);



	dra7xx_pcie_writel(dra7xx,

			   PCIECTRL_DRA7XX_CONF_IRQENABLE_SET_MSI,
@@ -184,7 +184,7 @@ static void dra7xx_pcie_enable_msi_interrupts(struct dra7xx_pcie *dra7xx) 
static void dra7xx_pcie_enable_wrapper_interrupts(struct dra7xx_pcie *dra7xx)

{

	dra7xx_pcie_writel(dra7xx, PCIECTRL_DRA7XX_CONF_IRQSTATUS_MAIN,

			   ~INTERRUPTS);

			   INTERRUPTS);

	dra7xx_pcie_writel(dra7xx, PCIECTRL_DRA7XX_CONF_IRQENABLE_SET_MAIN,

			   INTERRUPTS);

}