Received: by 2002:adf:ef42:0:0:0:0:0 with SMTP id c2csp4200983wrp; Mon, 16 Sep 2019 09:16:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqxZNRz5Q1xhr65BRedD6u1eJ5bxti+bDh0KZsVgh/iyn2qzn6p5mP5+3DhBwDh5pcOi0zkM X-Received: by 2002:ad4:4246:: with SMTP id l6mr829194qvq.140.1568650574168; Mon, 16 Sep 2019 09:16:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568650574; cv=none; d=google.com; s=arc-20160816; b=Vhbpi4mZjC9xb8PULg7RJKZAM6WjeLHO4XTYRpmvmn9fFw7s20I5KDCuryDyDn068/ V/ujuJmAV6yndU+69XX0ymO81prx0sW/rDdosmzGWP2ca9ge6y8YdSXYLmZtoXqk0squ 4reFMiC8YqlGtnz/2O46hXBXRehK19mkrOSjhYgPw4dYNqltEblrfiCnT+8aBjj8duLH //CH0qM2/03mXlsjdRjCCwmOrOgVDHa8QYf9JC89uvg7Zt4Ijff6HqRjFzMRiK1VizO8 jycYRYEIWSsTjUbqapuSkLDMUSlOTekU15AtEUmAIw/KeGVSNGuwE8B1wGTeyc9VGZKR hNpA== 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=f3lfXrhWzNUexWTb4GwG1U5uz6xLTH5ysTSB6hVIBWQ=; b=Ql6XbJcWqn8V2WJeZt+VLagUodiUXjAJTCaAJ5miDrxyX3D5Eb8ROd1ZfLEFXZG8Xy JSF/qkswwFs0EqGpOshQsZWPo9GZL24yEKIifJwUL0/rPy3DtxgXd2y33c1N1HNVD2CI BkOEU2LJdQPy2R1Mv8Uwj8mMdDQQsaJMwBIOBxGBza4mSTNYiHvvXoUZOipr1DHLSuMn 9t3FcjMNPaZ/TVw8e3tZkji5b8CgghrexdaEdaPMVZoWu6oAnfbhkgxXWJ+rftWg79ir LZd3DvtikdVua4Tn/mGh3L1RfUa/Hk0ALuuySDaSoQyb6+GITNfWEqNtG6Jpb7Ogvtrq gJ6w== 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 y58si52521qtj.140.2019.09.16.09.16.14 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Sep 2019 09:16:14 -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]:36630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9tfg-0001Iv-UO for alex.bennee@linaro.org; Mon, 16 Sep 2019 12:16:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35603) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9tHZ-0001lS-Gd for qemu-arm@nongnu.org; Mon, 16 Sep 2019 11:51:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i9tHY-0002Cf-Bj for qemu-arm@nongnu.org; Mon, 16 Sep 2019 11:51:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27876) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i9tHY-0002CV-4W; Mon, 16 Sep 2019 11:51:16 -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 38CBC3082145; Mon, 16 Sep 2019 15:51:15 +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 E644719C4F; Mon, 16 Sep 2019 15:50:55 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 16 Sep 2019 17:48:41 +0200 Message-Id: <20190916154847.28936-8-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.42]); Mon, 16 Sep 2019 15:51:15 +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 07/13] hw: Move TWL92230 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: tWDreEPNY3uG The TWL92230 is an "energy management device" companion with a RTC. Since we mostly model the RTC, 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}/twl92230.c | 0 hw/timer/Kconfig | 4 ---- hw/timer/Makefile.objs | 1 - 6 files changed, 6 insertions(+), 6 deletions(-) rename hw/{timer =3D> rtc}/twl92230.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index fb9a1ed075..d17058264b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -663,7 +663,7 @@ F: hw/display/blizzard.c F: hw/input/lm832x.c F: hw/input/tsc2005.c F: hw/misc/cbus.c -F: hw/timer/twl92230.c +F: hw/rtc/twl92230.c F: include/hw/display/blizzard.h F: include/hw/input/tsc2xxx.h F: include/hw/misc/cbus.h diff --git a/hw/rtc/Kconfig b/hw/rtc/Kconfig index cc7fead764..dff9d60946 100644 --- a/hw/rtc/Kconfig +++ b/hw/rtc/Kconfig @@ -8,6 +8,10 @@ config M48T59 config PL031 bool =20 +config TWL92230 + bool + depends on I2C + config MC146818RTC bool =20 diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs index 4621b37bc2..810a38ee7b 100644 --- a/hw/rtc/Makefile.objs +++ b/hw/rtc/Makefile.objs @@ -4,5 +4,6 @@ ifeq ($(CONFIG_ISA_BUS),y) common-obj-$(CONFIG_M48T59) +=3D m48t59-isa.o endif common-obj-$(CONFIG_PL031) +=3D pl031.o +common-obj-$(CONFIG_TWL92230) +=3D twl92230.o obj-$(CONFIG_MC146818RTC) +=3D mc146818rtc.o common-obj-$(CONFIG_SUN4V_RTC) +=3D sun4v-rtc.o diff --git a/hw/timer/twl92230.c b/hw/rtc/twl92230.c similarity index 100% rename from hw/timer/twl92230.c rename to hw/rtc/twl92230.c diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index b04c928136..9357875f28 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -20,10 +20,6 @@ config HPET config I8254 bool =20 -config TWL92230 - bool - depends on I2C - config ALTERA_TIMER bool select PTIMER diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs index 034bd30255..23be70b71d 100644 --- a/hw/timer/Makefile.objs +++ b/hw/timer/Makefile.objs @@ -7,7 +7,6 @@ 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_PUV3) +=3D puv3_ost.o -common-obj-$(CONFIG_TWL92230) +=3D twl92230.o common-obj-$(CONFIG_XILINX) +=3D xilinx_timer.o common-obj-$(CONFIG_SLAVIO) +=3D slavio_timer.o common-obj-$(CONFIG_ETRAXFS) +=3D etraxfs_timer.o --=20 2.20.1