[U-Boot] [PATCH v2 0/17] dm: Add I2C support and convert sandbox, tegra

Simon Glass
2014-11-11T17:46:16Z

This series adds I2C support to driver model. It has become apparent that
this is a high priority as it is widely used. It follows along to some
extent from the SPI conversion.

Several changes are made from the original I2C implementations.

Firstly it is not necessary to specify the chip address with every call,
since each chip knows its own address - it is stored in struct dm_i2c_chip
which is attached to each chip on the I2C bus. However, this information
*is* passed to the driver since I presume most drivers need it and it would
be cumbersome to look up in every call.

Secondly there is no concept of a 'current' I2C bus so all associated logic
is removed. With driver model i2c_set_bus_num() and i2c_get_bus_num() are
not available. Since the chip device specifies both the bus and the chip
address, there is no need for this concept. It also causes problems when
one driver changes the current bus and forgets to change it back.

Thirdly initialisation is handled by driver model's normal probe() method
on each device so there should be no need for i2c_init_all(), i2c_init(),
i2c_init_board(), i2c_board_late_init() and board_i2c_init().

I2C muxes are not yet supported. To support these we will need to maintain
state of the current mux settings to avoid resetting every mux every time.
Probably we need to add a sandbox I2C mux driver to permit testing of this.
This can probably be done later.

Platform data is not yet supported either, only device tree. The
U_BOOT_I2C_MKENT_COMPLETE() and U_BOOT_I2C_ADAP_COMPLETE() macros are not
used. Also struct i2c_adapter is not defined anymore. This will need to be
addressed, perhaps as part of converting over a board that does not use
device tree, assuming that we want to support this.

The following I2C CONFIGs are no-longer needed when driver model is used:

CONFIG_SYS_I2C_INIT_BOARD - each I2C bus is inited in its probe() method
CONFIG_I2C_MULTI_BUS - we always support multi-bus with driver model
CONFIG_SYS_MAX_I2C_BUS - the device tree aliases define available buses
CONFIG_SYS_I2C_SPEED - the device tree specifies the speed for each bus
CONFIG_SYS_I2C - this is the 'new old' API, now deprecated

There are a few SPI patches included here due to a dependency on a new
device binding function.

This series is available at u-boot-dm/i2c-working.

Changes in v2:
- Add a suitable commit message
- Add new patch to correct handling of aliases with embedded digits
- Add new patch to add a function to bind a device by driver name
- Add new patches to adjust SPI to use device_bind_driver()
- Fix cihp typo
- Implement generic I2C devices to allow 'i2c probe' on unknown devices
- Return the probed device from i2c_probe()
- Set the bus speed after the bus is probed
- Add some debugging for generic I2C device binding
- Add a 'deblock' method to recover an I2C bus stuck in mid-transaction
- Add a helper function to find a chip on a particular bus number
- Change alen to int so that it can be -1 (this was a bug)
- Call the deblock() method for 'i2c reset'
- Update commit message for EEPROM driver
- Add a test for automatic binding of generic I2C devices
- Add a new asm/test.h header for tests in sandbox
- Adjust tegra_i2c_child_pre_probe() to permit generic I2C devices
- Correct the compatible strings for I2C buses
- Don't init if the speed is 0, since this breaks the controller
- Expand coverage to all Tegra boards

Simon Glass (17):
dm: i2c: Move error reporting into a common function
dm: core: Allow access to the device's driver_id data
dm: core: Add functions to find parent and OF data
dm: fdt: Correct handling of aliases with embedded digits
dm: Add a function to bind a device by driver name
dm: spi: Correct handling of SPI chip selects in sandbox
dm: spi: Use device_bind_driver() instead of our own function
dm: i2c: Add a uclass for I2C
dm: i2c: Implement driver model support in the i2c command
dm: i2c: Add I2C emulation driver for sandbox
dm: i2c: Add a sandbox I2C driver
dm: i2c: Add an I2C EEPROM simulator
dm: i2c: config: Enable I2C for sandbox using driver model
dm: i2c: dts: Add an I2C bus for sandbox
dm: Add a simple EEPROM driver
dm: i2c: Add tests for I2C
dm: i2c: tegra: Convert to driver model

arch/arm/cpu/tegra20-common/pmu.c | 21 +-
arch/arm/dts/tegra124-jetson-tk1.dts | 1 -
arch/arm/dts/tegra124-norrin.dts | 1 -
arch/arm/dts/tegra30-tec-ng.dts | 4 +
arch/arm/include/asm/arch-tegra/tegra_i2c.h | 2 +-
arch/sandbox/dts/sandbox.dts | 17 ++
arch/sandbox/include/asm/test.h | 15 ++
board/avionic-design/common/tamonten-ng.c | 12 +-
board/nvidia/cardhu/cardhu.c | 13 +-
board/nvidia/common/board.c | 4 -
board/nvidia/dalmore/dalmore.c | 21 +-
board/nvidia/whistler/whistler.c | 29 ++-
board/toradex/apalis_t30/apalis_t30.c | 19 +-
common/cmd_i2c.c | 350 +++++++++++++++++++++++-----
drivers/core/device.c | 10 +
drivers/core/lists.c | 38 ++-
drivers/i2c/Makefile | 2 +
drivers/i2c/i2c-emul-uclass.c | 14 ++
drivers/i2c/i2c-uclass.c | 275 ++++++++++++++++++++++
drivers/i2c/sandbox_i2c.c | 156 +++++++++++++
drivers/i2c/tegra_i2c.c | 320 ++++++++++---------------
drivers/misc/Makefile | 4 +
drivers/misc/i2c_eeprom.c | 51 ++++
drivers/misc/i2c_eeprom_emul.c | 108 +++++++++
drivers/mtd/spi/sandbox.c | 4 +-
drivers/power/tps6586x.c | 27 +--
drivers/spi/spi-uclass.c | 34 +--
include/config_fallbacks.h | 6 +
include/configs/apalis_t30.h | 3 -
include/configs/beaver.h | 3 -
include/configs/cardhu.h | 5 -
include/configs/colibri_t30.h | 3 -
include/configs/dalmore.h | 5 -
include/configs/jetson-tk1.h | 5 -
include/configs/norrin.h | 5 -
include/configs/sandbox.h | 6 +
include/configs/seaboard.h | 3 -
include/configs/tec-ng.h | 5 -
include/configs/tegra-common.h | 1 +
include/configs/tegra114-common.h | 3 -
include/configs/tegra124-common.h | 3 -
include/configs/tegra20-common.h | 3 -
include/configs/tegra30-common.h | 3 -
include/configs/trimslice.h | 3 -
include/configs/venice2.h | 5 -
include/configs/whistler.h | 3 -
include/dm/device.h | 19 ++
include/dm/lists.h | 13 ++
include/dm/uclass-id.h | 4 +
include/i2c.h | 288 +++++++++++++++++++++++
include/i2c_eeprom.h | 19 ++
include/spi.h | 14 +-
include/tps6586x.h | 4 +-
lib/fdtdec.c | 6 +-
test/dm/Makefile | 1 +
test/dm/i2c.c | 112 +++++++++
test/dm/test.dts | 17 ++
57 files changed, 1690 insertions(+), 432 deletions(-)
create mode 100644 arch/sandbox/include/asm/test.h
create mode 100644 drivers/i2c/i2c-emul-uclass.c
create mode 100644 drivers/i2c/i2c-uclass.c
create mode 100644 drivers/i2c/sandbox_i2c.c
create mode 100644 drivers/misc/i2c_eeprom.c
create mode 100644 drivers/misc/i2c_eeprom_emul.c
create mode 100644 include/i2c_eeprom.h
create mode 100644 test/dm/i2c.c

--
2.1.0.rc2.206.gedb03e5