Commit 5af7a6f3 authored by Michael Ellerman's avatar Michael Ellerman

powerpc/pasemi: Only the build the pasemi MSI code for PASEMI=y

The pasemi MSI code is currently always built when MPIC=y && PCI_MSI=y.
It should not have any effect on other platforms, because it immediately
checks the MPIC's compatible property for "pasemi,pwrficient-openpic".

However it's odd that it's still built even when PASEMI=n. It also
needn't be in sysdev, as it's only used by pasemi. So move it into
platforms/pasemi, whereby it will only be built for PASEMI=y.
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent f1e7c202
obj-y += setup.o pci.o time.o idle.o powersave.o iommu.o dma_lib.o misc.o obj-y += setup.o pci.o time.o idle.o powersave.o iommu.o dma_lib.o misc.o
obj-$(CONFIG_PPC_PASEMI_MDIO) += gpio_mdio.o obj-$(CONFIG_PPC_PASEMI_MDIO) += gpio_mdio.o
obj-$(CONFIG_PCI_MSI) += msi.o
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
* *
*/ */
#undef DEBUG
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/msi.h> #include <linux/msi.h>
#include <asm/mpic.h> #include <asm/mpic.h>
...@@ -23,7 +21,7 @@ ...@@ -23,7 +21,7 @@
#include <asm/ppc-pci.h> #include <asm/ppc-pci.h>
#include <asm/msi_bitmap.h> #include <asm/msi_bitmap.h>
#include "mpic.h" #include <sysdev/mpic.h>
/* Allocate 16 interrupts per device, to give an alignment of 16, /* Allocate 16 interrupts per device, to give an alignment of 16,
* since that's the size of the grouping w.r.t. affinity. If someone * since that's the size of the grouping w.r.t. affinity. If someone
......
...@@ -2,7 +2,7 @@ subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror ...@@ -2,7 +2,7 @@ subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror
ccflags-$(CONFIG_PPC64) := $(NO_MINIMAL_TOC) ccflags-$(CONFIG_PPC64) := $(NO_MINIMAL_TOC)
mpic-msi-obj-$(CONFIG_PCI_MSI) += mpic_msi.o mpic_u3msi.o mpic_pasemi_msi.o mpic-msi-obj-$(CONFIG_PCI_MSI) += mpic_msi.o mpic_u3msi.o
obj-$(CONFIG_MPIC) += mpic.o $(mpic-msi-obj-y) obj-$(CONFIG_MPIC) += mpic.o $(mpic-msi-obj-y)
obj-$(CONFIG_MPIC_TIMER) += mpic_timer.o obj-$(CONFIG_MPIC_TIMER) += mpic_timer.o
obj-$(CONFIG_FSL_MPIC_TIMER_WAKEUP) += fsl_mpic_timer_wakeup.o obj-$(CONFIG_FSL_MPIC_TIMER_WAKEUP) += fsl_mpic_timer_wakeup.o
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
extern void mpic_msi_reserve_hwirq(struct mpic *mpic, irq_hw_number_t hwirq); extern void mpic_msi_reserve_hwirq(struct mpic *mpic, irq_hw_number_t hwirq);
extern int mpic_msi_init_allocator(struct mpic *mpic); extern int mpic_msi_init_allocator(struct mpic *mpic);
extern int mpic_u3msi_init(struct mpic *mpic); extern int mpic_u3msi_init(struct mpic *mpic);
extern int mpic_pasemi_msi_init(struct mpic *mpic);
#else #else
static inline void mpic_msi_reserve_hwirq(struct mpic *mpic, static inline void mpic_msi_reserve_hwirq(struct mpic *mpic,
irq_hw_number_t hwirq) irq_hw_number_t hwirq)
...@@ -27,11 +26,12 @@ static inline int mpic_u3msi_init(struct mpic *mpic) ...@@ -27,11 +26,12 @@ static inline int mpic_u3msi_init(struct mpic *mpic)
{ {
return -1; return -1;
} }
#endif
static inline int mpic_pasemi_msi_init(struct mpic *mpic) #if defined(CONFIG_PCI_MSI) && defined(CONFIG_PPC_PASEMI)
{ int mpic_pasemi_msi_init(struct mpic *mpic);
return -1; #else
} static inline int mpic_pasemi_msi_init(struct mpic *mpic) { return -1; }
#endif #endif
extern int mpic_set_irq_type(struct irq_data *d, unsigned int flow_type); extern int mpic_set_irq_type(struct irq_data *d, unsigned int flow_type);
......
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