Message ID | 20191003230404.19384-6-philmd@redhat.com |
---|---|
State | New |
Headers | show |
Series | hw: Split RTC devices from hw/timer/ to hw/rtc/ | expand |
Le 04/10/2019 à 01:03, Philippe Mathieu-Daudé a écrit : > The M41T80 is a Real Time Clock, not a timer. > Move it under the hw/rtc/ subdirectory. > > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > MAINTAINERS | 2 +- > hw/rtc/Kconfig | 4 ++++ > hw/rtc/Makefile.objs | 1 + > hw/{timer => rtc}/m41t80.c | 0 > hw/timer/Kconfig | 4 ---- > hw/timer/Makefile.objs | 1 - > 6 files changed, 6 insertions(+), 6 deletions(-) > rename hw/{timer => rtc}/m41t80.c (100%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 5d85424a33..0dfaa05d17 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1113,7 +1113,7 @@ F: hw/ppc/sam460ex.c > F: hw/ppc/ppc440_pcix.c > F: hw/display/sm501* > F: hw/ide/sii3112.c > -F: hw/timer/m41t80.c > +F: hw/rtc/m41t80.c > F: pc-bios/canyonlands.dt[sb] > F: pc-bios/u-boot-sam460ex-20100605.bin > F: roms/u-boot-sam460ex > diff --git a/hw/rtc/Kconfig b/hw/rtc/Kconfig > index 159c233517..434b20b2b1 100644 > --- a/hw/rtc/Kconfig > +++ b/hw/rtc/Kconfig > @@ -1,3 +1,7 @@ > +config M41T80 > + bool > + depends on I2C > + > config M48T59 > bool > > diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs > index c87f81405e..89e8e48c64 100644 > --- a/hw/rtc/Makefile.objs > +++ b/hw/rtc/Makefile.objs > @@ -1,3 +1,4 @@ > +common-obj-$(CONFIG_M41T80) += m41t80.o > common-obj-$(CONFIG_M48T59) += m48t59.o > ifeq ($(CONFIG_ISA_BUS),y) > common-obj-$(CONFIG_M48T59) += m48t59-isa.o > diff --git a/hw/timer/m41t80.c b/hw/rtc/m41t80.c > similarity index 100% > rename from hw/timer/m41t80.c > rename to hw/rtc/m41t80.c > diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig > index a57e9b59fc..a6b668b255 100644 > --- a/hw/timer/Kconfig > +++ b/hw/timer/Kconfig > @@ -20,10 +20,6 @@ config HPET > config I8254 > bool > > -config M41T80 > - bool > - depends on I2C > - > config TWL92230 > bool > depends on I2C > diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs > index fe2d1fbc40..2fb12162a6 100644 > --- a/hw/timer/Makefile.objs > +++ b/hw/timer/Makefile.objs > @@ -6,7 +6,6 @@ common-obj-$(CONFIG_CADENCE) += cadence_ttc.o > common-obj-$(CONFIG_DS1338) += ds1338.o > common-obj-$(CONFIG_HPET) += hpet.o > common-obj-$(CONFIG_I8254) += i8254_common.o i8254.o > -common-obj-$(CONFIG_M41T80) += m41t80.o > common-obj-$(CONFIG_PUV3) += puv3_ost.o > common-obj-$(CONFIG_TWL92230) += twl92230.o > common-obj-$(CONFIG_XILINX) += xilinx_timer.o > Applied to my trivial-patches branch. Thanks, Laurent
diff --git a/MAINTAINERS b/MAINTAINERS index 5d85424a33..0dfaa05d17 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1113,7 +1113,7 @@ F: hw/ppc/sam460ex.c F: hw/ppc/ppc440_pcix.c F: hw/display/sm501* F: hw/ide/sii3112.c -F: hw/timer/m41t80.c +F: hw/rtc/m41t80.c F: pc-bios/canyonlands.dt[sb] F: pc-bios/u-boot-sam460ex-20100605.bin F: roms/u-boot-sam460ex diff --git a/hw/rtc/Kconfig b/hw/rtc/Kconfig index 159c233517..434b20b2b1 100644 --- a/hw/rtc/Kconfig +++ b/hw/rtc/Kconfig @@ -1,3 +1,7 @@ +config M41T80 + bool + depends on I2C + config M48T59 bool diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs index c87f81405e..89e8e48c64 100644 --- a/hw/rtc/Makefile.objs +++ b/hw/rtc/Makefile.objs @@ -1,3 +1,4 @@ +common-obj-$(CONFIG_M41T80) += m41t80.o common-obj-$(CONFIG_M48T59) += m48t59.o ifeq ($(CONFIG_ISA_BUS),y) common-obj-$(CONFIG_M48T59) += m48t59-isa.o diff --git a/hw/timer/m41t80.c b/hw/rtc/m41t80.c similarity index 100% rename from hw/timer/m41t80.c rename to hw/rtc/m41t80.c diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index a57e9b59fc..a6b668b255 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -20,10 +20,6 @@ config HPET config I8254 bool -config M41T80 - bool - depends on I2C - config TWL92230 bool depends on I2C diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs index fe2d1fbc40..2fb12162a6 100644 --- a/hw/timer/Makefile.objs +++ b/hw/timer/Makefile.objs @@ -6,7 +6,6 @@ common-obj-$(CONFIG_CADENCE) += cadence_ttc.o common-obj-$(CONFIG_DS1338) += ds1338.o common-obj-$(CONFIG_HPET) += hpet.o common-obj-$(CONFIG_I8254) += i8254_common.o i8254.o -common-obj-$(CONFIG_M41T80) += m41t80.o common-obj-$(CONFIG_PUV3) += puv3_ost.o common-obj-$(CONFIG_TWL92230) += twl92230.o common-obj-$(CONFIG_XILINX) += xilinx_timer.o