From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 02/11] hw/arm/fsl-imx6ul: Fix USB interrupt numbers
Date: Tue, 17 Mar 2020 11:40:30 +0000 [thread overview]
Message-ID: <20200317114039.26914-3-peter.maydell@linaro.org> (raw)
In-Reply-To: <20200317114039.26914-1-peter.maydell@linaro.org>
From: Guenter Roeck <linux@roeck-us.net>
USB1 and USB2 interrupt numbers were swapped. USB_PHY2 interrupt number
is 45. That didn't really matter up to now since the interrupts were not
used, but it needs to be fixed to be able to wire up the USB controllers.
Fixes: 31cbf933f0e ("i.MX6UL: Add i.MX6UL SOC")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Message-id: 20200313014551.12554-3-linux@roeck-us.net
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
include/hw/arm/fsl-imx6ul.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h
index eda389aec7d..5a420785b95 100644
--- a/include/hw/arm/fsl-imx6ul.h
+++ b/include/hw/arm/fsl-imx6ul.h
@@ -241,10 +241,10 @@ enum FslIMX6ULIRQs {
FSL_IMX6UL_UART7_IRQ = 39,
FSL_IMX6UL_UART8_IRQ = 40,
- FSL_IMX6UL_USB1_IRQ = 42,
- FSL_IMX6UL_USB2_IRQ = 43,
+ FSL_IMX6UL_USB1_IRQ = 43,
+ FSL_IMX6UL_USB2_IRQ = 42,
FSL_IMX6UL_USB_PHY1_IRQ = 44,
- FSL_IMX6UL_USB_PHY2_IRQ = 44,
+ FSL_IMX6UL_USB_PHY2_IRQ = 45,
FSL_IMX6UL_CAAM_JQ2_IRQ = 46,
FSL_IMX6UL_CAAM_ERR_IRQ = 47,
--
2.20.1
next prev parent reply other threads:[~2020-03-17 11:42 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-17 11:40 [PULL 00/11] target-arm queue Peter Maydell
2020-03-17 11:40 ` [PULL 01/11] hw/usb: Add basic i.MX USB Phy support Peter Maydell
2020-03-17 11:40 ` Peter Maydell [this message]
2020-03-17 11:40 ` [PULL 03/11] hw/arm/fsl-imx6ul: Instantiate unimplemented pwm and can devices Peter Maydell
2020-03-17 11:40 ` [PULL 04/11] hw/arm/fsl-imx6ul: Wire up USB controllers Peter Maydell
2020-03-17 11:40 ` [PULL 05/11] hw/arm/fsl-imx6: " Peter Maydell
2020-03-17 11:40 ` [PULL 06/11] hw/net/imx_fec: write TGSR and TCSR3 in imx_enet_write() Peter Maydell
2020-03-17 11:40 ` [PULL 07/11] m25p80: Convert to support tracing Peter Maydell
2020-03-17 11:40 ` [PULL 08/11] m25p80: Improve command handling for Jedec commands Peter Maydell
2020-03-17 11:40 ` [PULL 09/11] m25p80: Improve command handling for unsupported commands Peter Maydell
2020-03-17 11:40 ` [PULL 10/11] aspeed/smc: Fix number of dummy cycles for FAST_READ_4 command Peter Maydell
2020-03-17 11:40 ` [PULL 11/11] hw/arm/pxa2xx: Do not wire up OHCI for PXA255 Peter Maydell
2020-03-17 16:21 ` [PULL 00/11] target-arm queue Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200317114039.26914-3-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).