diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-03-25 16:59:23 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2019-05-07 09:56:10 +0200 |
| commit | 6306cae275c7091aa4e785809d956b475bfedab4 (patch) | |
| tree | 531a13f6552459feac42d3f2288b297eae9a425e | |
| parent | 349ebdd76d3a932204f5831950a2af413c29c477 (diff) | |
| download | qemu-6306cae275c7091aa4e785809d956b475bfedab4.zip qemu-6306cae275c7091aa4e785809d956b475bfedab4.tar.gz qemu-6306cae275c7091aa4e785809d956b475bfedab4.tar.bz2 | |
i2c-ddc: move it to hw/display
Move it together with the other EDID code. hw/i2c should only
include the core and the adapters, not the slaves.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20190325155923.30987-1-pbonzini@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | hw/display/Kconfig | 5 | ||||
| -rw-r--r-- | hw/display/Makefile.objs | 1 | ||||
| -rw-r--r-- | hw/display/i2c-ddc.c (renamed from hw/i2c/i2c-ddc.c) | 2 | ||||
| -rw-r--r-- | hw/display/sii9022.c | 2 | ||||
| -rw-r--r-- | hw/display/sm501.c | 2 | ||||
| -rw-r--r-- | hw/i2c/Kconfig | 5 | ||||
| -rw-r--r-- | hw/i2c/Makefile.objs | 1 | ||||
| -rw-r--r-- | include/hw/display/i2c-ddc.h (renamed from include/hw/i2c/i2c-ddc.h) | 0 | ||||
| -rw-r--r-- | include/hw/display/xlnx_dp.h | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 72be57a..c236cd2 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -1,3 +1,8 @@ +config DDC + bool + depends on I2C + select EDID + config EDID bool diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index dbd453a..650031f 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -1,3 +1,4 @@ +common-obj-$(CONFIG_DDC) += i2c-ddc.o common-obj-$(CONFIG_EDID) += edid-generate.o edid-region.o common-obj-$(CONFIG_FW_CFG_DMA) += ramfb.o diff --git a/hw/i2c/i2c-ddc.c b/hw/display/i2c-ddc.c index 7aa8727..9fe5403 100644 --- a/hw/i2c/i2c-ddc.c +++ b/hw/display/i2c-ddc.c @@ -20,7 +20,7 @@ #include "qemu-common.h" #include "qemu/log.h" #include "hw/i2c/i2c.h" -#include "hw/i2c/i2c-ddc.h" +#include "hw/display/i2c-ddc.h" #ifndef DEBUG_I2CDDC #define DEBUG_I2CDDC 0 diff --git a/hw/display/sii9022.c b/hw/display/sii9022.c index 9994385..9c36e4c 100644 --- a/hw/display/sii9022.c +++ b/hw/display/sii9022.c @@ -16,7 +16,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "hw/i2c/i2c.h" -#include "hw/i2c/i2c-ddc.h" +#include "hw/display/i2c-ddc.h" #include "trace.h" #define SII9022_SYS_CTRL_DATA 0x1a diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 2122291..1e2709b 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -35,7 +35,7 @@ #include "hw/sysbus.h" #include "hw/pci/pci.h" #include "hw/i2c/i2c.h" -#include "hw/i2c/i2c-ddc.h" +#include "hw/display/i2c-ddc.h" #include "qemu/range.h" #include "ui/pixel_ops.h" #include "qemu/bswap.h" diff --git a/hw/i2c/Kconfig b/hw/i2c/Kconfig index 820b24d..78a2008 100644 --- a/hw/i2c/Kconfig +++ b/hw/i2c/Kconfig @@ -5,11 +5,6 @@ config SMBUS_EEPROM bool depends on I2C -config DDC - bool - depends on I2C - select EDID - config VERSATILE_I2C bool select I2C diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs index 5f76b6a..d7073a4 100644 --- a/hw/i2c/Makefile.objs +++ b/hw/i2c/Makefile.objs @@ -1,6 +1,5 @@ common-obj-$(CONFIG_I2C) += core.o smbus_slave.o smbus_master.o common-obj-$(CONFIG_SMBUS_EEPROM) += smbus_eeprom.o -common-obj-$(CONFIG_DDC) += i2c-ddc.o common-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o common-obj-$(CONFIG_ACPI_X86_ICH) += smbus_ich9.o common-obj-$(CONFIG_ACPI_SMBUS) += pm_smbus.o diff --git a/include/hw/i2c/i2c-ddc.h b/include/hw/display/i2c-ddc.h index c29443c..c29443c 100644 --- a/include/hw/i2c/i2c-ddc.h +++ b/include/hw/display/i2c-ddc.h diff --git a/include/hw/display/xlnx_dp.h b/include/hw/display/xlnx_dp.h index 26b759c..45a8050 100644 --- a/include/hw/display/xlnx_dp.h +++ b/include/hw/display/xlnx_dp.h @@ -27,7 +27,7 @@ #include "hw/misc/auxbus.h" #include "hw/i2c/i2c.h" #include "hw/display/dpcd.h" -#include "hw/i2c/i2c-ddc.h" +#include "hw/display/i2c-ddc.h" #include "qemu/fifo8.h" #include "qemu/units.h" #include "hw/dma/xlnx_dpdma.h" |