No subject

Auto-merging arch/arm/Kconfig
Removing arch/arm/mach-ux500/devices-db5500.c
Removing drivers/gpio/tc35892-gpio.c
Auto-merging drivers/input/keyboard/Kconfig
Auto-merging drivers/input/keyboard/Makefile
Removing drivers/mfd/tc35892.c
Auto-merging drivers/net/caif/caif_shm_u5500.c
Removing include/linux/mfd/tc35892.h
Merge made by recursive.
 arch/arm/Kconfig                                   |    1 +
 arch/arm/mach-ux500/Makefile                       |   14 +-
 arch/arm/mach-ux500/board-mop500-keypads.c         |  229 ++++++++++
 arch/arm/mach-ux500/board-mop500-sdi.c             |   79 +++-
 arch/arm/mach-ux500/board-mop500.c                 |  228 +++-------
 arch/arm/mach-ux500/board-mop500.h                 |    9 +
 arch/arm/mach-ux500/board-u5500-sdi.c              |   49 ++
 arch/arm/mach-ux500/board-u5500.c                  |   19 +-
 arch/arm/mach-ux500/clock.c                        |  365 +++++++++++-----
 arch/arm/mach-ux500/clock.h                        |    4 +
 arch/arm/mach-ux500/cpu-db5500.c                   |   38 ++-
 arch/arm/mach-ux500/cpu-db8500.c                   |   58 ++-
 arch/arm/mach-ux500/cpu.c                          |   13 +-
 arch/arm/mach-ux500/cpufreq.c                      |  211 +++++++++
 arch/arm/mach-ux500/devices-common.c               |  145 ++++++
 arch/arm/mach-ux500/devices-common.h               |   82 ++++
 arch/arm/mach-ux500/devices-db5500.c               |   46 --
 arch/arm/mach-ux500/devices-db5500.h               |   66 +++
 arch/arm/mach-ux500/devices-db8500.c               |  169 +-------
 arch/arm/mach-ux500/devices-db8500.h               |   98 ++++
 arch/arm/mach-ux500/devices.c                      |   63 ---
 arch/arm/mach-ux500/dma-db5500.c                   |  120 +++++
 arch/arm/mach-ux500/include/mach/db5500-regs.h     |    4 +
 arch/arm/mach-ux500/include/mach/db8500-regs.h     |    3 +-
 arch/arm/mach-ux500/include/mach/devices.h         |   17 -
 arch/arm/mach-ux500/include/mach/gpio.h            |   38 --
 arch/arm/mach-ux500/include/mach/hardware.h        |    2 +
 .../mach-ux500/include/mach/irqs-board-mop500.h    |   28 ++-
 arch/arm/mach-ux500/include/mach/irqs.h            |   44 --
 .../include/mach/{mbox.h => mbox-db5500.h}         |    0
 arch/arm/mach-ux500/include/mach/prcmu-defs.h      |   30 ++
 arch/arm/mach-ux500/include/mach/prcmu-regs.h      |   15 +-
 arch/arm/mach-ux500/include/mach/prcmu.h           |   15 +-
 arch/arm/mach-ux500/include/mach/setup.h           |    7 +-
 arch/arm/mach-ux500/include/mach/uncompress.h      |   23 +-
 arch/arm/mach-ux500/{mbox.c => mbox-db5500.c}      |    2 +-
 .../mach-ux500/{modem_irq.c => modem-irq-db5500.c} |    0
 arch/arm/mach-ux500/platsmp.c                      |    2 +-
 arch/arm/mach-ux500/prcmu.c                        |  179 +++++++-
 arch/arm/plat-nomadik/gpio.c                       |   52 ++-
 arch/arm/plat-nomadik/include/plat/pincfg.h        |   70 +++-
 drivers/gpio/Kconfig                               |    8 +-
 drivers/gpio/Makefile                              |    2 +-
 drivers/gpio/tc35892-gpio.c                        |  389 ----------------
 drivers/gpio/tc3589x-gpio.c                        |  389 ++++++++++++++++
 drivers/input/keyboard/Kconfig                     |   10 +
 drivers/input/keyboard/Makefile                    |    1 +
 drivers/input/keyboard/tc3589x-keypad.c            |  472 ++++++++++++++++++++
 drivers/mfd/Kconfig                                |    6 +-
 drivers/mfd/Makefile                               |    2 +-
 drivers/mfd/tc35892.c                              |  345 --------------
 drivers/mfd/tc3589x.c                              |  422 +++++++++++++++++
 drivers/net/caif/caif_shm_u5500.c                  |    2 +-
 include/linux/mfd/tc35892.h                        |  136 ------
 include/linux/mfd/tc3589x.h                        |  195 ++++++++
 55 files changed, 3387 insertions(+), 1629 deletions(-)
 create mode 100644 arch/arm/mach-ux500/board-mop500-keypads.c
 create mode 100644 arch/arm/mach-ux500/board-u5500-sdi.c
 create mode 100644 arch/arm/mach-ux500/cpufreq.c
 create mode 100644 arch/arm/mach-ux500/devices-common.c
 create mode 100644 arch/arm/mach-ux500/devices-common.h
 delete mode 100644 arch/arm/mach-ux500/devices-db5500.c
 create mode 100644 arch/arm/mach-ux500/devices-db5500.h
 create mode 100644 arch/arm/mach-ux500/devices-db8500.h
 create mode 100644 arch/arm/mach-ux500/dma-db5500.c
 rename arch/arm/mach-ux500/include/mach/{mbox.h => mbox-db5500.h} (100%)
 create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-defs.h
 rename arch/arm/mach-ux500/{mbox.c => mbox-db5500.c} (99%)
 rename arch/arm/mach-ux500/{modem_irq.c => modem-irq-db5500.c} (100%)
 delete mode 100644 drivers/gpio/tc35892-gpio.c
 create mode 100644 drivers/gpio/tc3589x-gpio.c
 create mode 100644 drivers/input/keyboard/tc3589x-keypad.c
 delete mode 100644 drivers/mfd/tc35892.c
 create mode 100644 drivers/mfd/tc3589x.c
 delete mode 100644 include/linux/mfd/tc35892.h
 create mode 100644 include/linux/mfd/tc3589x.h