From fc9c83dd6de805300c2bbfde93f514c210848365 Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
Date: Thu, 30 Jun 2011 08:31:59 +0200
Subject: [PATCH] --- yaml --- r: 259989 b: refs/heads/master c:
 857f727674f45157ec9a5d788c8954d9f082acb7 h: refs/heads/master i:   259987:
 bc5208ce1f0e4ebb0733333f7f70b70018e5149d v: v3

---
 [refs]                                        |  2 +-
 .../arm/mach-ux500/board-mop500-u8500uib.c    | 24 ++------------
 trunk/drivers/staging/ste_rmi4/Makefile       |  1 +
 .../ste_rmi4/board-mop500-u8500uib-rmi4.c     | 32 +++++++++++++++++++
 4 files changed, 36 insertions(+), 23 deletions(-)
 create mode 100644 trunk/drivers/staging/ste_rmi4/board-mop500-u8500uib-rmi4.c

diff --git a/[refs] b/[refs]
index 2b42542aa68e..ec7286c2743c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6977a271d45951b8e7ed5eb8caf659fbd69ee365
+refs/heads/master: 857f727674f45157ec9a5d788c8954d9f082acb7
diff --git a/trunk/arch/arm/mach-ux500/board-mop500-u8500uib.c b/trunk/arch/arm/mach-ux500/board-mop500-u8500uib.c
index d8a8734a0eba..8ce46c0fdfd5 100644
--- a/trunk/arch/arm/mach-ux500/board-mop500-u8500uib.c
+++ b/trunk/arch/arm/mach-ux500/board-mop500-u8500uib.c
@@ -12,34 +12,14 @@
 #include <linux/interrupt.h>
 #include <linux/mfd/tc3589x.h>
 #include <linux/input/matrix_keypad.h>
-#include <../drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h>
 
 #include <mach/gpio.h>
 #include <mach/irqs.h>
 
 #include "board-mop500.h"
 
-/*
- * Synaptics RMI4 touchscreen interface on the U8500 UIB
- */
-
-/*
- * Descriptor structure.
- * Describes the number of i2c devices on the bus that speak RMI.
- */
-static struct synaptics_rmi4_platform_data rmi4_i2c_dev_platformdata = {
-	.irq_number     = NOMADIK_GPIO_TO_IRQ(84),
-	.irq_type       = (IRQF_TRIGGER_FALLING | IRQF_SHARED),
-	.x_flip		= false,
-	.y_flip		= true,
-	.regulator_en   = false,
-};
-
-static struct i2c_board_info __initdata mop500_i2c3_devices_u8500[] = {
-	{
-		I2C_BOARD_INFO("synaptics_rmi4_i2c", 0x4B),
-		.platform_data = &rmi4_i2c_dev_platformdata,
-	},
+/* Dummy data that can be overridden by staging driver */
+struct i2c_board_info __initdata __weak mop500_i2c3_devices_u8500[] = {
 };
 
 /*
diff --git a/trunk/drivers/staging/ste_rmi4/Makefile b/trunk/drivers/staging/ste_rmi4/Makefile
index 6cce2ed187ef..176f46900571 100644
--- a/trunk/drivers/staging/ste_rmi4/Makefile
+++ b/trunk/drivers/staging/ste_rmi4/Makefile
@@ -2,3 +2,4 @@
 # Makefile for the RMI4 touchscreen driver.
 #
 obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4) += synaptics_i2c_rmi4.o
+obj-$(CONFIG_MACH_U8500) += board-mop500-u8500uib-rmi4.o
diff --git a/trunk/drivers/staging/ste_rmi4/board-mop500-u8500uib-rmi4.c b/trunk/drivers/staging/ste_rmi4/board-mop500-u8500uib-rmi4.c
new file mode 100644
index 000000000000..a272e488e5b9
--- /dev/null
+++ b/trunk/drivers/staging/ste_rmi4/board-mop500-u8500uib-rmi4.c
@@ -0,0 +1,32 @@
+/*
+ * Some platform data for the RMI4 touchscreen that will override the __weak
+ * platform data in the Ux500 machine if this driver is activated.
+ */
+#include <linux/i2c.h>
+#include <linux/gpio.h>
+#include <linux/interrupt.h>
+#include <mach/gpio.h>
+#include <mach/irqs.h>
+#include "synaptics_i2c_rmi4.h"
+
+/*
+ * Synaptics RMI4 touchscreen interface on the U8500 UIB
+ */
+
+/*
+ * Descriptor structure.
+ * Describes the number of i2c devices on the bus that speak RMI.
+ */
+static struct synaptics_rmi4_platform_data rmi4_i2c_dev_platformdata = {
+	.irq_number     = NOMADIK_GPIO_TO_IRQ(84),
+	.irq_type       = (IRQF_TRIGGER_FALLING | IRQF_SHARED),
+	.x_flip		= false,
+	.y_flip		= true,
+};
+
+struct i2c_board_info __initdata mop500_i2c3_devices_u8500[] = {
+	{
+		I2C_BOARD_INFO("synaptics_rmi4_i2c", 0x4B),
+		.platform_data = &rmi4_i2c_dev_platformdata,
+	},
+};