mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 01:43:39 +00:00
Remove i.MX7 IOMUX GPR device from i.MX6UL
i.MX7 IOMUX GPR device is not equivalent to i.MX6UL IOMUXC GPR device. In particular, register 22 is not present on i.MX6UL and this is actualy The only register that is really emulated in the i.MX7 IOMUX GPR device. Note: The i.MX6UL code is actually also implementing the IOMUX GPR device as an unimplemented device at the same bus adress and the 2 instantiations were actualy colliding. So we go back to the unimplemented device for now. Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net> Message-id: 48681bf51ee97646479bb261bee19abebbc8074e.1692964892.git.jcd@tribudubois.net Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
9e771a2fc6
commit
6f97cfd8e0
|
@ -63,11 +63,6 @@ static void fsl_imx6ul_init(Object *obj)
|
|||
*/
|
||||
object_initialize_child(obj, "snvs", &s->snvs, TYPE_IMX7_SNVS);
|
||||
|
||||
/*
|
||||
* GPR
|
||||
*/
|
||||
object_initialize_child(obj, "gpr", &s->gpr, TYPE_IMX7_GPR);
|
||||
|
||||
/*
|
||||
* GPIOs 1 to 5
|
||||
*/
|
||||
|
@ -537,12 +532,6 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)
|
|||
FSL_IMX6UL_WDOGn_IRQ[i]));
|
||||
}
|
||||
|
||||
/*
|
||||
* GPR
|
||||
*/
|
||||
sysbus_realize(SYS_BUS_DEVICE(&s->gpr), &error_abort);
|
||||
sysbus_mmio_map(SYS_BUS_DEVICE(&s->gpr), 0, FSL_IMX6UL_IOMUXC_GPR_ADDR);
|
||||
|
||||
/*
|
||||
* SDMA
|
||||
*/
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
#include "hw/misc/imx6ul_ccm.h"
|
||||
#include "hw/misc/imx6_src.h"
|
||||
#include "hw/misc/imx7_snvs.h"
|
||||
#include "hw/misc/imx7_gpr.h"
|
||||
#include "hw/intc/imx_gpcv2.h"
|
||||
#include "hw/watchdog/wdt_imx2.h"
|
||||
#include "hw/gpio/imx_gpio.h"
|
||||
|
@ -74,7 +73,6 @@ struct FslIMX6ULState {
|
|||
IMX6SRCState src;
|
||||
IMX7SNVSState snvs;
|
||||
IMXGPCv2State gpcv2;
|
||||
IMX7GPRState gpr;
|
||||
IMXSPIState spi[FSL_IMX6UL_NUM_ECSPIS];
|
||||
IMXI2CState i2c[FSL_IMX6UL_NUM_I2CS];
|
||||
IMXSerialState uart[FSL_IMX6UL_NUM_UARTS];
|
||||
|
|
Loading…
Reference in a new issue