[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 0/5] hw/i2c: Rename TYPE_VERSATILE_I2C -> TYPE_ARM_SBCON_I2C
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 0/5] hw/i2c: Rename TYPE_VERSATILE_I2C -> TYPE_ARM_SBCON_I2C |
Date: |
Tue, 10 Jan 2023 09:25:03 +0100 |
Series fully reviewed.
Since v1:
- Updated MAINTAINERS
- Picked R-b tags
---
Lot of churn for what started as a QOM cleanup. We have:
typedef ArmSbconI2CState VersatileI2CState; // [*]
DECLARE_INSTANCE_CHECKER(VersatileI2CState, VERSATILE_I2C,
TYPE_VERSATILE_I2C)
typedef struct ArmSbconI2CState ArmSbconI2CState;
DECLARE_INSTANCE_CHECKER(ArmSbconI2CState, ARM_SBCON_I2C,
TYPE_ARM_SBCON_I2C)
In a later QOM rework series, [*] produces definitions clash.
The simplest fix is to avoid having different types defining
the same QOM model.
This model started named TYPE_VERSATILE_I2C then we figured
the official ARM name (did it came later?), and renamed as
TYPE_ARM_SBCON_I2C. Finish the conversion, remove VERSATILE_I2C
name and only refer to this model as ARM_SBCON_I2C.
Philippe Mathieu-Daudé (5):
hw/i2c/versatile_i2c: Drop useless casts from void * to pointer
hw/i2c/versatile_i2c: Replace VersatileI2CState -> ArmSbconI2CState
hw/i2c/versatile_i2c: Replace TYPE_VERSATILE_I2C -> TYPE_ARM_SBCON_I2C
hw/i2c/versatile_i2c: Use ARM_SBCON_I2C() macro
hw/i2c/versatile_i2c: Rename versatile_i2c -> arm_sbcon_i2c
MAINTAINERS | 1 +
hw/arm/Kconfig | 4 +--
hw/arm/realview.c | 2 +-
hw/arm/versatilepb.c | 2 +-
hw/arm/vexpress.c | 2 +-
hw/i2c/Kconfig | 2 +-
hw/i2c/{versatile_i2c.c => arm_sbcon_i2c.c} | 39 +++++++++------------
hw/i2c/meson.build | 2 +-
include/hw/i2c/arm_sbcon_i2c.h | 6 ++--
9 files changed, 27 insertions(+), 33 deletions(-)
rename hw/i2c/{versatile_i2c.c => arm_sbcon_i2c.c} (70%)
--
2.38.1
- [PATCH v2 0/5] hw/i2c: Rename TYPE_VERSATILE_I2C -> TYPE_ARM_SBCON_I2C,
Philippe Mathieu-Daudé <=
- [PATCH v2 1/5] hw/i2c/versatile_i2c: Drop useless casts from void * to pointer, Philippe Mathieu-Daudé, 2023/01/10
- [PATCH v2 2/5] hw/i2c/versatile_i2c: Replace VersatileI2CState -> ArmSbconI2CState, Philippe Mathieu-Daudé, 2023/01/10
- [PATCH v2 3/5] hw/i2c/versatile_i2c: Replace TYPE_VERSATILE_I2C -> TYPE_ARM_SBCON_I2C, Philippe Mathieu-Daudé, 2023/01/10
- [PATCH v2 4/5] hw/i2c/versatile_i2c: Use ARM_SBCON_I2C() macro, Philippe Mathieu-Daudé, 2023/01/10
- [PATCH v2 5/5] hw/i2c/versatile_i2c: Rename versatile_i2c -> arm_sbcon_i2c, Philippe Mathieu-Daudé, 2023/01/10
- Re: [PATCH v2 0/5] hw/i2c: Rename TYPE_VERSATILE_I2C -> TYPE_ARM_SBCON_I2C, Peter Maydell, 2023/01/17