Commit da4c4be3 authored by Bjorn Helgaas's avatar Bjorn Helgaas

PCI: keystone: Use PCI_NUM_INTX

Switch from using custom MAX_LEGACY_IRQS and MAX_LEGACY_HOST_IRQS macros to
the generic PCI_NUM_INTX definition for the number of INTx interrupts.
Based-on-similar-patches-by: default avatarPaul Burton <paul.burton@imgtec.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: Murali Karicheri <m-karicheri2@ti.com>
parent 44b5557a
...@@ -251,7 +251,7 @@ void ks_dw_pcie_enable_legacy_irqs(struct keystone_pcie *ks_pcie) ...@@ -251,7 +251,7 @@ void ks_dw_pcie_enable_legacy_irqs(struct keystone_pcie *ks_pcie)
{ {
int i; int i;
for (i = 0; i < MAX_LEGACY_IRQS; i++) for (i = 0; i < PCI_NUM_INTX; i++)
ks_dw_app_writel(ks_pcie, IRQ_ENABLE_SET + (i << 4), 0x1); ks_dw_app_writel(ks_pcie, IRQ_ENABLE_SET + (i << 4), 0x1);
} }
...@@ -557,7 +557,7 @@ int __init ks_dw_pcie_host_init(struct keystone_pcie *ks_pcie, ...@@ -557,7 +557,7 @@ int __init ks_dw_pcie_host_init(struct keystone_pcie *ks_pcie,
/* Create legacy IRQ domain */ /* Create legacy IRQ domain */
ks_pcie->legacy_irq_domain = ks_pcie->legacy_irq_domain =
irq_domain_add_linear(ks_pcie->legacy_intc_np, irq_domain_add_linear(ks_pcie->legacy_intc_np,
MAX_LEGACY_IRQS, PCI_NUM_INTX,
&ks_dw_pcie_legacy_irq_domain_ops, &ks_dw_pcie_legacy_irq_domain_ops,
NULL); NULL);
if (!ks_pcie->legacy_irq_domain) { if (!ks_pcie->legacy_irq_domain) {
......
...@@ -169,7 +169,7 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie, ...@@ -169,7 +169,7 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie,
if (legacy) { if (legacy) {
np_temp = &ks_pcie->legacy_intc_np; np_temp = &ks_pcie->legacy_intc_np;
max_host_irqs = MAX_LEGACY_HOST_IRQS; max_host_irqs = PCI_NUM_INTX;
host_irqs = &ks_pcie->legacy_host_irqs[0]; host_irqs = &ks_pcie->legacy_host_irqs[0];
} else { } else {
np_temp = &ks_pcie->msi_intc_np; np_temp = &ks_pcie->msi_intc_np;
......
...@@ -12,9 +12,7 @@ ...@@ -12,9 +12,7 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#define MAX_LEGACY_IRQS 4
#define MAX_MSI_HOST_IRQS 8 #define MAX_MSI_HOST_IRQS 8
#define MAX_LEGACY_HOST_IRQS 4
struct keystone_pcie { struct keystone_pcie {
struct dw_pcie *pci; struct dw_pcie *pci;
...@@ -22,7 +20,7 @@ struct keystone_pcie { ...@@ -22,7 +20,7 @@ struct keystone_pcie {
/* PCI Device ID */ /* PCI Device ID */
u32 device_id; u32 device_id;
int num_legacy_host_irqs; int num_legacy_host_irqs;
int legacy_host_irqs[MAX_LEGACY_HOST_IRQS]; int legacy_host_irqs[PCI_NUM_INTX];
struct device_node *legacy_intc_np; struct device_node *legacy_intc_np;
int num_msi_host_irqs; int num_msi_host_irqs;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment