Changes from v5: * Removed redundant num_channel from the private structure Matt Ranostay (3): cap11xx: make driver generic for variant support cap11xx: Add support for various cap11xx devices cap11xx: support for irq-active-high option .../devicetree/bindings/input/cap1106.txt | 53 --- .../devicetree/bindings/input/cap11xx.txt | 59 ++++ drivers/input/keyboard/Kconfig | 8 +- drivers/input/keyboard/Makefile | 2 +- drivers/input/keyboard/cap1106.c | 341 ------------------- drivers/input/keyboard/cap11xx.c | 366 +++++++++++++++++++++ 6 files changed, 430 insertions(+), 399 deletions(-) delete mode 100644 Documentation/devicetree/bindings/input/cap1106.txt create mode 100644 Documentation/devicetree/bindings/input/cap11xx.txt delete mode 100644 drivers/input/keyboard/cap1106.c create mode 100644 drivers/input/keyboard/cap11xx.c -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html