diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2022-08-04 11:47:58 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2022-08-04 11:47:58 -0700 |
| commit | 0ee33dd0cee1f9a239d561f1a91e6ea493d1f5a9 (patch) | |
| tree | 3964e59088152d12cf24a54d1aa81054a2f5a911 | |
| parent | 2480f3bbd03814b0651a1f74959f5c6631ee5819 (diff) | |
| parent | ed021daf2d6c19499ae406055156dc19c073228f (diff) | |
Merge tag 'pull-ppc-20220804' of https://gitlab.com/danielhb/qemu into staging
ppc patch queue for 2022-08-04:
In this short queue we have a fix in the sam460ex machine where we're
not storing all GPIO lines in sam460ex_init().
This is not causing problems (as far as we're aware of) at this moment,
but this is getting in the way of a ppc405 rework we want to do for 7.2,
so let's fix it now.
# -----BEGIN PGP SIGNATURE-----
#
# iHUEABYKAB0WIQQX6/+ZI9AYAK8oOBk82cqW3gMxZAUCYuwOIQAKCRA82cqW3gMx
# ZN+NAQDDOk4b79khltmrslo4Sa16nu/ARgqMGOsyy0Y5Whs9MgEAyiAVhpQ6C7Ok
# W2sHeUkv/ZvzWvE7LWXMPZehBgU9DgM=
# =QrsF
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 04 Aug 2022 11:21:21 AM PDT
# gpg: using EDDSA key 17EBFF9923D01800AF2838193CD9CA96DE033164
# gpg: Good signature from "Daniel Henrique Barboza <danielhb413@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 17EB FF99 23D0 1800 AF28 3819 3CD9 CA96 DE03 3164
* tag 'pull-ppc-20220804' of https://gitlab.com/danielhb/qemu:
hw/ppc: sam460ex.c: store all GPIO lines in mal_irqs[]
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
| -rw-r--r-- | hw/ppc/sam460ex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index 7e8da657c2..0357ee077f 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -384,7 +384,7 @@ static void sam460ex_init(MachineState *machine) /* MAL */ for (i = 0; i < ARRAY_SIZE(mal_irqs); i++) { - mal_irqs[0] = qdev_get_gpio_in(uic[2], 3 + i); + mal_irqs[i] = qdev_get_gpio_in(uic[2], 3 + i); } ppc4xx_mal_init(env, 4, 16, mal_irqs); |