| Message ID | 20210519000331.3690536-2-minyard@acm.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Move some things out of hw/misc | expand |
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>
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>
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
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