diff options
| author | Peter Maydell | 2020-07-20 12:03:07 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-07-20 12:03:09 +0200 |
| commit | 873ec69aeb12e24eec7fb317fd0cd8494e8489dd (patch) | |
| tree | 8fcc805c25847fd5701f33445b1f2c9cef4c6629 /hw/arm/tosa.c | |
| parent | Makefile: Remove config-devices.mak on "make clean" (diff) | |
| parent | hw/i2c: Document the I2C qdev helpers (diff) | |
| download | qemu-873ec69aeb12e24eec7fb317fd0cd8494e8489dd.tar.gz qemu-873ec69aeb12e24eec7fb317fd0cd8494e8489dd.tar.xz qemu-873ec69aeb12e24eec7fb317fd0cd8494e8489dd.zip | |
Merge remote-tracking branch 'remotes/cminyard/tags/for-qemu-i2c-5' into staging
Minor changes to:
Add an SMBus config entry
Cleanup/simplify/document some I2C interfaces
# gpg: Signature made Thu 16 Jul 2020 18:46:55 BST
# gpg: using RSA key FD0D5CE67CE0F59A6688268661F38C90919BFF81
# gpg: Good signature from "Corey Minyard <cminyard@mvista.com>" [unknown]
# gpg: aka "Corey Minyard <minyard@acm.org>" [unknown]
# gpg: aka "Corey Minyard <corey@minyard.net>" [unknown]
# gpg: aka "Corey Minyard <minyard@mvista.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: FD0D 5CE6 7CE0 F59A 6688 2686 61F3 8C90 919B FF81
* remotes/cminyard/tags/for-qemu-i2c-5:
hw/i2c: Document the I2C qdev helpers
hw/i2c: Rename i2c_create_slave() as i2c_slave_create_simple()
hw/i2c: Rename i2c_realize_and_unref() as i2c_slave_realize_and_unref()
hw/i2c: Rename i2c_try_create_slave() as i2c_slave_new()
hw/i2c/aspeed_i2c: Simplify aspeed_i2c_get_bus()
hw/i2c/Kconfig: Add an entry for the SMBus
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/tosa.c')
| -rw-r--r-- | hw/arm/tosa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c index 383b3b22e2..e29566f7b3 100644 --- a/hw/arm/tosa.c +++ b/hw/arm/tosa.c @@ -234,7 +234,7 @@ static uint8_t tosa_dac_recv(I2CSlave *s) static void tosa_tg_init(PXA2xxState *cpu) { I2CBus *bus = pxa2xx_i2c_bus(cpu->i2c[0]); - i2c_create_slave(bus, TYPE_TOSA_DAC, DAC_BASE); + i2c_slave_create_simple(bus, TYPE_TOSA_DAC, DAC_BASE); ssi_create_slave(cpu->ssp[1], "tosa-ssp"); } |