* [PATCH 1/3] adc: Move the zynq-xadc file to the adc directories
2021-05-19 0:03 [PATCH 0/3] Move some things out of hw/misc minyard
@ 2021-05-19 0:03 ` minyard
2021-05-19 17:56 ` Philippe Mathieu-Daudé
2021-05-19 17:57 ` Philippe Mathieu-Daudé
2021-05-19 0:03 ` [PATCH 2/3] adc: Move the max111x driver to the adc directory minyard
2021-05-19 0:03 ` [PATCH 3/3] sensor: Move hardware sensors from misc to a sensor directory minyard
2 siblings, 2 replies; 9+ messages in thread
From: minyard @ 2021-05-19 0:03 UTC (permalink / raw)
To: qemu-devel, Titus Rwantare
Cc: Peter Maydell, Corey Minyard, Alistair Francis, qemu-arm,
Edgar E . Iglesias
From: Corey Minyard <cminyard@mvista.com>
It's an ADC, put it where it belongs.
Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Cc: Alistair Francis <alistair@alistair23.me>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Corey Minyard <cminyard@mvista.com>
---
MAINTAINERS | 6 ++++--
hw/adc/meson.build | 1 +
hw/{misc => adc}/zynq-xadc.c | 2 +-
hw/arm/xilinx_zynq.c | 2 +-
hw/misc/meson.build | 2 +-
include/hw/{misc => adc}/zynq-xadc.h | 0
6 files changed, 8 insertions(+), 5 deletions(-)
rename hw/{misc => adc}/zynq-xadc.c (99%)
rename include/hw/{misc => adc}/zynq-xadc.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index eab178aeee..6cb3b15f97 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -913,8 +913,10 @@ L: qemu-arm@nongnu.org
S: Maintained
F: hw/*/xilinx_*
F: hw/*/cadence_*
-F: hw/misc/zynq*
-F: include/hw/misc/zynq*
+F: hw/misc/zynq_slcr.c
+F: hw/adc/zynq-xadc.c
+F: include/hw/misc/zynq_slcr.h
+F: include/hw/adc/zynq-xadc.h
X: hw/ssi/xilinx_*
Xilinx ZynqMP and Versal
diff --git a/hw/adc/meson.build b/hw/adc/meson.build
index 6ddee23813..3d397b4ea1 100644
--- a/hw/adc/meson.build
+++ b/hw/adc/meson.build
@@ -1,2 +1,3 @@
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
diff --git a/hw/misc/zynq-xadc.c b/hw/adc/zynq-xadc.c
similarity index 99%
rename from hw/misc/zynq-xadc.c
rename to hw/adc/zynq-xadc.c
index 7b1972ce06..cfc7bab065 100644
--- a/hw/misc/zynq-xadc.c
+++ b/hw/adc/zynq-xadc.c
@@ -15,7 +15,7 @@
#include "qemu/osdep.h"
#include "hw/irq.h"
-#include "hw/misc/zynq-xadc.h"
+#include "hw/adc/zynq-xadc.h"
#include "migration/vmstate.h"
#include "qemu/timer.h"
#include "qemu/log.h"
diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
index 81af32dc42..245af81bbb 100644
--- a/hw/arm/xilinx_zynq.c
+++ b/hw/arm/xilinx_zynq.c
@@ -26,7 +26,7 @@
#include "hw/boards.h"
#include "hw/block/flash.h"
#include "hw/loader.h"
-#include "hw/misc/zynq-xadc.h"
+#include "hw/adc/zynq-xadc.h"
#include "hw/ssi/ssi.h"
#include "hw/usb/chipidea.h"
#include "qemu/error-report.h"
diff --git a/hw/misc/meson.build b/hw/misc/meson.build
index 66e1648533..508fce50c7 100644
--- a/hw/misc/meson.build
+++ b/hw/misc/meson.build
@@ -84,7 +84,7 @@ softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files(
'bcm2835_cprman.c',
))
softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_misc.c'))
-softmmu_ss.add(when: 'CONFIG_ZYNQ', if_true: files('zynq_slcr.c', 'zynq-xadc.c'))
+softmmu_ss.add(when: 'CONFIG_ZYNQ', if_true: files('zynq_slcr.c'))
softmmu_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal-xramc.c'))
softmmu_ss.add(when: 'CONFIG_STM32F2XX_SYSCFG', if_true: files('stm32f2xx_syscfg.c'))
softmmu_ss.add(when: 'CONFIG_STM32F4XX_SYSCFG', if_true: files('stm32f4xx_syscfg.c'))
diff --git a/include/hw/misc/zynq-xadc.h b/include/hw/adc/zynq-xadc.h
similarity index 100%
rename from include/hw/misc/zynq-xadc.h
rename to include/hw/adc/zynq-xadc.h
--
2.25.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 1/3] adc: Move the zynq-xadc file to the adc directories
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é
1 sibling, 0 replies; 9+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-05-19 17:56 UTC (permalink / raw)
To: minyard, qemu-devel, Titus Rwantare
Cc: Peter Maydell, Alistair Francis, qemu-arm, Corey Minyard
On 5/19/21 2:03 AM, minyard@acm.org wrote:
> From: Corey Minyard <cminyard@mvista.com>
>
> It's an ADC, put it where it belongs.
>
> Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>
> Cc: Alistair Francis <alistair@alistair23.me>
> Cc: Peter Maydell <peter.maydell@linaro.org>
> Cc: qemu-arm@nongnu.org
> Signed-off-by: Corey Minyard <cminyard@mvista.com>
> ---
> MAINTAINERS | 6 ++++--
> hw/adc/meson.build | 1 +
> hw/{misc => adc}/zynq-xadc.c | 2 +-
> hw/arm/xilinx_zynq.c | 2 +-
> hw/misc/meson.build | 2 +-
> include/hw/{misc => adc}/zynq-xadc.h | 0
> 6 files changed, 8 insertions(+), 5 deletions(-)
> rename hw/{misc => adc}/zynq-xadc.c (99%)
> rename include/hw/{misc => adc}/zynq-xadc.h (100%)
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/3] adc: Move the zynq-xadc file to the adc directories
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
1 sibling, 1 reply; 9+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-05-19 17:57 UTC (permalink / raw)
To: minyard, qemu-devel, Titus Rwantare
Cc: Peter Maydell, Alistair Francis, qemu-arm, Corey Minyard
On 5/19/21 2:03 AM, minyard@acm.org wrote:
> From: Corey Minyard <cminyard@mvista.com>
>
> It's an ADC, put it where it belongs.
>
> Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>
> Cc: Alistair Francis <alistair@alistair23.me>
> Cc: Peter Maydell <peter.maydell@linaro.org>
> Cc: qemu-arm@nongnu.org
> Signed-off-by: Corey Minyard <cminyard@mvista.com>
> ---
> MAINTAINERS | 6 ++++--
> hw/adc/meson.build | 1 +
> hw/{misc => adc}/zynq-xadc.c | 2 +-
> hw/arm/xilinx_zynq.c | 2 +-
> hw/misc/meson.build | 2 +-
> include/hw/{misc => adc}/zynq-xadc.h | 0
> 6 files changed, 8 insertions(+), 5 deletions(-)
> rename hw/{misc => adc}/zynq-xadc.c (99%)
> rename include/hw/{misc => adc}/zynq-xadc.h (100%)
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/3] adc: Move the zynq-xadc file to the adc directories
2021-05-19 17:57 ` Philippe Mathieu-Daudé
@ 2021-05-19 18:10 ` Edgar E. Iglesias
0 siblings, 0 replies; 9+ messages in thread
From: Edgar E. Iglesias @ 2021-05-19 18:10 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, minyard, Corey Minyard, Titus Rwantare,
Alistair Francis, qemu-devel, qemu-arm
On Wed, May 19, 2021 at 07:57:33PM +0200, Philippe Mathieu-Daudé wrote:
> On 5/19/21 2:03 AM, minyard@acm.org wrote:
> > From: Corey Minyard <cminyard@mvista.com>
> >
> > It's an ADC, put it where it belongs.
> >
> > Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>
> > Cc: Alistair Francis <alistair@alistair23.me>
> > Cc: Peter Maydell <peter.maydell@linaro.org>
> > Cc: qemu-arm@nongnu.org
> > Signed-off-by: Corey Minyard <cminyard@mvista.com>
> > ---
> > MAINTAINERS | 6 ++++--
> > hw/adc/meson.build | 1 +
> > hw/{misc => adc}/zynq-xadc.c | 2 +-
> > hw/arm/xilinx_zynq.c | 2 +-
> > hw/misc/meson.build | 2 +-
> > include/hw/{misc => adc}/zynq-xadc.h | 0
> > 6 files changed, 8 insertions(+), 5 deletions(-)
> > rename hw/{misc => adc}/zynq-xadc.c (99%)
> > rename include/hw/{misc => adc}/zynq-xadc.h (100%)
>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Cheers,
Edgar
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/3] adc: Move the max111x driver to the adc directory
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 0:03 ` minyard
2021-05-19 17:56 ` Philippe Mathieu-Daudé
2021-05-19 0:03 ` [PATCH 3/3] sensor: Move hardware sensors from misc to a sensor directory minyard
2 siblings, 1 reply; 9+ messages in thread
From: minyard @ 2021-05-19 0:03 UTC (permalink / raw)
To: qemu-devel, Titus Rwantare; +Cc: Corey Minyard, qemu-arm, Peter Maydell
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
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 2/3] adc: Move the max111x driver to the adc directory
2021-05-19 0:03 ` [PATCH 2/3] adc: Move the max111x driver to the adc directory minyard
@ 2021-05-19 17:56 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 9+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-05-19 17:56 UTC (permalink / raw)
To: minyard, qemu-devel, Titus Rwantare
Cc: Corey Minyard, qemu-arm, Peter Maydell
On 5/19/21 2:03 AM, minyard@acm.org wrote:
> 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%)
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/3] sensor: Move hardware sensors from misc to a sensor directory
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 0:03 ` [PATCH 2/3] adc: Move the max111x driver to the adc directory minyard
@ 2021-05-19 0:03 ` minyard
2021-05-19 7:23 ` Cédric Le Goater
2 siblings, 1 reply; 9+ messages in thread
From: minyard @ 2021-05-19 0:03 UTC (permalink / raw)
To: qemu-devel, Titus Rwantare
Cc: Corey Minyard, Peter Maydell, Andrew Jeffery, qemu-arm,
Joel Stanley, Cédric Le Goater
From: Corey Minyard <cminyard@mvista.com>
Lots of this are expected to be coming in, create a directory for them.
Also move the tmp105.h file into the include directory where it
should be.
Cc: Cédric Le Goater <clg@kaod.org>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Andrew Jeffery <andrew@aj.id.au>
Cc: Joel Stanley <joel@jms.id.au>
Cc: Andrzej Zaborowski <balrogg@gmail.com>
Cc: qemu-arm@nongnu.org
Signed-off-by: Corey Minyard <cminyard@mvista.com>
---
hw/Kconfig | 1 +
hw/arm/aspeed.c | 2 +-
hw/arm/nseries.c | 2 +-
hw/meson.build | 1 +
hw/misc/Kconfig | 12 ------------
hw/misc/meson.build | 3 ---
hw/sensor/Kconfig | 11 +++++++++++
hw/{misc => sensor}/emc141x.c | 2 +-
hw/sensor/meson.build | 3 +++
hw/{misc => sensor}/tmp105.c | 2 +-
hw/{misc => sensor}/tmp421.c | 0
include/hw/{misc => sensor}/emc141x_regs.h | 0
{hw/misc => include/hw/sensor}/tmp105.h | 2 +-
include/hw/{misc => sensor}/tmp105_regs.h | 0
tests/qtest/emc141x-test.c | 2 +-
tests/qtest/npcm7xx_smbus-test.c | 2 +-
tests/qtest/tmp105-test.c | 2 +-
17 files changed, 24 insertions(+), 23 deletions(-)
create mode 100644 hw/sensor/Kconfig
rename hw/{misc => sensor}/emc141x.c (99%)
create mode 100644 hw/sensor/meson.build
rename hw/{misc => sensor}/tmp105.c (99%)
rename hw/{misc => sensor}/tmp421.c (100%)
rename include/hw/{misc => sensor}/emc141x_regs.h (100%)
rename {hw/misc => include/hw/sensor}/tmp105.h (97%)
rename include/hw/{misc => sensor}/tmp105_regs.h (100%)
diff --git a/hw/Kconfig b/hw/Kconfig
index 805860f564..8cb7664d70 100644
--- a/hw/Kconfig
+++ b/hw/Kconfig
@@ -32,6 +32,7 @@ source remote/Kconfig
source rtc/Kconfig
source scsi/Kconfig
source sd/Kconfig
+source sensor/Kconfig
source smbios/Kconfig
source ssi/Kconfig
source timer/Kconfig
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index 3fe6c55744..272b17f999 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -16,7 +16,7 @@
#include "hw/arm/aspeed_soc.h"
#include "hw/i2c/smbus_eeprom.h"
#include "hw/misc/pca9552.h"
-#include "hw/misc/tmp105.h"
+#include "hw/sensor/tmp105.h"
#include "hw/misc/led.h"
#include "hw/qdev-properties.h"
#include "sysemu/block-backend.h"
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index 0aefa5d0f3..a10d8f53b5 100644
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -36,7 +36,7 @@
#include "hw/display/blizzard.h"
#include "hw/input/tsc2xxx.h"
#include "hw/misc/cbus.h"
-#include "hw/misc/tmp105.h"
+#include "hw/sensor/tmp105.h"
#include "hw/qdev-properties.h"
#include "hw/block/flash.h"
#include "hw/hw.h"
diff --git a/hw/meson.build b/hw/meson.build
index ba0601e36e..b3366c888e 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -31,6 +31,7 @@ subdir('rdma')
subdir('rtc')
subdir('scsi')
subdir('sd')
+subdir('sensor')
subdir('smbios')
subdir('ssi')
subdir('timer')
diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
index 996d45aff5..507058d8bf 100644
--- a/hw/misc/Kconfig
+++ b/hw/misc/Kconfig
@@ -11,18 +11,6 @@ config ARMSSE_MHU
config ARMSSE_CPU_PWRCTRL
bool
-config TMP105
- bool
- depends on I2C
-
-config TMP421
- bool
- depends on I2C
-
-config EMC141X
- bool
- depends on I2C
-
config ISA_DEBUG
bool
depends on ISA_BUS
diff --git a/hw/misc/meson.build b/hw/misc/meson.build
index b0a8ee8994..046c7e0c72 100644
--- a/hw/misc/meson.build
+++ b/hw/misc/meson.build
@@ -6,9 +6,6 @@ softmmu_ss.add(when: 'CONFIG_ISA_TESTDEV', if_true: files('pc-testdev.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'))
-softmmu_ss.add(when: 'CONFIG_TMP105', if_true: files('tmp105.c'))
-softmmu_ss.add(when: 'CONFIG_TMP421', if_true: files('tmp421.c'))
-softmmu_ss.add(when: 'CONFIG_EMC141X', if_true: files('emc141x.c'))
softmmu_ss.add(when: 'CONFIG_UNIMP', if_true: files('unimp.c'))
softmmu_ss.add(when: 'CONFIG_EMPTY_SLOT', if_true: files('empty_slot.c'))
softmmu_ss.add(when: 'CONFIG_LED', if_true: files('led.c'))
diff --git a/hw/sensor/Kconfig b/hw/sensor/Kconfig
new file mode 100644
index 0000000000..097cb8f11e
--- /dev/null
+++ b/hw/sensor/Kconfig
@@ -0,0 +1,11 @@
+config TMP105
+ bool
+ depends on I2C
+
+config TMP421
+ bool
+ depends on I2C
+
+config EMC141X
+ bool
+ depends on I2C
diff --git a/hw/misc/emc141x.c b/hw/sensor/emc141x.c
similarity index 99%
rename from hw/misc/emc141x.c
rename to hw/sensor/emc141x.c
index f7c53d48a4..7ce8f4e979 100644
--- a/hw/misc/emc141x.c
+++ b/hw/sensor/emc141x.c
@@ -25,7 +25,7 @@
#include "qapi/visitor.h"
#include "qemu/module.h"
#include "qom/object.h"
-#include "hw/misc/emc141x_regs.h"
+#include "hw/sensor/emc141x_regs.h"
#define SENSORS_COUNT_MAX 4
diff --git a/hw/sensor/meson.build b/hw/sensor/meson.build
new file mode 100644
index 0000000000..9e0f3ab1fd
--- /dev/null
+++ b/hw/sensor/meson.build
@@ -0,0 +1,3 @@
+softmmu_ss.add(when: 'CONFIG_TMP105', if_true: files('tmp105.c'))
+softmmu_ss.add(when: 'CONFIG_TMP421', if_true: files('tmp421.c'))
+softmmu_ss.add(when: 'CONFIG_EMC141X', if_true: files('emc141x.c'))
diff --git a/hw/misc/tmp105.c b/hw/sensor/tmp105.c
similarity index 99%
rename from hw/misc/tmp105.c
rename to hw/sensor/tmp105.c
index d299d9b21b..2056449489 100644
--- a/hw/misc/tmp105.c
+++ b/hw/sensor/tmp105.c
@@ -22,7 +22,7 @@
#include "hw/i2c/i2c.h"
#include "hw/irq.h"
#include "migration/vmstate.h"
-#include "tmp105.h"
+#include "hw/sensor/tmp105.h"
#include "qapi/error.h"
#include "qapi/visitor.h"
#include "qemu/module.h"
diff --git a/hw/misc/tmp421.c b/hw/sensor/tmp421.c
similarity index 100%
rename from hw/misc/tmp421.c
rename to hw/sensor/tmp421.c
diff --git a/include/hw/misc/emc141x_regs.h b/include/hw/sensor/emc141x_regs.h
similarity index 100%
rename from include/hw/misc/emc141x_regs.h
rename to include/hw/sensor/emc141x_regs.h
diff --git a/hw/misc/tmp105.h b/include/hw/sensor/tmp105.h
similarity index 97%
rename from hw/misc/tmp105.h
rename to include/hw/sensor/tmp105.h
index 7c97071ad7..244e2989fe 100644
--- a/hw/misc/tmp105.h
+++ b/include/hw/sensor/tmp105.h
@@ -15,7 +15,7 @@
#define QEMU_TMP105_H
#include "hw/i2c/i2c.h"
-#include "hw/misc/tmp105_regs.h"
+#include "hw/sensor/tmp105_regs.h"
#include "qom/object.h"
#define TYPE_TMP105 "tmp105"
diff --git a/include/hw/misc/tmp105_regs.h b/include/hw/sensor/tmp105_regs.h
similarity index 100%
rename from include/hw/misc/tmp105_regs.h
rename to include/hw/sensor/tmp105_regs.h
diff --git a/tests/qtest/emc141x-test.c b/tests/qtest/emc141x-test.c
index 714058806a..8c86694091 100644
--- a/tests/qtest/emc141x-test.c
+++ b/tests/qtest/emc141x-test.c
@@ -11,7 +11,7 @@
#include "libqos/qgraph.h"
#include "libqos/i2c.h"
#include "qapi/qmp/qdict.h"
-#include "hw/misc/emc141x_regs.h"
+#include "hw/sensor/emc141x_regs.h"
#define EMC1414_TEST_ID "emc1414-test"
diff --git a/tests/qtest/npcm7xx_smbus-test.c b/tests/qtest/npcm7xx_smbus-test.c
index 4f9f493872..6b3038ac59 100644
--- a/tests/qtest/npcm7xx_smbus-test.c
+++ b/tests/qtest/npcm7xx_smbus-test.c
@@ -18,7 +18,7 @@
#include "qemu/bitops.h"
#include "libqos/i2c.h"
#include "libqos/libqtest.h"
-#include "hw/misc/tmp105_regs.h"
+#include "hw/sensor/tmp105_regs.h"
#define NR_SMBUS_DEVICES 16
#define SMBUS_ADDR(x) (0xf0080000 + 0x1000 * (x))
diff --git a/tests/qtest/tmp105-test.c b/tests/qtest/tmp105-test.c
index f930a96b83..3678646df5 100644
--- a/tests/qtest/tmp105-test.c
+++ b/tests/qtest/tmp105-test.c
@@ -13,7 +13,7 @@
#include "libqos/qgraph.h"
#include "libqos/i2c.h"
#include "qapi/qmp/qdict.h"
-#include "hw/misc/tmp105_regs.h"
+#include "hw/sensor/tmp105_regs.h"
#define TMP105_TEST_ID "tmp105-test"
#define TMP105_TEST_ADDR 0x49
--
2.25.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 3/3] sensor: Move hardware sensors from misc to a sensor directory
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
0 siblings, 0 replies; 9+ messages in thread
From: Cédric Le Goater @ 2021-05-19 7:23 UTC (permalink / raw)
To: minyard, qemu-devel, Titus Rwantare
Cc: Corey Minyard, Peter Maydell, Andrew Jeffery, qemu-arm, Joel Stanley
On 5/19/21 2:03 AM, minyard@acm.org wrote:
> From: Corey Minyard <cminyard@mvista.com>
>
> Lots of this are expected to be coming in, create a directory for them.
>
> Also move the tmp105.h file into the include directory where it
> should be.
>
> Cc: Cédric Le Goater <clg@kaod.org>
> Cc: Peter Maydell <peter.maydell@linaro.org>
> Cc: Andrew Jeffery <andrew@aj.id.au>
> Cc: Joel Stanley <joel@jms.id.au>
> Cc: Andrzej Zaborowski <balrogg@gmail.com>
> Cc: qemu-arm@nongnu.org
> Signed-off-by: Corey Minyard <cminyard@mvista.com>
Acked-by: Cédric Le Goater <clg@kaod.org>
Thanks,
C.
> ---
> hw/Kconfig | 1 +
> hw/arm/aspeed.c | 2 +-
> hw/arm/nseries.c | 2 +-
> hw/meson.build | 1 +
> hw/misc/Kconfig | 12 ------------
> hw/misc/meson.build | 3 ---
> hw/sensor/Kconfig | 11 +++++++++++
> hw/{misc => sensor}/emc141x.c | 2 +-
> hw/sensor/meson.build | 3 +++
> hw/{misc => sensor}/tmp105.c | 2 +-
> hw/{misc => sensor}/tmp421.c | 0
> include/hw/{misc => sensor}/emc141x_regs.h | 0
> {hw/misc => include/hw/sensor}/tmp105.h | 2 +-
> include/hw/{misc => sensor}/tmp105_regs.h | 0
> tests/qtest/emc141x-test.c | 2 +-
> tests/qtest/npcm7xx_smbus-test.c | 2 +-
> tests/qtest/tmp105-test.c | 2 +-
> 17 files changed, 24 insertions(+), 23 deletions(-)
> create mode 100644 hw/sensor/Kconfig
> rename hw/{misc => sensor}/emc141x.c (99%)
> create mode 100644 hw/sensor/meson.build
> rename hw/{misc => sensor}/tmp105.c (99%)
> rename hw/{misc => sensor}/tmp421.c (100%)
> rename include/hw/{misc => sensor}/emc141x_regs.h (100%)
> rename {hw/misc => include/hw/sensor}/tmp105.h (97%)
> rename include/hw/{misc => sensor}/tmp105_regs.h (100%)
>
> diff --git a/hw/Kconfig b/hw/Kconfig
> index 805860f564..8cb7664d70 100644
> --- a/hw/Kconfig
> +++ b/hw/Kconfig
> @@ -32,6 +32,7 @@ source remote/Kconfig
> source rtc/Kconfig
> source scsi/Kconfig
> source sd/Kconfig
> +source sensor/Kconfig
> source smbios/Kconfig
> source ssi/Kconfig
> source timer/Kconfig
> diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
> index 3fe6c55744..272b17f999 100644
> --- a/hw/arm/aspeed.c
> +++ b/hw/arm/aspeed.c
> @@ -16,7 +16,7 @@
> #include "hw/arm/aspeed_soc.h"
> #include "hw/i2c/smbus_eeprom.h"
> #include "hw/misc/pca9552.h"
> -#include "hw/misc/tmp105.h"
> +#include "hw/sensor/tmp105.h"
> #include "hw/misc/led.h"
> #include "hw/qdev-properties.h"
> #include "sysemu/block-backend.h"
> diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
> index 0aefa5d0f3..a10d8f53b5 100644
> --- a/hw/arm/nseries.c
> +++ b/hw/arm/nseries.c
> @@ -36,7 +36,7 @@
> #include "hw/display/blizzard.h"
> #include "hw/input/tsc2xxx.h"
> #include "hw/misc/cbus.h"
> -#include "hw/misc/tmp105.h"
> +#include "hw/sensor/tmp105.h"
> #include "hw/qdev-properties.h"
> #include "hw/block/flash.h"
> #include "hw/hw.h"
> diff --git a/hw/meson.build b/hw/meson.build
> index ba0601e36e..b3366c888e 100644
> --- a/hw/meson.build
> +++ b/hw/meson.build
> @@ -31,6 +31,7 @@ subdir('rdma')
> subdir('rtc')
> subdir('scsi')
> subdir('sd')
> +subdir('sensor')
> subdir('smbios')
> subdir('ssi')
> subdir('timer')
> diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
> index 996d45aff5..507058d8bf 100644
> --- a/hw/misc/Kconfig
> +++ b/hw/misc/Kconfig
> @@ -11,18 +11,6 @@ config ARMSSE_MHU
> config ARMSSE_CPU_PWRCTRL
> bool
>
> -config TMP105
> - bool
> - depends on I2C
> -
> -config TMP421
> - bool
> - depends on I2C
> -
> -config EMC141X
> - bool
> - depends on I2C
> -
> config ISA_DEBUG
> bool
> depends on ISA_BUS
> diff --git a/hw/misc/meson.build b/hw/misc/meson.build
> index b0a8ee8994..046c7e0c72 100644
> --- a/hw/misc/meson.build
> +++ b/hw/misc/meson.build
> @@ -6,9 +6,6 @@ softmmu_ss.add(when: 'CONFIG_ISA_TESTDEV', if_true: files('pc-testdev.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'))
> -softmmu_ss.add(when: 'CONFIG_TMP105', if_true: files('tmp105.c'))
> -softmmu_ss.add(when: 'CONFIG_TMP421', if_true: files('tmp421.c'))
> -softmmu_ss.add(when: 'CONFIG_EMC141X', if_true: files('emc141x.c'))
> softmmu_ss.add(when: 'CONFIG_UNIMP', if_true: files('unimp.c'))
> softmmu_ss.add(when: 'CONFIG_EMPTY_SLOT', if_true: files('empty_slot.c'))
> softmmu_ss.add(when: 'CONFIG_LED', if_true: files('led.c'))
> diff --git a/hw/sensor/Kconfig b/hw/sensor/Kconfig
> new file mode 100644
> index 0000000000..097cb8f11e
> --- /dev/null
> +++ b/hw/sensor/Kconfig
> @@ -0,0 +1,11 @@
> +config TMP105
> + bool
> + depends on I2C
> +
> +config TMP421
> + bool
> + depends on I2C
> +
> +config EMC141X
> + bool
> + depends on I2C
> diff --git a/hw/misc/emc141x.c b/hw/sensor/emc141x.c
> similarity index 99%
> rename from hw/misc/emc141x.c
> rename to hw/sensor/emc141x.c
> index f7c53d48a4..7ce8f4e979 100644
> --- a/hw/misc/emc141x.c
> +++ b/hw/sensor/emc141x.c
> @@ -25,7 +25,7 @@
> #include "qapi/visitor.h"
> #include "qemu/module.h"
> #include "qom/object.h"
> -#include "hw/misc/emc141x_regs.h"
> +#include "hw/sensor/emc141x_regs.h"
>
> #define SENSORS_COUNT_MAX 4
>
> diff --git a/hw/sensor/meson.build b/hw/sensor/meson.build
> new file mode 100644
> index 0000000000..9e0f3ab1fd
> --- /dev/null
> +++ b/hw/sensor/meson.build
> @@ -0,0 +1,3 @@
> +softmmu_ss.add(when: 'CONFIG_TMP105', if_true: files('tmp105.c'))
> +softmmu_ss.add(when: 'CONFIG_TMP421', if_true: files('tmp421.c'))
> +softmmu_ss.add(when: 'CONFIG_EMC141X', if_true: files('emc141x.c'))
> diff --git a/hw/misc/tmp105.c b/hw/sensor/tmp105.c
> similarity index 99%
> rename from hw/misc/tmp105.c
> rename to hw/sensor/tmp105.c
> index d299d9b21b..2056449489 100644
> --- a/hw/misc/tmp105.c
> +++ b/hw/sensor/tmp105.c
> @@ -22,7 +22,7 @@
> #include "hw/i2c/i2c.h"
> #include "hw/irq.h"
> #include "migration/vmstate.h"
> -#include "tmp105.h"
> +#include "hw/sensor/tmp105.h"
> #include "qapi/error.h"
> #include "qapi/visitor.h"
> #include "qemu/module.h"
> diff --git a/hw/misc/tmp421.c b/hw/sensor/tmp421.c
> similarity index 100%
> rename from hw/misc/tmp421.c
> rename to hw/sensor/tmp421.c
> diff --git a/include/hw/misc/emc141x_regs.h b/include/hw/sensor/emc141x_regs.h
> similarity index 100%
> rename from include/hw/misc/emc141x_regs.h
> rename to include/hw/sensor/emc141x_regs.h
> diff --git a/hw/misc/tmp105.h b/include/hw/sensor/tmp105.h
> similarity index 97%
> rename from hw/misc/tmp105.h
> rename to include/hw/sensor/tmp105.h
> index 7c97071ad7..244e2989fe 100644
> --- a/hw/misc/tmp105.h
> +++ b/include/hw/sensor/tmp105.h
> @@ -15,7 +15,7 @@
> #define QEMU_TMP105_H
>
> #include "hw/i2c/i2c.h"
> -#include "hw/misc/tmp105_regs.h"
> +#include "hw/sensor/tmp105_regs.h"
> #include "qom/object.h"
>
> #define TYPE_TMP105 "tmp105"
> diff --git a/include/hw/misc/tmp105_regs.h b/include/hw/sensor/tmp105_regs.h
> similarity index 100%
> rename from include/hw/misc/tmp105_regs.h
> rename to include/hw/sensor/tmp105_regs.h
> diff --git a/tests/qtest/emc141x-test.c b/tests/qtest/emc141x-test.c
> index 714058806a..8c86694091 100644
> --- a/tests/qtest/emc141x-test.c
> +++ b/tests/qtest/emc141x-test.c
> @@ -11,7 +11,7 @@
> #include "libqos/qgraph.h"
> #include "libqos/i2c.h"
> #include "qapi/qmp/qdict.h"
> -#include "hw/misc/emc141x_regs.h"
> +#include "hw/sensor/emc141x_regs.h"
>
> #define EMC1414_TEST_ID "emc1414-test"
>
> diff --git a/tests/qtest/npcm7xx_smbus-test.c b/tests/qtest/npcm7xx_smbus-test.c
> index 4f9f493872..6b3038ac59 100644
> --- a/tests/qtest/npcm7xx_smbus-test.c
> +++ b/tests/qtest/npcm7xx_smbus-test.c
> @@ -18,7 +18,7 @@
> #include "qemu/bitops.h"
> #include "libqos/i2c.h"
> #include "libqos/libqtest.h"
> -#include "hw/misc/tmp105_regs.h"
> +#include "hw/sensor/tmp105_regs.h"
>
> #define NR_SMBUS_DEVICES 16
> #define SMBUS_ADDR(x) (0xf0080000 + 0x1000 * (x))
> diff --git a/tests/qtest/tmp105-test.c b/tests/qtest/tmp105-test.c
> index f930a96b83..3678646df5 100644
> --- a/tests/qtest/tmp105-test.c
> +++ b/tests/qtest/tmp105-test.c
> @@ -13,7 +13,7 @@
> #include "libqos/qgraph.h"
> #include "libqos/i2c.h"
> #include "qapi/qmp/qdict.h"
> -#include "hw/misc/tmp105_regs.h"
> +#include "hw/sensor/tmp105_regs.h"
>
> #define TMP105_TEST_ID "tmp105-test"
> #define TMP105_TEST_ADDR 0x49
>
^ permalink raw reply [flat|nested] 9+ messages in thread