diff --git a/drivers/irqchip/Kbuild b/drivers/irqchip/Kbuild
index 15a4fe33a7f9..05d3c74b7166 100644
--- a/drivers/irqchip/Kbuild
+++ b/drivers/irqchip/Kbuild
@@ -1,8 +1,13 @@
 # add -Wall to try to catch everything we can.
 EXTRA_CFLAGS += -Wall
 EXTRA_CFLAGS += -I$(TOP)/motorola/kernel/modules/include
-EXTRA_CFLAGS += -DCONFIG_MADERA_IRQ_CS47L90
 
+ifeq ($(CONFIG_ARCH_SDM450), y)
+EXTRA_CFLAGS += -DCONFIG_MADERA_IRQ_CS47L35
+cirrus_irq-madera-objs = irq-madera.o irq-madera-cs47l35.o
+else
+EXTRA_CFLAGS += -DCONFIG_MADERA_IRQ_CS47L90
 cirrus_irq-madera-objs = irq-madera.o irq-madera-cs47l90.o
+endif
 
 obj-m += cirrus_irq-madera.o
diff --git a/drivers/mfd/Kbuild b/drivers/mfd/Kbuild
index bd0e33e659dc..67ff2cd39094 100644
--- a/drivers/mfd/Kbuild
+++ b/drivers/mfd/Kbuild
@@ -1,7 +1,12 @@
 # add -Wall to try to catch everything we can.
 EXTRA_CFLAGS += -Wall
 EXTRA_CFLAGS += -I$(TOP)/motorola/kernel/modules/include
+ifeq ($(CONFIG_ARCH_SDM450), y)
+EXTRA_CFLAGS += -DCONFIG_MFD_CS47L35
+cirrus_madera-core-objs = madera-core.o madera-spi.o madera-core.o madera-spi.o cs47l35-tables.o
+else
 EXTRA_CFLAGS += -DCONFIG_MFD_CS47L90
-
 cirrus_madera-core-objs = madera-core.o madera-spi.o madera-core.o madera-spi.o cs47l90-tables.o
+endif
+
 obj-m += cirrus_madera-core.o