Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1iGAAk-0001Tc-2G for mharc-qemu-trivial@gnu.org; Thu, 03 Oct 2019 19:06:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46144) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGAAa-0001Mm-R6 for qemu-trivial@nongnu.org; Thu, 03 Oct 2019 19:06:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iGAAV-0006Sh-PU for qemu-trivial@nongnu.org; Thu, 03 Oct 2019 19:05:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46780) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iGAA8-0006FL-UJ; Thu, 03 Oct 2019 19:05:33 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B3B133091753; Thu, 3 Oct 2019 23:05:29 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-21.brq.redhat.com [10.40.204.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DFDC71001B01; Thu, 3 Oct 2019 23:05:21 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: David Gibson , Artyom Tarasenko , Aleksandar Rikalo , Marcel Apfelbaum , Alistair Francis , Joel Stanley , qemu-ppc@nongnu.org, Paolo Bonzini , Igor Mammedov , Mark Cave-Ayland , Aleksandar Markovic , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-trivial@nongnu.org, "Edgar E. Iglesias" , Thomas Huth , "Michael S. Tsirkin" , Andrew Jeffery , Helge Deller , Peter Maydell , Aurelien Jarno , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Richard Henderson , Laurent Vivier , Eduardo Habkost , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis Subject: [PATCH v2 05/14] hw: Move M41T80 device from hw/timer/ to hw/rtc/ subdirectory Date: Fri, 4 Oct 2019 01:03:55 +0200 Message-Id: <20191003230404.19384-6-philmd@redhat.com> In-Reply-To: <20191003230404.19384-1-philmd@redhat.com> References: <20191003230404.19384-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Thu, 03 Oct 2019 23:05:29 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Oct 2019 23:06:04 -0000 The M41T80 is a Real Time Clock, not a timer. Move it under the hw/rtc/ subdirectory. Reviewed-by: Alistair Francis Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 2 +- hw/rtc/Kconfig | 4 ++++ hw/rtc/Makefile.objs | 1 + hw/{timer =3D> rtc}/m41t80.c | 0 hw/timer/Kconfig | 4 ---- hw/timer/Makefile.objs | 1 - 6 files changed, 6 insertions(+), 6 deletions(-) rename hw/{timer =3D> 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 =20 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) +=3D m41t80.o common-obj-$(CONFIG_M48T59) +=3D m48t59.o ifeq ($(CONFIG_ISA_BUS),y) common-obj-$(CONFIG_M48T59) +=3D 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 =20 -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) +=3D cadence_ttc.o common-obj-$(CONFIG_DS1338) +=3D ds1338.o common-obj-$(CONFIG_HPET) +=3D hpet.o common-obj-$(CONFIG_I8254) +=3D i8254_common.o i8254.o -common-obj-$(CONFIG_M41T80) +=3D m41t80.o common-obj-$(CONFIG_PUV3) +=3D puv3_ost.o common-obj-$(CONFIG_TWL92230) +=3D twl92230.o common-obj-$(CONFIG_XILINX) +=3D xilinx_timer.o --=20 2.20.1