[U-Boot] [i2c] Pull request

Wolfgang Denk
2012-07-31T20:14:04Z

Dear Heiko Schocher,

In message <5017901A.2060005@denx.de> you wrote:
> Hello Wolfgang,
>
> The following changes since commit b98b611502f5e0a85a1f8e15cf46c470cb105614:
>
> Merge branch 'next' of git://git.denx.de/u-boot (2012-07-30 20:39:52 +0200)
>
> are available in the git repository at:
>
> git://git.denx.de/u-boot-i2c.git master
>
> Holger Brunck (2):
> i2c: deblock i2c bus also if accessed before realocation
> km/common: remove printfs for i2c deblocking code
>
> Rajeshwari Shinde (8):
> EXYNOS: CLK: Add i2c clock
> EXYNOS: Add I2C base address.
> EXYNOS5: define EXYNOS5_I2C_SPACING
> EXYNOS: PINMUX: Add pinmux support for I2C
> I2C: Move struct s3c24x0_i2c to a common place.
> I2C: Modify the I2C driver for EXYNOS5
> I2C: Add support for Multi channel
> CONFIG: SMDK5250: I2C: Enable I2C
>
> Troy Kisky (25):
> mxc_i2c: fix i2c_imx_stop
> mxc_i2c: remove ifdef of CONFIG_HARD_I2C
> mxc_i2c: create tx_byte function
> mxc_i2c: clear i2sr before waiting for bit
> mxc_i2c: create i2c_init_transfer
> mxc_i2c: call i2c_imx_stop on error in i2c_read/i2c_write
> mxc_i2c.c: code i2c_probe as a 0 length i2c_write
> mxc_i2c: combine i2c_imx_bus_busy and i2c_imx_trx_complete into wait_for_sr_state
> mxc_i2c: remove redundant read
> mxc_i2c: place imx_start code inline
> mxc_i2c: place i2c_reset code inline
> mxc_i2c: don't disable controller after every transaction
> mxc_i2c: change slave addr if conflicts with destination.
> mxc_i2c: check for arbitration lost
> mxc_i2c: add retries
> mxc_i2c: add i2c_regs argument to i2c_imx_stop
> mxc_i2c: prep work for multiple busses support
> mxc_i2c: add bus recovery support
> mxc_i2c: finish adding CONFIG_I2C_MULTI_BUS support
> iomux-v3: remove include of mx6x_pins.h
> i.mx: iomux-v3.h: move to imx-common include directory
> i.mx: iomux-v3.c: move to imx-common directory
> i.mx53: add definition for I2C3_BASE_ADDR
> imx-common: add i2c.c for bus recovery support
> mx6qsabrelite: add i2c multi-bus support
>
> arch/arm/cpu/armv7/exynos/clock.c | 33 ++
> arch/arm/cpu/armv7/exynos/pinmux.c | 52 +++
> arch/arm/cpu/armv7/imx-common/Makefile | 4 +-
> arch/arm/cpu/armv7/imx-common/i2c.c | 99 ++++
> arch/arm/cpu/armv7/{mx6 => imx-common}/iomux-v3.c | 3 +-
> arch/arm/cpu/armv7/mx5/clock.c | 20 +
> arch/arm/cpu/armv7/mx6/Makefile | 2 +-
> arch/arm/cpu/armv7/mx6/clock.c | 20 +
> arch/arm/include/asm/arch-exynos/clk.h | 1 +
> arch/arm/include/asm/arch-exynos/cpu.h | 5 +
> arch/arm/include/asm/arch-exynos/periph.h | 8 +
> arch/arm/include/asm/arch-mx5/clock.h | 1 +
> arch/arm/include/asm/arch-mx5/imx-regs.h | 1 +
> arch/arm/include/asm/arch-mx6/clock.h | 1 +
> arch/arm/include/asm/arch-mx6/mx6x_pins.h | 2 +-
> arch/arm/include/asm/arch-s3c24x0/s3c24x0.h | 10 -
> .../asm/{arch-mx6 => imx-common}/iomux-v3.h | 0
> arch/arm/include/asm/imx-common/mxc_i2c.h | 42 ++
> board/freescale/mx6qarm2/mx6qarm2.c | 2 +-
> board/freescale/mx6qsabrelite/mx6qsabrelite.c | 54 ++-
> board/keymile/common/common.c | 3 -
> board/samsung/smdk5250/smdk5250.c | 30 ++-
> common/cmd_i2c.c | 1 +
> drivers/i2c/mxc_i2c.c | 477 +++++++++++---------
> drivers/i2c/s3c24x0_i2c.c | 221 ++++++----
> drivers/i2c/s3c24x0_i2c.h | 33 ++
> drivers/usb/host/ehci-mx6.c | 2 +-
> include/configs/mx6qsabrelite.h | 6 +-
> include/configs/smdk5250.h | 10 +
> 29 files changed, 822 insertions(+), 321 deletions(-)
> create mode 100644 arch/arm/cpu/armv7/imx-common/i2c.c
> rename arch/arm/cpu/armv7/{mx6 => imx-common}/iomux-v3.c (97%)
> rename arch/arm/include/asm/{arch-mx6 => imx-common}/iomux-v3.h (100%)
> create mode 100644 arch/arm/include/asm/imx-common/mxc_i2c.h
> create mode 100644 drivers/i2c/s3c24x0_i2c.h

Applied, thanks.

Best regards,

Wolfgang Denk

--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"The one charm of marriage is that it makes a life of deception a
neccessity." - Oscar Wilde