back on i2c-mxs
patches from lucas
Use the right pin for DIR_A

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Merge remote-tracking branch 'origin/cfa-3.9-wip-10049-i2c-mxs-fix' into cfa-3.9-14-fiq-fixes

Conflicts:
	arch/arm/boot/dts/imx28-cfa10049.dts
Fix gpio retrieval

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
gpio: mxs: Use set and clear capabilities of the gpio controller

The current driver doesn't use the set and clear registers found on the
mxs gpio controller.

This leads the generic gpio controller to be using some internal value
to avoid looking up the value stored in the registers, making it behave
pretty much like a cache.

This raises some coherency problem when a gpio is not modified by the
gpio controller, while it can easily be fixed by using the set and clear
registers.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Merge branch 'cfa-3.9-14-fiq-fixes' of github.com:crystalfontz/cfa_10036_kernel into cfa-3.9-14-fiq-fixes
Merge branch 'cfa-3.9-14-fiq-fixes' into cfa-3.9-designwest-20130420

Conflicts:
	arch/arm/boot/dts/imx28-cfa10049.dts