From patchwork Wed Apr 27 22:34:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 8963701 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 91225BF440 for ; Wed, 27 Apr 2016 22:41:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AD6FE2022A for ; Wed, 27 Apr 2016 22:41:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9E8932026D for ; Wed, 27 Apr 2016 22:41:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753599AbcD0WlP (ORCPT ); Wed, 27 Apr 2016 18:41:15 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:63699 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750777AbcD0Wkx (ORCPT ); Wed, 27 Apr 2016 18:40:53 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0M6ETS-1btfkG1nCs-00yATK; Thu, 28 Apr 2016 00:34:50 +0200 From: Arnd Bergmann To: Alexandre Belloni Cc: Arnd Bergmann , geert@linux-m68k.org, deller@gmx.de, benh@kernel.crashing.org, mpe@ellerman.id.au, dalias@libc.org, dhowells@redhat.com, linux-alpha@vger.kernel.org, a.zummo@towertech.it, linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-m68k@lists.linux-m68k.org, rtc-linux@googlegroups.com, linux-arch@vger.kernel.org Subject: [PATCH v3 06/16] char/genrtc: remove mn10300 support Date: Thu, 28 Apr 2016 00:34:20 +0200 Message-Id: <1461796470-1291527-7-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:HgqZYZpTezOakQAI7K5jhMcg2t50rak84IQeVjyNsyryOUqigp4 qRAclMb08n/tnxuWPJbXapcyn/3CDxTMqicFvMsgxfA1AY/gZ13Xi72gXk3O3hgs8x+B+u0 jtYgJ0vIrL57uVKSkiWt7y31B8T+KV1psGSar5EVAeIHOhhmbZ13tNBlaIKyLMC+L+6tjgK MqA+uBSlCN6hHvX+wXtnQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:iTr1ijSpHg4=:lR4KKIphuoUTLBHJszzgUk vpjoDCMEyaidgYXxerw60ZtvF+pLbAbtg3jb4SW7AXcqttuq/WXf97KT3RjZYUkzDepDS8gm2 Hwl7a0IiVMWeKXX+f3Y7xVsRTd8tiNbV2e4YbBZRCX2IuCVz7iLIkRkYxWAe3TUdlH7y1aKgn 3Juluyx49hausWCkHYHZAwUB7d3EwUiPg7WvZXfEyVDPO6EIEuAO2gBrOziKM2YQBWXvjqOC6 VfSnr2xmp8r5ZfpqoF7ciAokuy1Lxnvg7mImzUECNjRcs8d+qaASoaw7mH1/jG1WIE4GIMHBO K4aMTCgoTUtzkujb295/7XEl3wGF0glnWq2i1e/cZYGZlYiC/A5VFHqCvVEXBonKNxw/l0KtB to0ejxyjU+m5frVRaaE1SmcImx3tKGJL3s86JJMM6caVap6yANahC2Q50j4DhI9HbjVFUk6WE mW48GUx63ylwTQHsrEulvyrn4qQhvb5elLp4AGgIMLWMKOktAg9Xa/gqX/vMa+HjFoRdepIz4 8CHvRVAMMQRstfYfM2PdXVnxvPag8TZEZeyx3+RkXKgzbLvAp6uGB/lr4Otdqrs4yZCLAnr7p qdzOANdpNNaDcY2P8zE4AbaQ08CXm09gDj7tl6L0/qe+POnF+51ClP3YAEPU59+HPyW0FI4/z PMXYvkLIVVJiIp03E57h9mvMPXT61m4GWdv9Qko8dIzvzBY9RQ2U/1C0HYTgDXePGc3E= Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The genrtc driver serves no purpose on mn10300 because it drives the same hardware as the original rtc.c driver, and the newer rtc-generic.c or rtc-cmos.c drivers on architectures that use the asm-generic/rtc.h header. I assume it was initially only added for completeness when the mn10300 port was done, but the older rtc.c driver was always used instead. We can also stop include asm-generic/rtc.h now, because we just call mc146818_set_time() directly. It would be nice to change the architecture to use the rtc-cmos driver next, and remove support for the old rtc driver as well. Signed-off-by: Arnd Bergmann --- arch/mn10300/include/asm/rtc.h | 2 -- arch/mn10300/kernel/rtc.c | 2 +- drivers/char/Kconfig | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/mn10300/include/asm/rtc.h b/arch/mn10300/include/asm/rtc.h index 6c14bb1d0d9b..07dc87656197 100644 --- a/arch/mn10300/include/asm/rtc.h +++ b/arch/mn10300/include/asm/rtc.h @@ -25,6 +25,4 @@ static inline void calibrate_clock(void) #endif /* !CONFIG_MN10300_RTC */ -#include - #endif /* _ASM_RTC_H */ diff --git a/arch/mn10300/kernel/rtc.c b/arch/mn10300/kernel/rtc.c index 48d7058b3295..77e0be4d92ea 100644 --- a/arch/mn10300/kernel/rtc.c +++ b/arch/mn10300/kernel/rtc.c @@ -27,7 +27,7 @@ void read_persistent_clock(struct timespec *ts) { struct rtc_time tm; - get_rtc_time(&tm); + mc146818_set_time(&tm); ts->tv_nsec = 0; ts->tv_sec = mktime(tm.tm_year, tm.tm_mon, tm.tm_mday, diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 697510325b1d..d17ed90ebc82 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -328,7 +328,7 @@ config JS_RTC config GEN_RTC tristate "Generic /dev/rtc emulation" depends on RTC!=y - depends on M68K || MN10300 || PARISC || PPC + depends on M68K || PARISC || PPC ---help--- If you say Y here and create a character special file /dev/rtc with major number 10 and minor number 135 using mknod ("man mknod"), you