6 files changed, 93 insertions, 63 deletions

diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c
index c0bc833df903..2735d03996cf 100644
--- a/arch/arm/mach-ux500/board-mop500-regulators.c
+++ b/arch/arm/mach-ux500/board-mop500-regulators.c
@@ -77,7 +77,7 @@ static struct regulator_consumer_supply ab8500_vtvout_consumers[] = {
 static struct regulator_consumer_supply ab8500_vintcore_consumers[] = {
         /* SoC core supply, no device */
         REGULATOR_SUPPLY("v-intcore", NULL),
-        /* USB Transciever */
+        /* USB Transceiver */
         REGULATOR_SUPPLY("vddulpivio18", "ab8500-usb.0"),
 };
 
diff --git a/arch/arm/mach-ux500/board-mop500-u8500uib.c b/arch/arm/mach-ux500/board-mop500-u8500uib.c
index d8a8734a0eba..8ce46c0fdfd5 100644
--- a/arch/arm/mach-ux500/board-mop500-u8500uib.c
+++ b/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/arch/arm/mach-ux500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c
index 44fd3b5c33ec..e58f0f562426 100644
--- a/arch/arm/mach-ux500/board-u5500.c
+++ b/arch/arm/mach-ux500/board-u5500.c
@@ -10,16 +10,97 @@
 #include <linux/amba/bus.h>
 #include <linux/gpio.h>
 #include <linux/irq.h>
+#include <linux/i2c.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
 
+#include <plat/pincfg.h>
+#include <plat/i2c.h>
+
 #include <mach/hardware.h>
 #include <mach/devices.h>
 #include <mach/setup.h>
 
+#include "pins-db5500.h"
 #include "devices-db5500.h"
+#include <linux/led-lm3530.h>
+
+/*
+ * GPIO
+ */
+
+static pin_cfg_t u5500_pins[] = {
+        /* I2C */
+        GPIO218_I2C2_SCL        | PIN_INPUT_PULLUP,
+        GPIO219_I2C2_SDA        | PIN_INPUT_PULLUP,
+
+        /* DISPLAY_ENABLE */
+        GPIO226_GPIO        | PIN_OUTPUT_LOW,
+
+        /* Backlight Enbale */
+        GPIO224_GPIO        | PIN_OUTPUT_HIGH,
+};
+/*
+ * I2C
+ */
+
+#define U5500_I2C_CONTROLLER(id, _slsu, _tft, _rft, clk, _sm) \
+static struct nmk_i2c_controller u5500_i2c##id##_data = { \
+        /*                              \
+         * slave data setup time, which is      \
+         * 250 ns,100ns,10ns which is 14,6,2    \
+         * respectively for a 48 Mhz    \
+         * i2c clock                    \
+         */                             \
+        .slsu           = _slsu,        \
+        /* Tx FIFO threshold */         \
+        .tft            = _tft,         \
+        /* Rx FIFO threshold */         \
+        .rft            = _rft,         \
+        /* std. mode operation */       \
+        .clk_freq       = clk,          \
+        .sm             = _sm,          \
+}
+/*
+ * The board uses TODO <3> i2c controllers, initialize all of
+ * them with slave data setup time of 250 ns,
+ * Tx & Rx FIFO threshold values as 1 and standard
+ * mode of operation
+ */
+
+U5500_I2C_CONTROLLER(2, 0xe, 1, 1, 400000, I2C_FREQ_MODE_FAST);
+
+static struct lm3530_platform_data u5500_als_platform_data = {
+        .mode = LM3530_BL_MODE_MANUAL,
+        .als_input_mode = LM3530_INPUT_ALS1,
+        .max_current = LM3530_FS_CURR_26mA,
+        .pwm_pol_hi = true,
+        .als_avrg_time = LM3530_ALS_AVRG_TIME_512ms,
+        .brt_ramp_law = 1,      /* Linear */
+        .brt_ramp_fall = LM3530_RAMP_TIME_8s,
+        .brt_ramp_rise = LM3530_RAMP_TIME_8s,
+        .als1_resistor_sel = LM3530_ALS_IMPD_13_53kOhm,
+        .als2_resistor_sel = LM3530_ALS_IMPD_Z,
+        .als_vmin = 730,        /* mV */
+        .als_vmax = 1020,       /* mV */
+        .brt_val = 0x7F,        /* Max brightness */
+};
 
+
+static struct i2c_board_info __initdata u5500_i2c2_devices[] = {
+        {
+                /* Backlight */
+                I2C_BOARD_INFO("lm3530-led", 0x36),
+                .platform_data = &u5500_als_platform_data,
+        },
+};
+
+static void __init u5500_i2c_init(void)
+{
+        db5500_add_i2c2(&u5500_i2c2_data);
+        i2c_register_board_info(2, ARRAY_AND_SIZE(u5500_i2c2_devices));
+}
 static void __init u5500_uart_init(void)
 {
         db5500_add_uart0(NULL);
@@ -30,7 +111,8 @@ static void __init u5500_uart_init(void)
 static void __init u5500_init_machine(void)
 {
         u5500_init_devices();
-
+        nmk_config_pins(u5500_pins, ARRAY_SIZE(u5500_pins));
+        u5500_i2c_init();
         u5500_sdi_init();
         u5500_uart_init();
 }
diff --git a/arch/arm/mach-ux500/clock.c b/arch/arm/mach-ux500/clock.c
index b4e786a0fa4f..e832664d1bd9 100644
--- a/arch/arm/mach-ux500/clock.c
+++ b/arch/arm/mach-ux500/clock.c
@@ -636,16 +636,13 @@ static const struct file_operations set_rate_fops = {
 static struct dentry *clk_debugfs_register_dir(struct clk *c,
                                                 struct dentry *p_dentry)
 {
-        struct dentry *d, *clk_d, *child, *child_tmp;
-        char s[255];
-        char *p = s;
+        struct dentry *d, *clk_d;
+        const char *p = c->name;
 
-        if (c->name == NULL)
-                p += sprintf(p, "BUG");
-        else
-                p += sprintf(p, "%s", c->name);
+        if (!p)
+                p = "BUG";
 
-        clk_d = debugfs_create_dir(s, p_dentry);
+        clk_d = debugfs_create_dir(p, p_dentry);
         if (!clk_d)
                 return NULL;
 
@@ -667,24 +664,10 @@ static struct dentry *clk_debugfs_register_dir(struct clk *c,
         return clk_d;
 
 err_out:
-        d = clk_d;
-        list_for_each_entry_safe(child, child_tmp, &d->d_subdirs, d_u.d_child)
-                debugfs_remove(child);
-        debugfs_remove(clk_d);
+        debugfs_remove_recursive(clk_d);
         return NULL;
 }
 
-static void clk_debugfs_remove_dir(struct dentry *cdentry)
-{
-        struct dentry *d, *child, *child_tmp;
-
-        d = cdentry;
-        list_for_each_entry_safe(child, child_tmp, &d->d_subdirs, d_u.d_child)
-                debugfs_remove(child);
-        debugfs_remove(cdentry);
-        return ;
-}
-
 static int clk_debugfs_register_one(struct clk *c)
 {
         struct clk *pa = c->parent_periph;
@@ -701,7 +684,7 @@ static int clk_debugfs_register_one(struct clk *c)
                 c->dent_bus = clk_debugfs_register_dir(c,
                                 bpa->dent_bus ? bpa->dent_bus : bpa->dent);
                 if ((!c->dent_bus) &&  (c->dent)) {
-                        clk_debugfs_remove_dir(c->dent);
+                        debugfs_remove_recursive(c->dent);
                         c->dent = NULL;
                         return -ENOMEM;
                 }
diff --git a/arch/arm/mach-ux500/include/mach/clkdev.h b/arch/arm/mach-ux500/include/mach/clkdev.h
deleted file mode 100644
index 04b37a89801c..000000000000
--- a/arch/arm/mach-ux500/include/mach/clkdev.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_MACH_CLKDEV_H
-#define __ASM_MACH_CLKDEV_H
-
-#define __clk_get(clk) ({ 1; })
-#define __clk_put(clk) do { } while (0)
-
-#endif
diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c
index 0c527fe2cebb..a33df5f4c27a 100644
--- a/arch/arm/mach-ux500/platsmp.c
+++ b/arch/arm/mach-ux500/platsmp.c
@@ -172,14 +172,6 @@ void __init smp_init_cpus(void)
 
 void __init platform_smp_prepare_cpus(unsigned int max_cpus)
 {
-        int i;
-
-        /*
-         * Initialise the present map, which describes the set of CPUs
-         * actually populated at the present time.
-         */
-        for (i = 0; i < max_cpus; i++)
-                set_cpu_present(i, true);
 
         scu_enable(scu_base_addr());
         wakeup_secondary();