2 files changed, 16 insertions, 0 deletions

diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index 6625e5bbf4d6..23fe018cd10b 100644
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -39,4 +39,18 @@ config UX500_DEBUG_UART
           Choose the UART on which kernel low-level debug messages should be
           output.
 
+config U5500_MODEM_IRQ
+        bool "Modem IRQ support"
+        depends on MACH_U5500
+        default y
+        help
+          Add support for handling IRQ:s from modem side
+
+config U5500_MBOX
+        bool "Mailbox support"
+        depends on MACH_U5500 && U5500_MODEM_IRQ
+        default y
+        help
+          Add support for U5500 mailbox communication with modem side
+
 endif
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile
index 46dbaf640422..9e27a84433cb 100644
--- a/arch/arm/mach-ux500/Makefile
+++ b/arch/arm/mach-ux500/Makefile
@@ -11,3 +11,5 @@ obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o
 obj-$(CONFIG_HOTPLUG_CPU)       += hotplug.o
 obj-$(CONFIG_LOCAL_TIMERS)      += localtimer.o
 obj-$(CONFIG_REGULATOR_AB8500)  += board-mop500-regulators.o
+obj-$(CONFIG_U5500_MODEM_IRQ)   += modem_irq.o
+obj-$(CONFIG_U5500_MBOX)        += mbox.o