It enables emulation of GPT in iMX8MM
Added GPT IRQ lines
Signed-off-by: Gaurav Sharma
---
docs/system/arm/imx8mm-evk.rst | 1 +
hw/arm/Kconfig | 1 +
hw/arm/fsl-imx8mm.c| 53 ++
hw/timer/imx_gpt.c | 26 +
include/hw/arm/fsl-imx8mm.h| 11 +++
include/hw/timer/imx_gpt.h | 2 ++
6 files changed, 94 insertions(+)
diff --git a/docs/system/arm/imx8mm-evk.rst b/docs/system/arm/imx8mm-evk.rst
index b7034ff472..96981bf27d 100644
--- a/docs/system/arm/imx8mm-evk.rst
+++ b/docs/system/arm/imx8mm-evk.rst
@@ -18,6 +18,7 @@ The ``imx8mm-evk`` machine implements the following devices:
* 6 I2C Controllers
* 3 SPI Controllers
* 3 Watchdogs
+ * 6 General Purpose Timers
* Secure Non-Volatile Storage (SNVS) including an RTC
* Clock Tree
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 9498a96f30..733baea384 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -635,6 +635,7 @@ config FSL_IMX8MM
select FSL_IMX8MM_CCM
select IMX
select IMX_I2C
+select OR_IRQ
select SDHCI
select PCI_EXPRESS_DESIGNWARE
select PCI_EXPRESS_FSL_IMX8M_PHY
diff --git a/hw/arm/fsl-imx8mm.c b/hw/arm/fsl-imx8mm.c
index 0a3e057bf3..e5599b1c48 100644
--- a/hw/arm/fsl-imx8mm.c
+++ b/hw/arm/fsl-imx8mm.c
@@ -177,6 +177,13 @@ static void fsl_imx8mm_init(Object *obj)
object_initialize_child(obj, name, &s->uart[i], TYPE_IMX_SERIAL);
}
+for (i = 0; i < FSL_IMX8MM_NUM_GPTS; i++) {
+g_autofree char *name = g_strdup_printf("gpt%d", i + 1);
+object_initialize_child(obj, name, &s->gpt[i], TYPE_IMX8MM_GPT);
+}
+object_initialize_child(obj, "gpt5-gpt6-irq", &s->gpt5_gpt6_irq,
+TYPE_OR_IRQ);
+
for (i = 0; i < FSL_IMX8MM_NUM_I2CS; i++) {
g_autofree char *name = g_strdup_printf("i2c%d", i + 1);
object_initialize_child(obj, name, &s->i2c[i], TYPE_IMX_I2C);
@@ -370,6 +377,52 @@ static void fsl_imx8mm_realize(DeviceState *dev, Error
**errp)
qdev_get_gpio_in(gicdev, serial_table[i].irq));
}
+/* GPTs */
+object_property_set_int(OBJECT(&s->gpt5_gpt6_irq), "num-lines", 2,
+&error_abort);
+if (!qdev_realize(DEVICE(&s->gpt5_gpt6_irq), NULL, errp)) {
+return;
+}
+
+qdev_connect_gpio_out(DEVICE(&s->gpt5_gpt6_irq), 0,
+ qdev_get_gpio_in(gicdev, FSL_IMX8MM_GPT5_GPT6_IRQ));
+
+for (i = 0; i < FSL_IMX8MM_NUM_GPTS; i++) {
+hwaddr gpt_addrs[FSL_IMX8MM_NUM_GPTS] = {
+fsl_imx8mm_memmap[FSL_IMX8MM_GPT1].addr,
+fsl_imx8mm_memmap[FSL_IMX8MM_GPT2].addr,
+fsl_imx8mm_memmap[FSL_IMX8MM_GPT3].addr,
+fsl_imx8mm_memmap[FSL_IMX8MM_GPT4].addr,
+fsl_imx8mm_memmap[FSL_IMX8MM_GPT5].addr,
+fsl_imx8mm_memmap[FSL_IMX8MM_GPT6].addr,
+};
+
+s->gpt[i].ccm = IMX_CCM(&s->ccm);
+
+if (!sysbus_realize(SYS_BUS_DEVICE(&s->gpt[i]), errp)) {
+return;
+}
+
+sysbus_mmio_map(SYS_BUS_DEVICE(&s->gpt[i]), 0, gpt_addrs[i]);
+
+if (i < FSL_IMX8MM_NUM_GPTS - 2) {
+static const unsigned int gpt_irqs[FSL_IMX8MM_NUM_GPTS - 2] = {
+FSL_IMX8MM_GPT1_IRQ,
+FSL_IMX8MM_GPT2_IRQ,
+FSL_IMX8MM_GPT3_IRQ,
+FSL_IMX8MM_GPT4_IRQ,
+};
+
+sysbus_connect_irq(SYS_BUS_DEVICE(&s->gpt[i]), 0,
+ qdev_get_gpio_in(gicdev, gpt_irqs[i]));
+} else {
+int irq = i - FSL_IMX8MM_NUM_GPTS + 2;
+
+sysbus_connect_irq(SYS_BUS_DEVICE(&s->gpt[i]), 0,
+ qdev_get_gpio_in(DEVICE(&s->gpt5_gpt6_irq),
irq));
+}
+}
+
/* I2Cs */
for (i = 0; i < FSL_IMX8MM_NUM_I2CS; i++) {
static const struct {
diff --git a/hw/timer/imx_gpt.c b/hw/timer/imx_gpt.c
index 8c7cbfdeac..5eba637f7d 100644
--- a/hw/timer/imx_gpt.c
+++ b/hw/timer/imx_gpt.c
@@ -6,6 +6,7 @@
* Originally written by Hans Jiang
* Updated by Peter Chubb
* Updated by Jean-Christophe Dubois
+ * Updated by Gaurav Sharma
*
* This code is licensed under GPL version 2 or later. See
* the COPYING file in the top-level directory.
@@ -137,6 +138,17 @@ static const IMXClk imx8mp_gpt_clocks[] = {
CLK_NONE, /* 111 not defined */
};
+static const IMXClk imx8mm_gpt_clocks[] = {
+CLK_NONE, /* 000 No clock source */
+CLK_IPG, /* 001 ipg_clk, 532MHz */
+CLK_IPG_HIGH, /* 010 ipg_clk_highfreq */
+CLK_EXT, /* 011 External clock */
+CLK_32k, /* 100 ipg_clk_32k */
+CLK_HIGH, /* 101 ipg_clk_16M */
+CLK_NONE, /* 110 not defined */
+CLK_NONE, /* 111 not defined */
+};
+
/* Must be called from within ptimer_transaction_begin/commit block */
static void imx_gpt_set_freq(IMXGPTState *s)
{
@@ -570,6 +582,13 @@ static void imx8mp_gpt_
