Merge tag 'mfd-3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next

Pull MFD update from Samuel Ortiz:
 "For 3.10 we have a few new MFD drivers for:

   - The ChromeOS embedded controller which provides keyboard, battery
     and power management services.  This controller is accessible
     through i2c or SPI.

   - Silicon Laboratories 476x controller, providing access to their FM
     chipset and their audio codec.

   - Realtek's RTS5249, a memory stick, MMC and SD/SDIO PCI based
     reader.

   - Nokia's Tahvo power button and watchdog device.  This device is
     very similar to Retu and is thus supported by the same code base.

   - STMicroelectronics STMPE1801, a keyboard and GPIO controller
     supported by the stmpe driver.

   - ST-Ericsson AB8540 and AB8505 power management and voltage
     converter controllers through the existing ab8500 code.

  Some other drivers got cleaned up or improved.  In particular:

   - The Linaro/STE guys got the ab8500 driver in sync with their
     internal code through a series of optimizations, fixes and
     improvements.

   - The AS3711 and OMAP USB drivers now have DT support.

   - The arizona clock and interrupt handling code got improved.

   - The wm5102 register patch and boot mechanism also got improved."

* tag 'mfd-3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next: (104 commits)
  mfd: si476x: Don't use 0bNNN
  mfd: vexpress: Handle pending config transactions
  mfd: ab8500: Export ab8500_gpadc_sw_hw_convert properly
  mfd: si476x: Fix i2c warning
  mfd: si476x: Add header files and Kbuild plumbing
  mfd: si476x: Add chip properties handling code
  mfd: si476x: Add the bulk of the core driver
  mfd: si476x: Add commands abstraction layer
  mfd: rtsx: Support RTS5249
  mfd: retu: Add Tahvo support
  mfd: ucb1400: Pass ucb1400-gpio data through ac97 bus
  mfd: wm8994: Add some OF properties
  mfd: wm8994: Add device ID data to WM8994 OF device IDs
  input: Export matrix_keypad_parse_of_params()
  mfd: tps65090: Add compatible string for charger subnode
  mfd: db8500-prcmu: Support platform dependant device selection
  mfd: syscon: Fix warnings when printing resource_size_t
  of: Add stub of_get_parent for non-OF builds
  mfd: omap-usb-tll: Convert to devm_ioremap_resource()
  mfd: omap-usb-host: Convert to devm_ioremap_resource()
  ...

7 files changed, 383 insertions, 18 deletions

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index ac0500667000..6a195d5e90ff 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -628,4 +628,16 @@ config KEYBOARD_W90P910
           To compile this driver as a module, choose M here: the
           module will be called w90p910_keypad.
 
+config KEYBOARD_CROS_EC
+        tristate "ChromeOS EC keyboard"
+        select INPUT_MATRIXKMAP
+        depends on MFD_CROS_EC
+        help
+          Say Y here to enable the matrix keyboard used by ChromeOS devices
+          and implemented on the ChromeOS EC. You must enable one bus option
+          (MFD_CROS_EC_I2C or MFD_CROS_EC_SPI) to use this.
+
+          To compile this driver as a module, choose M here: the
+          module will be called cros_ec_keyb.
+
 endif
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index 49b16453d00e..0c43e8cf8d0e 100644
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_KEYBOARD_AMIGA)		+= amikbd.o
 obj-$(CONFIG_KEYBOARD_ATARI)            += atakbd.o
 obj-$(CONFIG_KEYBOARD_ATKBD)            += atkbd.o
 obj-$(CONFIG_KEYBOARD_BFIN)             += bf54x-keys.o
+obj-$(CONFIG_KEYBOARD_CROS_EC)          += cros_ec_keyb.o
 obj-$(CONFIG_KEYBOARD_DAVINCI)          += davinci_keyscan.o
 obj-$(CONFIG_KEYBOARD_EP93XX)           += ep93xx_keypad.o
 obj-$(CONFIG_KEYBOARD_GOLDFISH_EVENTS)  += goldfish_events.o
diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c
new file mode 100644
index 000000000000..49557f27bfa6
--- /dev/null
+++ b/drivers/input/keyboard/cros_ec_keyb.c
@@ -0,0 +1,334 @@
+/*
+ * ChromeOS EC keyboard driver
+ *
+ * Copyright (C) 2012 Google, Inc
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * This driver uses the Chrome OS EC byte-level message-based protocol for
+ * communicating the keyboard state (which keys are pressed) from a keyboard EC
+ * to the AP over some bus (such as i2c, lpc, spi).  The EC does debouncing,
+ * but everything else (including deghosting) is done here.  The main
+ * motivation for this is to keep the EC firmware as simple as possible, since
+ * it cannot be easily upgraded and EC flash/IRAM space is relatively
+ * expensive.
+ */
+
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/input.h>
+#include <linux/kernel.h>
+#include <linux/notifier.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/input/matrix_keypad.h>
+#include <linux/mfd/cros_ec.h>
+#include <linux/mfd/cros_ec_commands.h>
+
+/*
+ * @rows: Number of rows in the keypad
+ * @cols: Number of columns in the keypad
+ * @row_shift: log2 or number of rows, rounded up
+ * @keymap_data: Matrix keymap data used to convert to keyscan values
+ * @ghost_filter: true to enable the matrix key-ghosting filter
+ * @dev: Device pointer
+ * @idev: Input device
+ * @ec: Top level ChromeOS device to use to talk to EC
+ * @event_notifier: interrupt event notifier for transport devices
+ */
+struct cros_ec_keyb {
+        unsigned int rows;
+        unsigned int cols;
+        int row_shift;
+        const struct matrix_keymap_data *keymap_data;
+        bool ghost_filter;
+
+        struct device *dev;
+        struct input_dev *idev;
+        struct cros_ec_device *ec;
+        struct notifier_block notifier;
+};
+
+
+static bool cros_ec_keyb_row_has_ghosting(struct cros_ec_keyb *ckdev,
+                                          uint8_t *buf, int row)
+{
+        int pressed_in_row = 0;
+        int row_has_teeth = 0;
+        int col, mask;
+
+        mask = 1 << row;
+        for (col = 0; col < ckdev->cols; col++) {
+                if (buf[col] & mask) {
+                        pressed_in_row++;
+                        row_has_teeth |= buf[col] & ~mask;
+                        if (pressed_in_row > 1 && row_has_teeth) {
+                                /* ghosting */
+                                dev_dbg(ckdev->dev,
+                                        "ghost found at: r%d c%d, pressed %d, teeth 0x%x\n",
+                                        row, col, pressed_in_row,
+                                        row_has_teeth);
+                                return true;
+                        }
+                }
+        }
+
+        return false;
+}
+
+/*
+ * Returns true when there is at least one combination of pressed keys that
+ * results in ghosting.
+ */
+static bool cros_ec_keyb_has_ghosting(struct cros_ec_keyb *ckdev, uint8_t *buf)
+{
+        int row;
+
+        /*
+         * Ghosting happens if for any pressed key X there are other keys
+         * pressed both in the same row and column of X as, for instance,
+         * in the following diagram:
+         *
+         * . . Y . g .
+         * . . . . . .
+         * . . . . . .
+         * . . X . Z .
+         *
+         * In this case only X, Y, and Z are pressed, but g appears to be
+         * pressed too (see Wikipedia).
+         *
+         * We can detect ghosting in a single pass (*) over the keyboard state
+         * by maintaining two arrays.  pressed_in_row counts how many pressed
+         * keys we have found in a row.  row_has_teeth is true if any of the
+         * pressed keys for this row has other pressed keys in its column.  If
+         * at any point of the scan we find that a row has multiple pressed
+         * keys, and at least one of them is at the intersection with a column
+         * with multiple pressed keys, we're sure there is ghosting.
+         * Conversely, if there is ghosting, we will detect such situation for
+         * at least one key during the pass.
+         *
+         * (*) This looks linear in the number of keys, but it's not.  We can
+         * cheat because the number of rows is small.
+         */
+        for (row = 0; row < ckdev->rows; row++)
+                if (cros_ec_keyb_row_has_ghosting(ckdev, buf, row))
+                        return true;
+
+        return false;
+}
+
+/*
+ * Compares the new keyboard state to the old one and produces key
+ * press/release events accordingly.  The keyboard state is 13 bytes (one byte
+ * per column)
+ */
+static void cros_ec_keyb_process(struct cros_ec_keyb *ckdev,
+                         uint8_t *kb_state, int len)
+{
+        struct input_dev *idev = ckdev->idev;
+        int col, row;
+        int new_state;
+        int num_cols;
+
+        num_cols = len;
+
+        if (ckdev->ghost_filter && cros_ec_keyb_has_ghosting(ckdev, kb_state)) {
+                /*
+                 * Simple-minded solution: ignore this state. The obvious
+                 * improvement is to only ignore changes to keys involved in
+                 * the ghosting, but process the other changes.
+                 */
+                dev_dbg(ckdev->dev, "ghosting found\n");
+                return;
+        }
+
+        for (col = 0; col < ckdev->cols; col++) {
+                for (row = 0; row < ckdev->rows; row++) {
+                        int pos = MATRIX_SCAN_CODE(row, col, ckdev->row_shift);
+                        const unsigned short *keycodes = idev->keycode;
+                        int code;
+
+                        code = keycodes[pos];
+                        new_state = kb_state[col] & (1 << row);
+                        if (!!new_state != test_bit(code, idev->key)) {
+                                dev_dbg(ckdev->dev,
+                                        "changed: [r%d c%d]: byte %02x\n",
+                                        row, col, new_state);
+
+                                input_report_key(idev, code, new_state);
+                        }
+                }
+        }
+        input_sync(ckdev->idev);
+}
+
+static int cros_ec_keyb_open(struct input_dev *dev)
+{
+        struct cros_ec_keyb *ckdev = input_get_drvdata(dev);
+
+        return blocking_notifier_chain_register(&ckdev->ec->event_notifier,
+                                                &ckdev->notifier);
+}
+
+static void cros_ec_keyb_close(struct input_dev *dev)
+{
+        struct cros_ec_keyb *ckdev = input_get_drvdata(dev);
+
+        blocking_notifier_chain_unregister(&ckdev->ec->event_notifier,
+                                           &ckdev->notifier);
+}
+
+static int cros_ec_keyb_get_state(struct cros_ec_keyb *ckdev, uint8_t *kb_state)
+{
+        return ckdev->ec->command_recv(ckdev->ec, EC_CMD_MKBP_STATE,
+                                          kb_state, ckdev->cols);
+}
+
+static int cros_ec_keyb_work(struct notifier_block *nb,
+                     unsigned long state, void *_notify)
+{
+        int ret;
+        struct cros_ec_keyb *ckdev = container_of(nb, struct cros_ec_keyb,
+                                                    notifier);
+        uint8_t kb_state[ckdev->cols];
+
+        ret = cros_ec_keyb_get_state(ckdev, kb_state);
+        if (ret >= 0)
+                cros_ec_keyb_process(ckdev, kb_state, ret);
+
+        return NOTIFY_DONE;
+}
+
+/* Clear any keys in the buffer */
+static void cros_ec_keyb_clear_keyboard(struct cros_ec_keyb *ckdev)
+{
+        uint8_t old_state[ckdev->cols];
+        uint8_t new_state[ckdev->cols];
+        unsigned long duration;
+        int i, ret;
+
+        /*
+         * Keep reading until we see that the scan state does not change.
+         * That indicates that we are done.
+         *
+         * Assume that the EC keyscan buffer is at most 32 deep.
+         */
+        duration = jiffies;
+        ret = cros_ec_keyb_get_state(ckdev, new_state);
+        for (i = 1; !ret && i < 32; i++) {
+                memcpy(old_state, new_state, sizeof(old_state));
+                ret = cros_ec_keyb_get_state(ckdev, new_state);
+                if (0 == memcmp(old_state, new_state, sizeof(old_state)))
+                        break;
+        }
+        duration = jiffies - duration;
+        dev_info(ckdev->dev, "Discarded %d keyscan(s) in %dus\n", i,
+                jiffies_to_usecs(duration));
+}
+
+static int cros_ec_keyb_probe(struct platform_device *pdev)
+{
+        struct cros_ec_device *ec = dev_get_drvdata(pdev->dev.parent);
+        struct device *dev = ec->dev;
+        struct cros_ec_keyb *ckdev;
+        struct input_dev *idev;
+        struct device_node *np;
+        int err;
+
+        np = pdev->dev.of_node;
+        if (!np)
+                return -ENODEV;
+
+        ckdev = devm_kzalloc(&pdev->dev, sizeof(*ckdev), GFP_KERNEL);
+        if (!ckdev)
+                return -ENOMEM;
+        err = matrix_keypad_parse_of_params(&pdev->dev, &ckdev->rows,
+                                            &ckdev->cols);
+        if (err)
+                return err;
+
+        idev = devm_input_allocate_device(&pdev->dev);
+        if (!idev)
+                return -ENOMEM;
+
+        ckdev->ec = ec;
+        ckdev->notifier.notifier_call = cros_ec_keyb_work;
+        ckdev->dev = dev;
+        dev_set_drvdata(&pdev->dev, ckdev);
+
+        idev->name = ec->ec_name;
+        idev->phys = ec->phys_name;
+        __set_bit(EV_REP, idev->evbit);
+
+        idev->id.bustype = BUS_VIRTUAL;
+        idev->id.version = 1;
+        idev->id.product = 0;
+        idev->dev.parent = &pdev->dev;
+        idev->open = cros_ec_keyb_open;
+        idev->close = cros_ec_keyb_close;
+
+        ckdev->ghost_filter = of_property_read_bool(np,
+                                        "google,needs-ghost-filter");
+
+        err = matrix_keypad_build_keymap(NULL, NULL, ckdev->rows, ckdev->cols,
+                                         NULL, idev);
+        if (err) {
+                dev_err(dev, "cannot build key matrix\n");
+                return err;
+        }
+
+        ckdev->row_shift = get_count_order(ckdev->cols);
+
+        input_set_capability(idev, EV_MSC, MSC_SCAN);
+        input_set_drvdata(idev, ckdev);
+        ckdev->idev = idev;
+        err = input_register_device(ckdev->idev);
+        if (err) {
+                dev_err(dev, "cannot register input device\n");
+                return err;
+        }
+
+        return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int cros_ec_keyb_resume(struct device *dev)
+{
+        struct cros_ec_keyb *ckdev = dev_get_drvdata(dev);
+
+        /*
+         * When the EC is not a wake source, then it could not have caused the
+         * resume, so we clear the EC's key scan buffer. If the EC was a
+         * wake source (e.g. the lid is open and the user might press a key to
+         * wake) then the key scan buffer should be preserved.
+         */
+        if (ckdev->ec->was_wake_device)
+                cros_ec_keyb_clear_keyboard(ckdev);
+
+        return 0;
+}
+
+#endif
+
+static SIMPLE_DEV_PM_OPS(cros_ec_keyb_pm_ops, NULL, cros_ec_keyb_resume);
+
+static struct platform_driver cros_ec_keyb_driver = {
+        .probe = cros_ec_keyb_probe,
+        .driver = {
+                .name = "cros-ec-keyb",
+                .pm     = &cros_ec_keyb_pm_ops,
+        },
+};
+
+module_platform_driver(cros_ec_keyb_driver);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("ChromeOS EC keyboard driver");
+MODULE_ALIAS("platform:cros-ec-keyb");
diff --git a/drivers/input/keyboard/lpc32xx-keys.c b/drivers/input/keyboard/lpc32xx-keys.c
index 1b8add6cfb9d..42181435fe67 100644
--- a/drivers/input/keyboard/lpc32xx-keys.c
+++ b/drivers/input/keyboard/lpc32xx-keys.c
@@ -144,12 +144,13 @@ static int lpc32xx_parse_dt(struct device *dev,
 {
         struct device_node *np = dev->of_node;
         u32 rows = 0, columns = 0;
+        int err;
 
-        of_property_read_u32(np, "keypad,num-rows", &rows);
-        of_property_read_u32(np, "keypad,num-columns", &columns);
-        if (!rows || rows != columns) {
-                dev_err(dev,
-                        "rows and columns must be specified and be equal!\n");
+        err = matrix_keypad_parse_of_params(dev, &rows, &columns);
+        if (err)
+                return err;
+        if (rows != columns) {
+                dev_err(dev, "rows and columns must be equal!\n");
                 return -EINVAL;
         }
 
diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c
index e25b022692cd..1b289092f4e3 100644
--- a/drivers/input/keyboard/omap4-keypad.c
+++ b/drivers/input/keyboard/omap4-keypad.c
@@ -215,18 +215,12 @@ static int omap4_keypad_parse_dt(struct device *dev,
                                  struct omap4_keypad *keypad_data)
 {
         struct device_node *np = dev->of_node;
+        int err;
 
-        if (!np) {
-                dev_err(dev, "missing DT data");
-                return -EINVAL;
-        }
-
-        of_property_read_u32(np, "keypad,num-rows", &keypad_data->rows);
-        of_property_read_u32(np, "keypad,num-columns", &keypad_data->cols);
-        if (!keypad_data->rows || !keypad_data->cols) {
-                dev_err(dev, "number of keypad rows/columns not specified\n");
-                return -EINVAL;
-        }
+        err = matrix_keypad_parse_of_params(dev, &keypad_data->rows,
+                                            &keypad_data->cols);
+        if (err)
+                return err;
 
         if (of_get_property(np, "linux,input-no-autorepeat", NULL))
                 keypad_data->no_autorepeat = true;
diff --git a/drivers/input/keyboard/tca8418_keypad.c b/drivers/input/keyboard/tca8418_keypad.c
index a34cc6714e5b..55c15304ddbc 100644
--- a/drivers/input/keyboard/tca8418_keypad.c
+++ b/drivers/input/keyboard/tca8418_keypad.c
@@ -288,8 +288,11 @@ static int tca8418_keypad_probe(struct i2c_client *client,
                 irq_is_gpio = pdata->irq_is_gpio;
         } else {
                 struct device_node *np = dev->of_node;
-                of_property_read_u32(np, "keypad,num-rows", &rows);
-                of_property_read_u32(np, "keypad,num-columns", &cols);
+                int err;
+
+                err = matrix_keypad_parse_of_params(dev, &rows, &cols);
+                if (err)
+                        return err;
                 rep = of_property_read_bool(np, "keypad,autorepeat");
         }
 
diff --git a/drivers/input/matrix-keymap.c b/drivers/input/matrix-keymap.c
index 3ae496ea5fe6..08b61f506db6 100644
--- a/drivers/input/matrix-keymap.c
+++ b/drivers/input/matrix-keymap.c
@@ -50,6 +50,26 @@ static bool matrix_keypad_map_key(struct input_dev *input_dev,
 }
 
 #ifdef CONFIG_OF
+int matrix_keypad_parse_of_params(struct device *dev,
+                                  unsigned int *rows, unsigned int *cols)
+{
+        struct device_node *np = dev->of_node;
+
+        if (!np) {
+                dev_err(dev, "missing DT data");
+                return -EINVAL;
+        }
+        of_property_read_u32(np, "keypad,num-rows", rows);
+        of_property_read_u32(np, "keypad,num-columns", cols);
+        if (!*rows || !*cols) {
+                dev_err(dev, "number of keypad rows/columns not specified\n");
+                return -EINVAL;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(matrix_keypad_parse_of_params);
+
 static int matrix_keypad_parse_of_keymap(const char *propname,
                                          unsigned int rows, unsigned int cols,
                                          struct input_dev *input_dev)