Merge remote-tracking branch 'github/pia335-mmi-ml' into pia335x-mmi-dev

* github/pia335-mmi-ml:
  ARM: pia335x: added support for TVL320AIC3x audio
  ARM: pia335x: moved acceleration sensor initialisation to mmi setup. Code cleanup.
  ARM: pia335x: apply MACH TYPE change to Makefile as well
  ARM: pia335x: fix MACH TYPE name
  ARM: pia335x: moved platform data of acceleration sensor. Added i2cboardinfo and init
  ARM: pia335x: fixed pinmux issue Signed-off-by: Marian Lüder <m.lueder@pironex.de>
  ARM: pia335x: adjusted pinmux init for LCD setup
  ARM: pia335x: add acceleration sensor

Conflicts:
	arch/arm/mach-omap2/board-am335xpia.c
input: edt-ft5x06: fix internal kernel calls for 3.2 kernel

- backported drivers used interfaces that did not exist in 3.2 kernel
- module_i2c_driver() -> module_init/module_exit
- dev_err_ratelimited() -> dev_err()

Signed-off-by: Björn Krombholz <b.krombholz@pironex.de>
ARM: pia335x: update touch sensor initialization for MMI

- LCD panel is using an FT5x06 based multitouch IC
- update configuration
- remove old touch code

Signed-off-by: Björn Krombholz <b.krombholz@pironex.de>
ARM: pia335x: move E2 uart pin mux definition to the right place

Signed-off-by: Björn Krombholz <b.krombholz@pironex.de>
ARM: pia335x: move MMI specific MMCO changes to mmc0_init()

Signed-off-by: Björn Krombholz <b.krombholz@pironex.de>
ARM: pia335x: update gpio pin mux table

Signed-off-by: Björn Krombholz <b.krombholz@pironex.de>
ARM: pia335x: add pmic and supervisor gpios to pin mux

Signed-off-by: Björn Krombholz <b.krombholz@pironex.de>
Revert "input: edt-ft5x06: fix internal kernel calls for 3.2 kernel"

This reverts commit f9f593d53dc156483ae2a23514ab49738bf755f5.
Revert "Input: edt-ft5x06 - return -EFAULT on copy_to_user() error"

This reverts commit 10c8ea8aecec890007094c8af07277919f7ac2ed.
Revert "Input: edt-ft5x06 - fix build error when compiling wthout CONFIG_DEBUG_FS"

This reverts commit 84a32b2ea444793a4728c4663262304a3b2bca42.
Revert "Input: add driver for FT5x06 based EDT displays"

This reverts commit 940431765a78cfce0319d5eb95b411e4363eca60.
Revert "Input: edt-ft5x06 - return -EFAULT on copy_to_user() error"

This reverts commit 10c8ea8aecec890007094c8af07277919f7ac2ed.
Revert "Input: edt-ft5x06 - fix build error when compiling wthout CONFIG_DEBUG_FS"

This reverts commit 84a32b2ea444793a4728c4663262304a3b2bca42.
Revert "Input: add driver for FT5x06 based EDT displays"

- the EDT driver is to "special" to be used with the display on the KM MMI

This reverts commit 940431765a78cfce0319d5eb95b411e4363eca60.

Signed-off-by: Björn Krombholz <b.krombholz@pironex.de>
ARM: pia335x: move E2 uart pin mux definition to the right place

Signed-off-by: Björn Krombholz <b.krombholz@pironex.de>
ARM: pia335x: move MMI specific MMC0 changes to mmc0_init()

Signed-off-by: Björn Krombholz <b.krombholz@pironex.de>
ARM: pia335x: update gpio pin mux

- add Watchdog and PMIC GPIO definitions and pin mux

Signed-off-by: Björn Krombholz <b.krombholz@pironex.de>
Merge branch 'pia335x-mmi-dev' into tmp-merge

* pia335x-mmi-dev:
  ARM: pia335x: update gpio pin mux
  ARM: pia335x: move MMI specific MMC0 changes to mmc0_init()
  ARM: pia335x: move E2 uart pin mux definition to the right place
  Revert "Input: add driver for FT5x06 based EDT displays"
  Revert "Input: edt-ft5x06 - fix build error when compiling wthout CONFIG_DEBUG_FS"
  Revert "Input: edt-ft5x06 - return -EFAULT on copy_to_user() error"

Conflicts:
	arch/arm/mach-omap2/board-am335xpia.c
input: ft5x06: add touch interface driver based on android driver

Signed-off-by: Björn Krombholz <b.krombholz@pironex.de>
ARM: pia335x: switch ts to new ft5x06 driver

- remove all references to old driver from board file
- clean up touch init code

Signed-off-by: Björn Krombholz <b.krombholz@pironex.de>