omap:build- Add build support for remoteproc ipudev and hwspinlock

This patch adds support to build the remoteproc, ipudev and
hwspinlock code for OMAP4. This was absent in the linux-omap
2.6.38 code.

Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Ramesh Gupta G <grgupta@ti.com>
Signed-off-by: Simon Que <sque@ti.com>
Signed-off-by: Paul Hunt <hunt@ti.com>
Signed-off-by: Subramaniam C.A <subramaniam.ca@ti.com>

3 files changed, 7 insertions, 6 deletions

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 3f5c916f666..249f3a46f21 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -168,9 +168,12 @@ iommu-$(CONFIG_OMAP_IOMMU)		:= omap-iommu.o
 obj-y                                   += $(iommu-m) $(iommu-y)
 
 ifeq ($(CONFIG_OMAP_REMOTE_PROC),y)
-obj-$(CONFIG_ARCH_OMAP2)                += remoteproc24xx.o
-obj-$(CONFIG_ARCH_OMAP3)                += remoteproc3xxx.o
+#obj-$(CONFIG_ARCH_OMAP2)               += remoteproc24xx.o
+#obj-$(CONFIG_ARCH_OMAP3)               += remoteproc3xxx.o
 obj-$(CONFIG_ARCH_OMAP4)                += remoteproc44xx.o
+obj-$(CONFIG_MPU_SYSLINK_IPC)           += ipu_drv.o
+obj-$(CONFIG_MPU_SYSLINK_IPC)           += ipu_dev.o
+obj-$(CONFIG_MPU_SYSLINK_IPC)           += ipu_utility.o
 endif
 
 i2c-omap-$(CONFIG_I2C_OMAP)             := i2c.o
@@ -269,6 +272,7 @@ obj-y					+= $(nand-m) $(nand-y)
 
 smc91x-$(CONFIG_SMC91X)                 := gpmc-smc91x.o
 obj-y                                   += $(smc91x-m) $(smc91x-y)
+obj-$(CONFIG_ARCH_OMAP4)                += hwspinlocks.o
 
 smsc911x-$(CONFIG_SMSC911X)             := gpmc-smsc911x.o
 obj-y                                   += $(smsc911x-m) $(smsc911x-y)
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index cd737735ff7..68bd7f4a905 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -145,10 +145,6 @@ config OMAP_USER_DMM
         tristate
         select GENERIC_ALLOCATOR
 
-config OMAP_USER_DMM
-        tristate
-        select GENERIC_ALLOCATOR
-
 config OMAP_IOMMU_DEBUG
        tristate "Export OMAP IOMMU internals in DebugFS"
        depends on OMAP_IOMMU && DEBUG_FS
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index 98c78a5250b..3321d8fa3df 100644
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -35,3 +35,4 @@ obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox.o
 obj-$(CONFIG_OMAP_REMOTE_PROC) += remoteproc.o
 
 obj-$(CONFIG_OMAP_PM_NOOP) += omap-pm-noop.o
+obj-$(CONFIG_ARCH_OMAP4) += hwspinlock.o