[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 3/3] sensor: Move hardware sensors from misc to a sensor dire
|
From: |
Cédric Le Goater |
|
Subject: |
Re: [PATCH 3/3] sensor: Move hardware sensors from misc to a sensor directory |
|
Date: |
Wed, 19 May 2021 09:23:16 +0200 |
|
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 |
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
>