diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-09-13 16:07:25 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-09-13 21:01:08 +0100 |
| commit | 28e987a7e7edaa3ca7feeac65edca26145df8814 (patch) | |
| tree | 5373d8c1615603a150782733ad3a357afb6a1434 | |
| parent | 68e579515fbf32db5deb140c1f86507076f1ab88 (diff) | |
hw/arm/mps2.c: Mark internal-only I2C buses as 'full'pull-target-arm-20210913-3
The various MPS2 boards implemented in mps2.c have multiple I2C
buses: a bus dedicated to the audio configuration, one for the LCD
touchscreen controller, and two which are connected to the external
Shield expansion connector. Mark the buses which are used only for
board-internal devices as 'full' so that if the user creates i2c
devices on the commandline without specifying a bus name then they
will be connected to the I2C controller used for the Shield
connector, where guest software will expect them.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210903151435.22379-5-peter.maydell@linaro.org
| -rw-r--r-- | hw/arm/mps2.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c index 4634aa1a1c..bb76fa6889 100644 --- a/hw/arm/mps2.c +++ b/hw/arm/mps2.c @@ -428,7 +428,17 @@ static void mps2_common_init(MachineState *machine) 0x40023000, /* Audio */ 0x40029000, /* Shield0 */ 0x4002a000}; /* Shield1 */ - sysbus_create_simple(TYPE_ARM_SBCON_I2C, i2cbase[i], NULL); + DeviceState *dev; + + dev = sysbus_create_simple(TYPE_ARM_SBCON_I2C, i2cbase[i], NULL); + if (i < 2) { + /* + * internal-only bus: mark it full to avoid user-created + * i2c devices being plugged into it. + */ + BusState *qbus = qdev_get_child_bus(dev, "i2c"); + qbus_mark_full(qbus); + } } create_unimplemented_device("i2s", 0x40024000, 0x400); |