mach-ux500: Fix build problems temporary

Very temporary fixes to make it build until we have proper
fixes for this issues.

Change-Id: I881502ddcfb84452515e82c700507994c1289a2c
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>

12 files changed, 41 insertions, 27 deletions

diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index de604dbe54f..04f2cb5c1cb 100644
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -4,7 +4,7 @@ config UX500_SOC_COMMON
 	bool
 	default y
 	select ARM_GIC
-	select HAS_MTU
+	# select HAS_MTU
 	select NOMADIK_GPIO
 	select ARM_ERRATA_753970
 	select SYS_SOC
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile
index 5252fc085a7..fcdc8620de9 100644
--- a/arch/arm/mach-ux500/Makefile
+++ b/arch/arm/mach-ux500/Makefile
@@ -7,13 +7,13 @@ obj-y				:= clock.o cpu.o devices.o dcache.o \
 				   timer.o timer-mtu.o usb.o reboot_reasons.o
 obj-y				+= pm/
 ifeq ($(CONFIG_UX500_SOC_DB5500), y)
-obj-$(CONFIG_UX500_SOC_DBX500)	+= cpu-db5500.o dma-db5500.o prcmu-db5500.o \
+obj-$(CONFIG_UX500_SOC_DBX500)	+= cpu-db5500.o dma-db5500.o \
 				   devices-db5500.o clock-db5500.o \
 				   clock-debug.o
 endif
 ifeq ($(CONFIG_UX500_SOC_DB8500), y)
 obj-$(CONFIG_UX500_SOC_DBX500)	+= cpu-db8500.o devices-db8500.o \
-				   prcmu-db8500.o clock-db8500.o
+				   clock-db8500.o
 endif
 obj-$(CONFIG_MACH_U8500)	+= board-mop500.o board-mop500-sdi.o \
 				board-mop500-regulators.o \
diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c
index d20f2b16185..396a26ed5b5 100644
--- a/arch/arm/mach-ux500/board-mop500-sdi.c
+++ b/arch/arm/mach-ux500/board-mop500-sdi.c
@@ -141,10 +141,6 @@ static struct mmci_platform_data mop500_sdi1_data = {
 };
 #endif /* CONFIG_CW1200 */
 
-/* GPIO pins used by the sdi0 level shifter */
-static int sdi0_en = -1;
-static int sdi0_vsel = -1;
-
 static void sdi0_sdi1_configure(void)
 {
 	int ret;
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index b7c5375fbf5..0287382d9a7 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -876,9 +876,8 @@ static struct platform_device *snowball_platform_devs[] __initdata = {
 	&snowball_led_dev,
 	&snowball_key_dev,
 	&snowball_sbnet_dev,
-	&ab8500_device,
+//	&ab8500_device,
 	&snowball_gpio_wlan_vbat_regulator_device,
-	&ux500_hwmem_device,
 	&u8500_mcde_device,
 	&u8500_b2r2_device,
 };
@@ -889,10 +888,12 @@ static struct platform_device *snowball_platform_devs[] __initdata = {
 */
 static void accessory_detect_config(void)
 {
+#ifdef CONFIG_INPUT_AB8500_ACCDET
 	if (machine_is_hrefv60())
 		ab8500_accdet_pdata.is_detection_inverted = true;
 	else
 		ab8500_accdet_pdata.is_detection_inverted = false;
+#endif
 }
 
 static void __init mop500_init_machine(void)
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 78a3e624138..643f4465506 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -496,13 +496,14 @@ static ssize_t ux500_get_process(char *buf, struct sysfs_soc_info *si)
 
 static ssize_t ux500_get_reset_code(char *buf, struct sysfs_soc_info *si)
 {
-	return sprintf(buf, "0x%04x\n", prcmu_get_reset_code());
+	return 0;
+	// return sprintf(buf, "0x%04x\n", prcmu_get_reset_code());
 }
 
 static ssize_t ux500_get_reset_reason(char *buf, struct sysfs_soc_info *si)
 {
-	return sprintf(buf, "%s\n",
-		reboot_reason_string(prcmu_get_reset_code()));
+	return 0;
+	// return sprintf(buf, "%s\n", reboot_reason_string(prcmu_get_reset_code()));
 }
 
 static struct sysfs_soc_info soc_info[] = {
@@ -511,7 +512,7 @@ static struct sysfs_soc_info soc_info[] = {
 	SYSFS_SOC_ATTR_CALLBACK("soc_id", ux500_get_soc_id),
 	SYSFS_SOC_ATTR_CALLBACK("revision", ux500_get_revision),
 	SYSFS_SOC_ATTR_CALLBACK("process", ux500_get_process),
-	SYSFS_SOC_ATTR_CALLBACK("reset_code", ux500_get_reset_code),
+//	SYSFS_SOC_ATTR_CALLBACK("reset_code", ux500_get_reset_code),
 	SYSFS_SOC_ATTR_CALLBACK("reset_reason", ux500_get_reset_reason),
 };
 
diff --git a/arch/arm/mach-ux500/hotplug.c b/arch/arm/mach-ux500/hotplug.c
index 51020c2423d..607567f2618 100644
--- a/arch/arm/mach-ux500/hotplug.c
+++ b/arch/arm/mach-ux500/hotplug.c
@@ -39,15 +39,16 @@ static inline void platform_do_lowpower(unsigned int cpu)
 		context_restore_cpu_registers();
 		context_varm_restore_core();
 
-	/* we put the platform to just WFI */
-	for (;;) {
-		__asm__ __volatile__("dsb\n\t" "wfi\n\t"
-				: : : "memory");
-		if (pen_release == cpu) {
-			/*
-			 * OK, proper wakeup, we're done
-			 */
-			break;
+		/* we put the platform to just WFI */
+		for (;;) {
+			__asm__ __volatile__("dsb\n\t" "wfi\n\t"
+					: : : "memory");
+			if (pen_release == cpu) {
+				/*
+				 * OK, proper wakeup, we're done
+				 */
+				break;
+			}
 		}
 	}
 }
@@ -76,3 +77,4 @@ int platform_cpu_disable(unsigned int cpu)
 	 */
 	return cpu == 0 ? -EPERM : 0;
 }
+
diff --git a/arch/arm/mach-ux500/include/mach/prcmu.h b/arch/arm/mach-ux500/include/mach/prcmu.h
index 9d28ef9cbc0..1c608c35f96 100644
--- a/arch/arm/mach-ux500/include/mach/prcmu.h
+++ b/arch/arm/mach-ux500/include/mach/prcmu.h
@@ -9,8 +9,9 @@
 #define __MACH_PRCMU_H
 
 #include <linux/interrupt.h>
-#include <mach/prcmu-qos.h>
+//#include <mach/prcmu-qos.h>
 
+#if 0
 /* PRCMU Wakeup defines */
 enum prcmu_wakeup_index {
 	PRCMU_WAKEUP_INDEX_RTC,
@@ -200,8 +201,12 @@ enum ddr_opp {
 	DDR_25_OPP = 0x02,
 };
 
-#include <mach/prcmu-db8500.h>
-#include <mach/prcmu-db5500.h>
+#endif
+
+#include <linux/mfd/db8500-prcmu.h>
+#include <linux/mfd/db5500-prcmu.h>
+
+#if 0
 
 #if defined(CONFIG_UX500_SOC_DB8500) || defined(CONFIG_UX500_SOC_DB5500)
 
@@ -347,4 +352,6 @@ static inline int prcmu_enable_dsipll(void)
 
 #endif
 
+#endif
+
 #endif /* __MACH_PRCMU_H */
diff --git a/arch/arm/mach-ux500/pm/context.c b/arch/arm/mach-ux500/pm/context.c
index ccabc5375ba..59b4a74d124 100644
--- a/arch/arm/mach-ux500/pm/context.c
+++ b/arch/arm/mach-ux500/pm/context.c
@@ -19,6 +19,8 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 
+#include <asm/hardware/gic.h>
+
 #include <mach/hardware.h>
 #include <mach/irqs.h>
 #include <mach/scu.h>
diff --git a/arch/arm/mach-ux500/pm/pm.c b/arch/arm/mach-ux500/pm/pm.c
index 3c39f837321..890058ca61a 100644
--- a/arch/arm/mach-ux500/pm/pm.c
+++ b/arch/arm/mach-ux500/pm/pm.c
@@ -10,12 +10,13 @@
 #include <linux/percpu.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/gpio.h>
+#include <asm/processor.h>
 
 #include <asm/hardware/gic.h>
 
 #include <mach/hardware.h>
 #include <mach/prcmu-regs.h>
-#include <mach/gpio.h>
 
 #include "pm.h"
 
diff --git a/arch/arm/mach-ux500/prcmu-db8500.c b/arch/arm/mach-ux500/prcmu-db8500.c
index 7de5f73f914..5e6ff1b9601 100644
--- a/arch/arm/mach-ux500/prcmu-db8500.c
+++ b/arch/arm/mach-ux500/prcmu-db8500.c
@@ -35,8 +35,10 @@
 
 #include <mach/hardware.h>
 #include <mach/irqs.h>
+
 #include "prcmu-regs-db8500.h"
 #include "prcmu-debug.h"
+
 #include <mach/prcmu.h>
 #include <mach/db8500-regs.h>
 #include <mach/id.h>
diff --git a/arch/arm/mach-ux500/regulator-ux500.c b/arch/arm/mach-ux500/regulator-ux500.c
index 91b81896cab..750a5b53d63 100644
--- a/arch/arm/mach-ux500/regulator-ux500.c
+++ b/arch/arm/mach-ux500/regulator-ux500.c
@@ -53,6 +53,7 @@ out:
 	return ret;
 }
 
+#if 0
 /*
  * Exported interface for CPUIdle only. This function is called when interrupts
  * are turned off. Hence, no locking.
@@ -61,6 +62,7 @@ int power_state_active_is_enabled(void)
 {
 	return (power_state_active_cnt > 0);
 }
+#endif
 
 struct ux500_regulator {
 	char *name;
diff --git a/arch/arm/mach-ux500/timer-mtu.c b/arch/arm/mach-ux500/timer-mtu.c
index 1b997065a5d..b06559787c6 100644
--- a/arch/arm/mach-ux500/timer-mtu.c
+++ b/arch/arm/mach-ux500/timer-mtu.c
@@ -20,7 +20,7 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/jiffies.h>
-#include <linux/boottime.h>
+//#include <linux/boottime.h>
 #include <linux/cnt32_to_63.h>
 #include <asm/mach/time.h>
 #include <plat/mtu.h>