[qemu-xen master] Merge remote-tracking branch 'remotes/cminyard/tags/for-qemu-i2c-5' into staging

[patchbot@xxxxxxx]

commit 873ec69aeb12e24eec7fb317fd0cd8494e8489dd
Merge: d69cda7ed722e445d03e1ace6563bab3a76e023e 
73d5f22ecbb76dfc785876779d47787084ff0f42
Author:     Peter Maydell <peter.maydell@xxxxxxxxxx>
AuthorDate: Mon Jul 20 11:03:07 2020 +0100
Commit:     Peter Maydell <peter.maydell@xxxxxxxxxx>
CommitDate: Mon Jul 20 11:03:09 2020 +0100

    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@xxxxxxxxxx>" [unknown]
    # gpg:                 aka "Corey Minyard <minyard@xxxxxxx>" [unknown]
    # gpg:                 aka "Corey Minyard <corey@xxxxxxxxxxx>" [unknown]
    # gpg:                 aka "Corey Minyard <minyard@xxxxxxxxxx>" [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@xxxxxxxxxx>

 hw/arm/aspeed.c             | 82 +++++++++++++++++++++++----------------------
 hw/arm/musicpal.c           |  4 +--
 hw/arm/nseries.c            |  8 ++---
 hw/arm/pxa2xx.c             |  5 +--
 hw/arm/realview.c           |  2 +-
 hw/arm/spitz.c              |  4 +--
 hw/arm/stellaris.c          |  2 +-
 hw/arm/tosa.c               |  2 +-
 hw/arm/versatilepb.c        |  2 +-
 hw/arm/vexpress.c           |  2 +-
 hw/arm/z2.c                 |  4 +--
 hw/display/sii9022.c        |  2 +-
 hw/i2c/Kconfig              |  8 +++--
 hw/i2c/Makefile.objs        |  3 +-
 hw/i2c/aspeed_i2c.c         |  3 +-
 hw/i2c/core.c               | 15 ++++-----
 hw/ppc/e500.c               |  2 +-
 hw/ppc/sam460ex.c           |  2 +-
 include/hw/i2c/aspeed_i2c.h |  2 +-
 include/hw/i2c/i2c.h        | 54 +++++++++++++++++++++++++++--
 20 files changed, 131 insertions(+), 77 deletions(-)

--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master