Received: by 2002:adf:ef42:0:0:0:0:0 with SMTP id c2csp4175054wrp; Mon, 16 Sep 2019 08:53:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqyqxhmflkSAhgB+xnNuG0YC089LGXn8QdCeWuC2tCY87Mk1mF9SmXXlDqJcO6IMcd/XMETo X-Received: by 2002:a50:bb22:: with SMTP id y31mr14328ede.58.1568649236750; Mon, 16 Sep 2019 08:53:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568649236; cv=none; d=google.com; s=arc-20160816; b=wutIGjVAF9+bFoaqlXq2lVuku2FTvcV8sRQH8pqUbCW6apusf+2cRrhOp40I8LjFVA zal5Ma8dyL0vwSx7yJDow9s6dm5fYQbQJOa7Gs4BYSke1MuVGaHsvDF8cXCXcszKWhqr pPRMmK7acwd9VIUvzS39ogbro79or9yvLWkIUmmh2n4k+OcoMwAt50Pa3UiyAHqBkWRB Rg77sE0bdM9bsCBEwJSWVZylE1PNMU7dPLfPpIcSfxvwdFQSh0ZQzzjncgoh+kwplswK TUmPI3Tl/eyvA96hVKpPmdlKUqOdEXMdoKGDl38vGm+UU/JAa7Pvyra8hiA+Os0xc3c4 ogkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=duVgBbVOCU1iWPq/nRmXNVPJg3MmLYEuCixmD8hqrDk=; b=HrhwN7hBDjg7ryZK/P2us6WF6h1hiOzcjK3xlV4/WR7WYCUOK9FAnTDCwSVf8s9nBV mAbcY3PtrAwCeLgx6BRddbRpd7Q+Hh32Un8XkdRp4fW2+oWOdX7aPXT2ux4ljyMKY9Sn TT+cBmPqEHfMnnuH6QqnWteSbOdnf/eTcJKtF0rFc9tv+2yEckx+Nu3ZMv0kaCYlP7C4 CuJeCc+52f58bZuor/dkCFlKfinE7Zfr9VgwDRd8HxIteTIJu9dO4HC20wFCPTiRsomK oIscE46UX37kPdKbOlKGroa3zoC6ymKWRCiZpu/FK1mTsLptgwvWWgBAXR0bOE4QRcEO h3lg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y7si3897103ejp.378.2019.09.16.08.53.56 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Sep 2019 08:53:56 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:36296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9tK7-0004oD-Et for alex.bennee@linaro.org; Mon, 16 Sep 2019 11:53:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35492) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9tGt-0000o7-3g for qemu-arm@nongnu.org; Mon, 16 Sep 2019 11:50:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i9tGr-00021y-Dr for qemu-arm@nongnu.org; Mon, 16 Sep 2019 11:50:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46364) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i9tGr-00021N-3i; Mon, 16 Sep 2019 11:50:33 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 09FE1302C081; Mon, 16 Sep 2019 15:50:32 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-115.brq.redhat.com [10.40.204.115]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E296D19C4F; Mon, 16 Sep 2019 15:50:20 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 16 Sep 2019 17:48:39 +0200 Message-Id: <20190916154847.28936-6-philmd@redhat.com> In-Reply-To: <20190916154847.28936-1-philmd@redhat.com> References: <20190916154847.28936-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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Mon, 16 Sep 2019 15:50:32 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-arm] [PATCH 05/13] hw: Move M41T80 device from hw/timer/ to hw/rtc/ subdirectory X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , "Michael S. Tsirkin" , Mark Cave-Ayland , Aleksandar Rikalo , Helge Deller , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Joel Stanley , Marcel Apfelbaum , David Gibson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Artyom Tarasenko , Laurent Vivier , Thomas Huth , Eduardo Habkost , Alistair Francis , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Paolo Bonzini , Richard Henderson , Andrew Jeffery , qemu-ppc@nongnu.org, Aleksandar Markovic , Igor Mammedov , Aurelien Jarno Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: 3Q2L8w3fONNv The M41T80 is a Real Time Clock, not a timer. Move it under the hw/rtc/ subdirectory. 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 679b026fe0..fd68b2383a 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