| Message ID | 20230110164406.94366-14-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/arm: Move various objects to softmmu_ss to build them once (part 1) | expand |
On 10/1/23 17:44, Philippe Mathieu-Daudé wrote: > GPT and GPIO are numbered from #1. > > Fixes: 757282ada8 ("i.MX: Add i.MX7 SOC.") > Fixes: 31cbf933f0 ("i.MX: Add i.MX6UL SOC") > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > hw/arm/fsl-imx6ul.c | 4 ++-- > hw/arm/fsl-imx7.c | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/hw/arm/fsl-imx6ul.c b/hw/arm/fsl-imx6ul.c > index d88d6cc1c5..568317117c 100644 > --- a/hw/arm/fsl-imx6ul.c > +++ b/hw/arm/fsl-imx6ul.c > @@ -72,7 +72,7 @@ static void fsl_imx6ul_init(Object *obj) > * GPIOs 1 to 5 FWIW it is even ^^^^^^ commented. > */ > for (i = 0; i < FSL_IMX6UL_NUM_GPIOS; i++) { > - snprintf(name, NAME_SIZE, "gpio%d", i); > + snprintf(name, NAME_SIZE, "gpio%d", i + 1); > object_initialize_child(obj, name, &s->gpio[i], TYPE_IMX_GPIO); > } > > @@ -80,7 +80,7 @@ static void fsl_imx6ul_init(Object *obj) > * GPT 1, 2 ^^^^ > */ > for (i = 0; i < FSL_IMX6UL_NUM_GPTS; i++) { > - snprintf(name, NAME_SIZE, "gpt%d", i); > + snprintf(name, NAME_SIZE, "gpt%d", i + 1); > object_initialize_child(obj, name, &s->gpt[i], TYPE_IMX6UL_GPT); > } > > diff --git a/hw/arm/fsl-imx7.c b/hw/arm/fsl-imx7.c > index afc7480799..6115677d43 100644 > --- a/hw/arm/fsl-imx7.c > +++ b/hw/arm/fsl-imx7.c > @@ -52,7 +52,7 @@ static void fsl_imx7_init(Object *obj) > * GPIOs 1 to 7 ^^^^^^ > */ > for (i = 0; i < FSL_IMX7_NUM_GPIOS; i++) { > - snprintf(name, NAME_SIZE, "gpio%d", i); > + snprintf(name, NAME_SIZE, "gpio%d", i + 1); > object_initialize_child(obj, name, &s->gpio[i], TYPE_IMX_GPIO); > } > > @@ -60,7 +60,7 @@ static void fsl_imx7_init(Object *obj) > * GPT1, 2, 3, 4 ^^^^^^^^^^ > */ > for (i = 0; i < FSL_IMX7_NUM_GPTS; i++) { > - snprintf(name, NAME_SIZE, "gpt%d", i); > + snprintf(name, NAME_SIZE, "gpt%d", i + 1); > object_initialize_child(obj, name, &s->gpt[i], TYPE_IMX7_GPT); > } >
diff --git a/hw/arm/fsl-imx6ul.c b/hw/arm/fsl-imx6ul.c index d88d6cc1c5..568317117c 100644 --- a/hw/arm/fsl-imx6ul.c +++ b/hw/arm/fsl-imx6ul.c @@ -72,7 +72,7 @@ static void fsl_imx6ul_init(Object *obj) * GPIOs 1 to 5 */ for (i = 0; i < FSL_IMX6UL_NUM_GPIOS; i++) { - snprintf(name, NAME_SIZE, "gpio%d", i); + snprintf(name, NAME_SIZE, "gpio%d", i + 1); object_initialize_child(obj, name, &s->gpio[i], TYPE_IMX_GPIO); } @@ -80,7 +80,7 @@ static void fsl_imx6ul_init(Object *obj) * GPT 1, 2 */ for (i = 0; i < FSL_IMX6UL_NUM_GPTS; i++) { - snprintf(name, NAME_SIZE, "gpt%d", i); + snprintf(name, NAME_SIZE, "gpt%d", i + 1); object_initialize_child(obj, name, &s->gpt[i], TYPE_IMX6UL_GPT); } diff --git a/hw/arm/fsl-imx7.c b/hw/arm/fsl-imx7.c index afc7480799..6115677d43 100644 --- a/hw/arm/fsl-imx7.c +++ b/hw/arm/fsl-imx7.c @@ -52,7 +52,7 @@ static void fsl_imx7_init(Object *obj) * GPIOs 1 to 7 */ for (i = 0; i < FSL_IMX7_NUM_GPIOS; i++) { - snprintf(name, NAME_SIZE, "gpio%d", i); + snprintf(name, NAME_SIZE, "gpio%d", i + 1); object_initialize_child(obj, name, &s->gpio[i], TYPE_IMX_GPIO); } @@ -60,7 +60,7 @@ static void fsl_imx7_init(Object *obj) * GPT1, 2, 3, 4 */ for (i = 0; i < FSL_IMX7_NUM_GPTS; i++) { - snprintf(name, NAME_SIZE, "gpt%d", i); + snprintf(name, NAME_SIZE, "gpt%d", i + 1); object_initialize_child(obj, name, &s->gpt[i], TYPE_IMX7_GPT); }
GPT and GPIO are numbered from #1. Fixes: 757282ada8 ("i.MX: Add i.MX7 SOC.") Fixes: 31cbf933f0 ("i.MX: Add i.MX6UL SOC") Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/arm/fsl-imx6ul.c | 4 ++-- hw/arm/fsl-imx7.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)