From: minyard@acm.org
To: qemu-devel@nongnu.org, Titus Rwantare <titusr@google.com>
Cc: Corey Minyard <cminyard@mvista.com>,
qemu-arm@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Subject: [PATCH 2/3] adc: Move the max111x driver to the adc directory
Date: Tue, 18 May 2021 19:03:30 -0500 [thread overview]
Message-ID: <20210519000331.3690536-3-minyard@acm.org> (raw)
In-Reply-To: <20210519000331.3690536-1-minyard@acm.org>
From: Corey Minyard <cminyard@mvista.com>
It's an adc, put it where it belongs.
Cc: Andrzej Zaborowski <balrogg@gmail.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Corey Minyard <cminyard@mvista.com>
---
MAINTAINERS | 4 ++--
hw/adc/Kconfig | 3 +++
hw/{misc => adc}/max111x.c | 2 +-
hw/adc/meson.build | 3 ++-
hw/arm/spitz.c | 2 +-
hw/misc/Kconfig | 3 ---
hw/misc/meson.build | 1 -
include/hw/{misc => adc}/max111x.h | 0
8 files changed, 9 insertions(+), 9 deletions(-)
rename hw/{misc => adc}/max111x.c (99%)
rename include/hw/{misc => adc}/max111x.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 6cb3b15f97..4fbedc7c11 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -834,8 +834,8 @@ F: hw/display/tc6393xb.c
F: hw/gpio/max7310.c
F: hw/gpio/zaurus.c
F: hw/misc/mst_fpga.c
-F: hw/misc/max111x.c
-F: include/hw/misc/max111x.h
+F: hw/adc/max111x.c
+F: include/hw/adc/max111x.h
F: include/hw/arm/pxa.h
F: include/hw/arm/sharpsl.h
F: include/hw/display/tc6393xb.h
diff --git a/hw/adc/Kconfig b/hw/adc/Kconfig
index 25d2229fb8..a825bd3d34 100644
--- a/hw/adc/Kconfig
+++ b/hw/adc/Kconfig
@@ -1,2 +1,5 @@
config STM32F2XX_ADC
bool
+
+config MAX111X
+ bool
diff --git a/hw/misc/max111x.c b/hw/adc/max111x.c
similarity index 99%
rename from hw/misc/max111x.c
rename to hw/adc/max111x.c
index 1b3234a519..e8bf4cccd4 100644
--- a/hw/misc/max111x.c
+++ b/hw/adc/max111x.c
@@ -11,7 +11,7 @@
*/
#include "qemu/osdep.h"
-#include "hw/misc/max111x.h"
+#include "hw/adc/max111x.h"
#include "hw/irq.h"
#include "migration/vmstate.h"
#include "qemu/module.h"
diff --git a/hw/adc/meson.build b/hw/adc/meson.build
index 3d397b4ea1..ac4f093fea 100644
--- a/hw/adc/meson.build
+++ b/hw/adc/meson.build
@@ -1,3 +1,4 @@
softmmu_ss.add(when: 'CONFIG_STM32F2XX_ADC', if_true: files('stm32f2xx_adc.c'))
softmmu_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_adc.c'))
-softmmu_ss.add(when: 'CONFIG_ZYNQ', if_true: files('zynq-xadc.c'))
\ No newline at end of file
+softmmu_ss.add(when: 'CONFIG_ZYNQ', if_true: files('zynq-xadc.c'))
+softmmu_ss.add(when: 'CONFIG_MAX111X', if_true: files('max111x.c'))
diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
index b45a929cbd..0e2626125e 100644
--- a/hw/arm/spitz.c
+++ b/hw/arm/spitz.c
@@ -30,7 +30,7 @@
#include "audio/audio.h"
#include "hw/boards.h"
#include "hw/sysbus.h"
-#include "hw/misc/max111x.h"
+#include "hw/adc/max111x.h"
#include "migration/vmstate.h"
#include "exec/address-spaces.h"
#include "cpu.h"
diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
index c71ed25820..996d45aff5 100644
--- a/hw/misc/Kconfig
+++ b/hw/misc/Kconfig
@@ -11,9 +11,6 @@ config ARMSSE_MHU
config ARMSSE_CPU_PWRCTRL
bool
-config MAX111X
- bool
-
config TMP105
bool
depends on I2C
diff --git a/hw/misc/meson.build b/hw/misc/meson.build
index 508fce50c7..b0a8ee8994 100644
--- a/hw/misc/meson.build
+++ b/hw/misc/meson.build
@@ -3,7 +3,6 @@ softmmu_ss.add(when: 'CONFIG_EDU', if_true: files('edu.c'))
softmmu_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('vmcoreinfo.c'))
softmmu_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugexit.c'))
softmmu_ss.add(when: 'CONFIG_ISA_TESTDEV', if_true: files('pc-testdev.c'))
-softmmu_ss.add(when: 'CONFIG_MAX111X', if_true: files('max111x.c'))
softmmu_ss.add(when: 'CONFIG_PCA9552', if_true: files('pca9552.c'))
softmmu_ss.add(when: 'CONFIG_PCI_TESTDEV', if_true: files('pci-testdev.c'))
softmmu_ss.add(when: 'CONFIG_SGA', if_true: files('sga.c'))
diff --git a/include/hw/misc/max111x.h b/include/hw/adc/max111x.h
similarity index 100%
rename from include/hw/misc/max111x.h
rename to include/hw/adc/max111x.h
--
2.25.1
next prev parent reply other threads:[~2021-05-19 0:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-19 0:03 [PATCH 0/3] Move some things out of hw/misc minyard
2021-05-19 0:03 ` [PATCH 1/3] adc: Move the zynq-xadc file to the adc directories minyard
2021-05-19 17:56 ` Philippe Mathieu-Daudé
2021-05-19 17:57 ` Philippe Mathieu-Daudé
2021-05-19 18:10 ` Edgar E. Iglesias
2021-05-19 0:03 ` minyard [this message]
2021-05-19 17:56 ` [PATCH 2/3] adc: Move the max111x driver to the adc directory Philippe Mathieu-Daudé
2021-05-19 0:03 ` [PATCH 3/3] sensor: Move hardware sensors from misc to a sensor directory minyard
2021-05-19 7:23 ` Cédric Le Goater
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=20210519000331.3690536-3-minyard@acm.org \
--to=minyard@acm.org \
--cc=cminyard@mvista.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=titusr@google.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.