From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org, Thomas Huth <thuth@redhat.com>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
"Magnus Damm" <magnus.damm@gmail.com>,
"David Gibson" <david@gibson.dropbear.id.au>,
"Andrew Jeffery" <andrew@aj.id.au>,
qemu-arm@nongnu.org, qemu-ppc@nongnu.org,
"Joel Stanley" <joel@jms.id.au>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Andrzej Zaborowski" <balrogg@gmail.com>,
"Igor Mitsyanko" <i.mitsyanko@gmail.com>,
"Beniamino Galvani" <b.galvani@gmail.com>,
"Michael Walle" <michael@walle.cc>,
"Richard Henderson" <rth@twiddle.net>,
"Jan Kiszka" <jan.kiszka@web.de>,
"Jason Wang" <jasowang@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Peter Chubb" <peter.chubb@nicta.com.au>,
"Aurelien Jarno" <aurelien@aurel32.net>,
"Cédric Le Goater" <clg@kaod.org>,
"Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>,
"Rob Herring" <robh@kernel.org>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [Qemu-devel] [PATCH 01/16] hw/arm/aspeed: Use TYPE_TMP105/TYPE_PCA9552 instead of hardcoded string
Date: Fri, 4 Jan 2019 18:58:32 +0100 [thread overview]
Message-ID: <20190104175847.6290-2-philmd@redhat.com> (raw)
In-Reply-To: <20190104175847.6290-1-philmd@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/arm/aspeed.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index 5158985482..817f9e1400 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -19,6 +19,8 @@
#include "hw/arm/aspeed_soc.h"
#include "hw/boards.h"
#include "hw/i2c/smbus.h"
+#include "hw/misc/pca9552.h"
+#include "hw/misc/tmp105.h"
#include "qemu/log.h"
#include "sysemu/block-backend.h"
#include "hw/loader.h"
@@ -267,7 +269,8 @@ static void ast2500_evb_i2c_init(AspeedBoardState *bmc)
eeprom_buf);
/* The AST2500 EVB expects a LM75 but a TMP105 is compatible */
- i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 7), "tmp105", 0x4d);
+ i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 7), TYPE_TMP105,
+ 0x4d);
/* The AST2500 EVB does not have an RTC. Let's pretend that one is
* plugged on the I2C bus header */
@@ -288,13 +291,15 @@ static void witherspoon_bmc_i2c_init(AspeedBoardState *bmc)
AspeedSoCState *soc = &bmc->soc;
uint8_t *eeprom_buf = g_malloc0(8 * 1024);
- i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 3), "pca9552", 0x60);
+ i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 3), TYPE_PCA9552,
+ 0x60);
i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 4), "tmp423", 0x4c);
i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 5), "tmp423", 0x4c);
/* The Witherspoon expects a TMP275 but a TMP105 is compatible */
- i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 9), "tmp105", 0x4a);
+ i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 9), TYPE_TMP105,
+ 0x4a);
/* The witherspoon board expects Epson RX8900 I2C RTC but a ds1338 is
* good enough */
@@ -302,7 +307,7 @@ static void witherspoon_bmc_i2c_init(AspeedBoardState *bmc)
smbus_eeprom_init_one(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), 0x51,
eeprom_buf);
- i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), "pca9552",
+ i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), TYPE_PCA9552,
0x60);
}
--
2.17.2
next prev parent reply other threads:[~2019-01-04 17:59 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-04 17:58 [Qemu-devel] [PATCH 00/16] hw: Remove "hw/devices.h" Philippe Mathieu-Daudé
2019-01-04 17:58 ` Philippe Mathieu-Daudé [this message]
2019-01-04 19:40 ` [Qemu-devel] [PATCH 01/16] hw/arm/aspeed: Use TYPE_TMP105/TYPE_PCA9552 instead of hardcoded string Thomas Huth
2019-01-07 6:48 ` Cédric Le Goater
2019-01-04 17:58 ` [Qemu-devel] [PATCH 02/16] hw: Remove unused 'hw/devices.h' include Philippe Mathieu-Daudé
2019-01-04 22:24 ` [Qemu-devel] [Qemu-ppc] " BALATON Zoltan
2019-01-07 9:56 ` [Qemu-devel] " Thomas Huth
2019-01-04 17:58 ` [Qemu-devel] [PATCH 03/16] hw/devices: Remove unused TC6393XB_RAM definition Philippe Mathieu-Daudé
2019-01-07 6:32 ` Thomas Huth
2019-01-07 7:56 ` Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 04/16] hw/devices: Move TC6393XB declarations into a new header Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 05/16] hw/devices: Move Blizzard " Philippe Mathieu-Daudé
2019-01-07 6:39 ` Thomas Huth
2019-01-07 7:58 ` Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 06/16] hw/devices: Move CBus " Philippe Mathieu-Daudé
2019-01-07 7:00 ` Thomas Huth
2019-01-04 17:58 ` [Qemu-devel] [PATCH 07/16] hw/devices: Move Gamepad " Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 08/16] MAINTAINERS: Add missing entries for the TI touchscreen devices Philippe Mathieu-Daudé
2019-01-07 7:18 ` Thomas Huth
2019-01-07 8:02 ` Philippe Mathieu-Daudé
2019-01-07 8:05 ` Thomas Huth
2019-01-07 11:44 ` Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 09/16] hw/devices: Move TI touchscreen declarations into a new header Philippe Mathieu-Daudé
2019-01-07 7:22 ` Thomas Huth
2019-01-07 8:02 ` Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 10/16] typedefs: Remove MouseTransformInfo Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 11/16] typedefs: Remove PS2State Philippe Mathieu-Daudé
2019-01-07 7:26 ` Thomas Huth
2019-01-04 17:58 ` [Qemu-devel] [PATCH 12/16] hw/devices: Move LAN9118 declarations into a new header Philippe Mathieu-Daudé
2019-01-07 7:29 ` Thomas Huth
2019-01-07 8:04 ` Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 13/16] hw/net/ne2000-isa: Add guards to the header Philippe Mathieu-Daudé
2019-01-07 7:34 ` Thomas Huth
2019-01-04 17:58 ` [Qemu-devel] [PATCH 14/16] hw/net/lan9118: Export TYPE_LAN9118 and use it instead of hardcoded string Philippe Mathieu-Daudé
2019-01-04 17:58 ` [Qemu-devel] [PATCH 15/16] hw/devices: Move SMSC 91C111 declaration into a new header Philippe Mathieu-Daudé
2019-01-07 7:38 ` Thomas Huth
2019-01-04 17:58 ` [Qemu-devel] [PATCH 16/16] RFC hw/net/smc91c111: Convert init helper into an inline function Philippe Mathieu-Daudé
2019-01-04 19:35 ` Thomas Huth
2019-02-04 23:11 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190104175847.6290-2-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=andrew@aj.id.au \
--cc=aurelien@aurel32.net \
--cc=b.galvani@gmail.com \
--cc=balrogg@gmail.com \
--cc=clg@kaod.org \
--cc=david@gibson.dropbear.id.au \
--cc=edgar.iglesias@gmail.com \
--cc=f4bug@amsat.org \
--cc=i.mitsyanko@gmail.com \
--cc=jan.kiszka@web.de \
--cc=jasowang@redhat.com \
--cc=joel@jms.id.au \
--cc=kbastian@mail.uni-paderborn.de \
--cc=kraxel@redhat.com \
--cc=magnus.damm@gmail.com \
--cc=michael@walle.cc \
--cc=peter.chubb@nicta.com.au \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=robh@kernel.org \
--cc=rth@twiddle.net \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).