motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 00:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/sd/sdhci: Remove need for SDHCI_VENDOR_IMX definition

Browse source 
All instances of TYPE_IMX_USDHC set vendor=SDHCI_VENDOR_IMX.
No need to special-case it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Bernhard Beschow <shentey@gmail.com>
Message-Id: <20250308213640.13138-3-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2025-03-08 16:12:13 +01:00
parent 003d35ad6c
commit 7f2a5272ff
7 changed files with 4 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/arm/fsl-imx25.c
View file

@ -243,8 +243,6 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp)
&error_abort); &error_abort);
object_property_set_uint(OBJECT(&s->esdhc[i]), "capareg", object_property_set_uint(OBJECT(&s->esdhc[i]), "capareg",
IMX25_ESDHC_CAPABILITIES, &error_abort); IMX25_ESDHC_CAPABILITIES, &error_abort);
object_property_set_uint(OBJECT(&s->esdhc[i]), "vendor",
SDHCI_VENDOR_IMX, &error_abort);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->esdhc[i]), errp)) { if (!sysbus_realize(SYS_BUS_DEVICE(&s->esdhc[i]), errp)) {
return; return;
} }

2
hw/arm/fsl-imx6.c
View file

@ -327,8 +327,6 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)
&error_abort); &error_abort);
object_property_set_uint(OBJECT(&s->esdhc[i]), "capareg", object_property_set_uint(OBJECT(&s->esdhc[i]), "capareg",
IMX6_ESDHC_CAPABILITIES, &error_abort); IMX6_ESDHC_CAPABILITIES, &error_abort);
object_property_set_uint(OBJECT(&s->esdhc[i]), "vendor",
SDHCI_VENDOR_IMX, &error_abort);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->esdhc[i]), errp)) { if (!sysbus_realize(SYS_BUS_DEVICE(&s->esdhc[i]), errp)) {
return; return;
} }

2
hw/arm/fsl-imx6ul.c
View file

@ -531,8 +531,6 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)
FSL_IMX6UL_USDHC2_IRQ, FSL_IMX6UL_USDHC2_IRQ,
}; };
object_property_set_uint(OBJECT(&s->usdhc[i]), "vendor",
SDHCI_VENDOR_IMX, &error_abort);
sysbus_realize(SYS_BUS_DEVICE(&s->usdhc[i]), &error_abort); sysbus_realize(SYS_BUS_DEVICE(&s->usdhc[i]), &error_abort);
sysbus_mmio_map(SYS_BUS_DEVICE(&s->usdhc[i]), 0, sysbus_mmio_map(SYS_BUS_DEVICE(&s->usdhc[i]), 0,

2
hw/arm/fsl-imx7.c
View file

@ -471,8 +471,6 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)
FSL_IMX7_USDHC3_IRQ, FSL_IMX7_USDHC3_IRQ,
}; };
object_property_set_uint(OBJECT(&s->usdhc[i]), "vendor",
SDHCI_VENDOR_IMX, &error_abort);
sysbus_realize(SYS_BUS_DEVICE(&s->usdhc[i]), &error_abort); sysbus_realize(SYS_BUS_DEVICE(&s->usdhc[i]), &error_abort);
sysbus_mmio_map(SYS_BUS_DEVICE(&s->usdhc[i]), 0, sysbus_mmio_map(SYS_BUS_DEVICE(&s->usdhc[i]), 0,

2
hw/arm/fsl-imx8mp.c
View file

@ -524,8 +524,6 @@ static void fsl_imx8mp_realize(DeviceState *dev, Error **errp)
{ fsl_imx8mp_memmap[FSL_IMX8MP_USDHC3].addr, FSL_IMX8MP_USDHC3_IRQ }, { fsl_imx8mp_memmap[FSL_IMX8MP_USDHC3].addr, FSL_IMX8MP_USDHC3_IRQ },
}; };
object_property_set_uint(OBJECT(&s->usdhc[i]), "vendor",
SDHCI_VENDOR_IMX, &error_abort);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->usdhc[i]), errp)) { if (!sysbus_realize(SYS_BUS_DEVICE(&s->usdhc[i]), errp)) {
return; return;
} }

6
hw/sd/sdhci.c
View file

@ -1735,18 +1735,12 @@ usdhc_write(void *opaque, hwaddr offset, uint64_t val, unsigned size)
case USDHC_VENDOR_SPEC: case USDHC_VENDOR_SPEC:
s->vendor_spec = value; s->vendor_spec = value;
switch (s->vendor) {
case SDHCI_VENDOR_IMX:
if (value & USDHC_IMX_FRC_SDCLK_ON) { if (value & USDHC_IMX_FRC_SDCLK_ON) {
s->prnsts &= ~SDHC_IMX_CLOCK_GATE_OFF; s->prnsts &= ~SDHC_IMX_CLOCK_GATE_OFF;
} else { } else {
s->prnsts |= SDHC_IMX_CLOCK_GATE_OFF; s->prnsts |= SDHC_IMX_CLOCK_GATE_OFF;
} }
break; break;
default:
break;
}
break;
case SDHC_HOSTCTL: case SDHC_HOSTCTL:
/* /*

1
include/hw/sd/sdhci.h
View file

@ -109,7 +109,6 @@ struct SDHCIState {
typedef struct SDHCIState SDHCIState; typedef struct SDHCIState SDHCIState;
#define SDHCI_VENDOR_NONE 0 #define SDHCI_VENDOR_NONE 0
#define SDHCI_VENDOR_IMX 1
#define SDHCI_VENDOR_FSL 2 #define SDHCI_VENDOR_FSL 2
/* /*