From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Alistair Francis" <alistair@alistair23.me>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Andrew Baumann" <Andrew.Baumann@microsoft.com>,
qemu-arm@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>,
"Marc-Andre Lureau" <marcandre.lureau@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH 3/3] hw: Move BCM2835 AUX device from hw/char/ to hw/misc/
Date: Mon, 7 Oct 2019 19:06:46 +0200 [thread overview]
Message-ID: <20191007170646.14961-4-f4bug@amsat.org> (raw)
In-Reply-To: <20191007170646.14961-1-f4bug@amsat.org>
The BCM2835 AUX device is a MUX between one UART block and two SPI
blocks. Move it to the hw/misc/ folder.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/char/Makefile.objs | 1 -
hw/char/trace-events | 4 ----
hw/misc/Makefile.objs | 1 +
hw/{char => misc}/bcm2835_aux.c | 2 +-
hw/misc/trace-events | 4 ++++
include/hw/arm/bcm2835_peripherals.h | 2 +-
include/hw/{char => misc}/bcm2835_aux.h | 0
7 files changed, 7 insertions(+), 7 deletions(-)
rename hw/{char => misc}/bcm2835_aux.c (99%)
rename include/hw/{char => misc}/bcm2835_aux.h (100%)
diff --git a/hw/char/Makefile.objs b/hw/char/Makefile.objs
index 5bd93bde9f..d6b8ce5e60 100644
--- a/hw/char/Makefile.objs
+++ b/hw/char/Makefile.objs
@@ -20,7 +20,6 @@ obj-$(CONFIG_SH4) += sh_serial.o
obj-$(CONFIG_PSERIES) += spapr_vty.o
obj-$(CONFIG_DIGIC) += digic-uart.o
obj-$(CONFIG_STM32F2XX_USART) += stm32f2xx_usart.o
-obj-$(CONFIG_RASPI) += bcm2835_aux.o
common-obj-$(CONFIG_RASPI) += bcm2835_miniuart.o
common-obj-$(CONFIG_CMSDK_APB_UART) += cmsdk-apb-uart.o
diff --git a/hw/char/trace-events b/hw/char/trace-events
index 0c86a907df..f1e6dd9918 100644
--- a/hw/char/trace-events
+++ b/hw/char/trace-events
@@ -1,9 +1,5 @@
# See docs/devel/tracing.txt for syntax documentation.
-# bcm2835_aux.c
-bcm2835_aux_read(uint64_t addr, uint32_t value) "read addr 0x%"PRIx64" value 0x%x"
-bcm2835_aux_write(uint64_t addr, uint32_t value) "read addr 0x%"PRIx64" value 0x%x"
-
# bcm2835_miniuart.c
bcm2835_miniuart_read(uint64_t addr, uint32_t value) "read addr 0x%"PRIx64" value 0x%x"
bcm2835_miniuart_write(uint64_t addr, uint32_t value) "read addr 0x%"PRIx64" value 0x%x"
diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs
index a150680966..9ffeee7f46 100644
--- a/hw/misc/Makefile.objs
+++ b/hw/misc/Makefile.objs
@@ -50,6 +50,7 @@ common-obj-$(CONFIG_OMAP) += omap_gpmc.o
common-obj-$(CONFIG_OMAP) += omap_l4.o
common-obj-$(CONFIG_OMAP) += omap_sdrc.o
common-obj-$(CONFIG_OMAP) += omap_tap.o
+common-obj-$(CONFIG_RASPI) += bcm2835_aux.o
common-obj-$(CONFIG_RASPI) += bcm2835_mbox.o
common-obj-$(CONFIG_RASPI) += bcm2835_property.o
common-obj-$(CONFIG_RASPI) += bcm2835_rng.o
diff --git a/hw/char/bcm2835_aux.c b/hw/misc/bcm2835_aux.c
similarity index 99%
rename from hw/char/bcm2835_aux.c
rename to hw/misc/bcm2835_aux.c
index a1ca9741d6..83698e2ece 100644
--- a/hw/char/bcm2835_aux.c
+++ b/hw/misc/bcm2835_aux.c
@@ -12,7 +12,7 @@
*/
#include "qemu/osdep.h"
-#include "hw/char/bcm2835_aux.h"
+#include "hw/misc/bcm2835_aux.h"
#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "hw/registerfields.h"
diff --git a/hw/misc/trace-events b/hw/misc/trace-events
index 74276225f8..0756d58162 100644
--- a/hw/misc/trace-events
+++ b/hw/misc/trace-events
@@ -1,5 +1,9 @@
# See docs/devel/tracing.txt for syntax documentation.
+# bcm2835_aux.c
+bcm2835_aux_read(uint64_t addr, uint32_t value) "read addr 0x%"PRIx64" value 0x%x"
+bcm2835_aux_write(uint64_t addr, uint32_t value) "read addr 0x%"PRIx64" value 0x%x"
+
# eccmemctl.c
ecc_mem_writel_mer(uint32_t val) "Write memory enable 0x%08x"
ecc_mem_writel_mdr(uint32_t val) "Write memory delay 0x%08x"
diff --git a/include/hw/arm/bcm2835_peripherals.h b/include/hw/arm/bcm2835_peripherals.h
index 6b17f6a382..7aae515d7e 100644
--- a/include/hw/arm/bcm2835_peripherals.h
+++ b/include/hw/arm/bcm2835_peripherals.h
@@ -13,7 +13,7 @@
#include "hw/sysbus.h"
#include "hw/char/pl011.h"
-#include "hw/char/bcm2835_aux.h"
+#include "hw/misc/bcm2835_aux.h"
#include "hw/display/bcm2835_fb.h"
#include "hw/dma/bcm2835_dma.h"
#include "hw/intc/bcm2835_ic.h"
diff --git a/include/hw/char/bcm2835_aux.h b/include/hw/misc/bcm2835_aux.h
similarity index 100%
rename from include/hw/char/bcm2835_aux.h
rename to include/hw/misc/bcm2835_aux.h
--
2.21.0
next prev parent reply other threads:[~2019-10-07 17:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-07 17:06 [PATCH 0/3] hw/arm/raspi: Split the UART block from the AUX block Philippe Mathieu-Daudé
2019-10-07 17:06 ` [PATCH 1/3] hw/char: Add the BCM2835 miniuart Philippe Mathieu-Daudé
2019-10-11 22:05 ` Alistair Francis
2019-10-07 17:06 ` [PATCH 2/3] hw/char/bcm2835_aux: Use the BCM2835 miniuart block Philippe Mathieu-Daudé
2019-10-07 17:06 ` Philippe Mathieu-Daudé [this message]
2019-10-07 21:09 ` [PATCH 0/3] hw/arm/raspi: Split the UART block from the AUX block no-reply
2019-10-17 16:23 ` 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=20191007170646.14961-4-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=Andrew.Baumann@microsoft.com \
--cc=alistair@alistair23.me \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-arm@nongnu.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).