From patchwork Wed Apr 27 22:34:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 615899 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qwFQc5CZ8z9t6f for ; Thu, 28 Apr 2016 08:44:56 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3qwFQc4K9szDqWl for ; Thu, 28 Apr 2016 08:44:56 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.74]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3qwFD96Z0czDqBK for ; Thu, 28 Apr 2016 08:35:53 +1000 (AEST) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0MQODc-1b7fY92xAa-00TpOW; Thu, 28 Apr 2016 00:34:54 +0200 From: Arnd Bergmann To: Alexandre Belloni Subject: [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly Date: Thu, 28 Apr 2016 00:34:26 +0200 Message-Id: <1461796470-1291527-13-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1461796470-1291527-1-git-send-email-arnd@arndb.de> References: <1461796470-1291527-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:XBfNkGloWa/uzCFVyajs01ycJTURmGNk/2IFtq3jqhUx0ork69R lWXnlAbm4KNxleypu0vR5aDWS/KhJxPij+gW+3JMTE27g5oVwgz1ZqBBm4ZrCfi9yiKEmzf 6318Fa7mpBy/L8AUxuQpBBglVd1s9zvIL3Be/yon7tbXyw4HnbWenWpYS+cTvqkcxEmMiup PBE2uDRVP/DTdgf6+43hQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:fB7BUG1OKHU=:XHi5ZzU57Q46wdA1Ni6b72 nQ7xcnhjQjwZ08WT/ztVN8Hd6FYaJatg862N/nMWera2Vwe1woOk48fpgvwGZ2dgg6mnQfb1g STIzzovG+DUP7A4+aEIrRbQ6ubg7vCo7leiwlei56b5N5DJfV/9ZDmDabT88Cpx/t1XjIPpr+ JzzoQ00xIexsgNpSnDWgoamHv8IY47cRFTQ+mdH6RF4YaT1yqAcTVhGDnu/uKJDlua7+Qua7X 617IjdtQQWlqM9BfPcOgVcAJI7IolScyGNEznLBfWfCUCHMgXrVrU2jVr4YISBVX+uKn0mCLs pYl33X2xmjHtT90szxKaCFYqz0MzTUIJF74pjeJx905dsza5sFzH70AOfbc8r0SdjT6RW97sx 8ryneJShhrKaB39Pyj/N76boVr62TUj4KSLUoODHpDkWIlmebU4D/8qMT5BBSgQpKXmAE5T0x /EIZvL32S7ZhDHeZEeMAwXc8nD5Ao3AYrOsZiwkuADdWUaDJJSJM9mxLXIw4+Ej3n4nwoX9HG VSdlHXlM2oC0CO67DNakQkkhfEeGJ3whpk71v+Z/XSnlMBgJ6P4dk4aZZk/OHVaV3OMHCQekW CDFVObzReYRNpHpgmm5pvAfZ8QHc7B54YlHe52JMDKHZsa2VaHhfLtXxY6AmdlJlT7lN/UAJk mgpQIYizswM6YlcYhaSF5+6r9mO3QtloejwcohVxiPpYR74xvDsVhdXhPbbBQ3Go0MV0= X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arch@vger.kernel.org, a.zummo@towertech.it, dalias@libc.org, linux-parisc@vger.kernel.org, Arnd Bergmann , linux-sh@vger.kernel.org, deller@gmx.de, linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, dhowells@redhat.com, linux-m68k@lists.linux-m68k.org, geert@linux-m68k.org, rtc-linux@googlegroups.com, linuxppc-dev@lists.ozlabs.org MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The rtc-generic driver provides an architecture specific wrapper on top of the generic rtc_class_ops abstraction, and powerpc has another abstraction on top, which is a bit silly. This changes the powerpc rtc-generic device to provide its rtc_class_ops directly, to reduce the number of layers by one. Signed-off-by: Arnd Bergmann Acked-by: Michael Ellerman --- arch/powerpc/kernel/time.c | 29 ++++++++++++++++++++++++++++- drivers/rtc/rtc-generic.c | 2 +- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index 3ed9a5a21d77..7a482a7f4d8d 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -56,6 +56,7 @@ #include #include #include +#include #include #include @@ -1081,6 +1082,29 @@ void calibrate_delay(void) loops_per_jiffy = tb_ticks_per_jiffy; } +#if IS_ENABLED(CONFIG_RTC_DRV_GENERIC) +static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm) +{ + ppc_md.get_rtc_time(tm); + return rtc_valid_tm(tm); +} + +static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm) +{ + if (!ppc_md.set_rtc_time) + return -EOPNOTSUPP; + + if (ppc_md.set_rtc_time(tm) < 0) + return -EOPNOTSUPP; + + return 0; +} + +static const struct rtc_class_ops rtc_generic_ops = { + .read_time = rtc_generic_get_time, + .set_time = rtc_generic_set_time, +}; + static int __init rtc_init(void) { struct platform_device *pdev; @@ -1088,9 +1112,12 @@ static int __init rtc_init(void) if (!ppc_md.get_rtc_time) return -ENODEV; - pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0); + pdev = platform_device_register_data(NULL, "rtc-generic", -1, + &rtc_generic_ops, + sizeof(rtc_generic_ops)); return PTR_ERR_OR_ZERO(pdev); } device_initcall(rtc_init); +#endif diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c index 5c82bae73b9c..efcb9833cac8 100644 --- a/drivers/rtc/rtc-generic.c +++ b/drivers/rtc/rtc-generic.c @@ -9,7 +9,7 @@ #include #include -#if defined(CONFIG_PPC) +#if 0 #include static int generic_get_time(struct device *dev, struct rtc_time *tm)