diff options
| author | Tom Rini <trini@konsulko.com> | 2022-05-10 09:52:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-05-10 09:52:00 -0400 |
| commit | b4eb57766314062e3dd1ee8e439d2cb2d5dc33d8 (patch) | |
| tree | 2161a0dd42795cf4ce95199285a17bb409e7ce26 | |
| parent | 381277410d72b6081db8412024b9d5496b4bafd1 (diff) | |
| parent | 89eabd2f3562115ee56cdad03324cc748f78d177 (diff) | |
| download | u-boot-b4eb57766314062e3dd1ee8e439d2cb2d5dc33d8.zip u-boot-b4eb57766314062e3dd1ee8e439d2cb2d5dc33d8.tar.gz u-boot-b4eb57766314062e3dd1ee8e439d2cb2d5dc33d8.tar.bz2 | |
Merge tag 'i2c-2022-07' of https://source.denx.de/u-boot/custodians/u-boot-i2c
i2c changes for 2022.07
- i2c: ihs: intel: Fix typo in comments
Patch from Michal
- misc: atsha204a: Add support for atsha204 chip
from Pali
| -rw-r--r-- | doc/device-tree-bindings/misc/atsha204.txt | 4 | ||||
| -rw-r--r-- | drivers/i2c/ihs_i2c.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/intel_i2c.c | 2 | ||||
| -rw-r--r-- | drivers/misc/atsha204a-i2c.c | 1 |
4 files changed, 7 insertions, 2 deletions
diff --git a/doc/device-tree-bindings/misc/atsha204.txt b/doc/device-tree-bindings/misc/atsha204.txt new file mode 100644 index 0000000..3adc121 --- /dev/null +++ b/doc/device-tree-bindings/misc/atsha204.txt @@ -0,0 +1,4 @@ +Atmel ATSHA204 and ATSHA204A i2c h/w symmetric crypto module + +Required properties: +- compatible : should be "atmel,atsha204" or "atmel,atsha204a" diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c index ecca906..d715714 100644 --- a/drivers/i2c/ihs_i2c.c +++ b/drivers/i2c/ihs_i2c.c @@ -195,7 +195,7 @@ static int ihs_i2c_xfer(struct udevice *bus, struct i2c_msg *msg, int nmsgs) memset(&dummy, 0, sizeof(struct i2c_msg)); /* We expect either two messages (one with an offset and one with the - * actucal data) or one message (just data) + * actual data) or one message (just data) */ if (nmsgs > 2 || nmsgs == 0) { debug("%s: Only one or two messages are supported\n", __func__); diff --git a/drivers/i2c/intel_i2c.c b/drivers/i2c/intel_i2c.c index dc26fa8..4fc6f1a 100644 --- a/drivers/i2c/intel_i2c.c +++ b/drivers/i2c/intel_i2c.c @@ -213,7 +213,7 @@ static int intel_i2c_xfer(struct udevice *bus, struct i2c_msg *msg, int nmsgs) /* * We expect either two messages (one with an offset and one with the - * actucal data) or one message (just data) + * actual data) or one message (just data) */ if (nmsgs > 2 || nmsgs == 0) { debug("%s: Only one or two messages are supported", __func__); diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c index 5da8134..aa6acf0 100644 --- a/drivers/misc/atsha204a-i2c.c +++ b/drivers/misc/atsha204a-i2c.c @@ -283,6 +283,7 @@ static int atsha204a_of_to_plat(struct udevice *dev) } static const struct udevice_id atsha204a_ids[] = { + { .compatible = "atmel,atsha204" }, { .compatible = "atmel,atsha204a" }, { } }; |