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: 615867 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-wm0-x237.google.com (mail-wm0-x237.google.com [IPv6:2a00:1450:400c:c09::237]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qwFC55rTSz9sCY for ; Thu, 28 Apr 2016 08:34:57 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b=evRAOmEc; dkim-atps=neutral Received: by mail-wm0-x237.google.com with SMTP id r12sf33151890wme.0 for ; Wed, 27 Apr 2016 15:34:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=sender:mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :reply-to:precedence:mailing-list:list-id:x-spam-checked-in-group :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=AvAAkUH2EZspCP26+gi8Iwu1FpFLVxkSG4m1ITzWfOY=; b=evRAOmEcTgUJfUoYduj6EuslYKQA8XF2fyOZtk3/L0rqDSKmRhK4HMRHBAFXbHy8x+ fJv69HU53Zr2L8o828BnsWXpqjBiwmmTWakdGa8N99dtV/YmqUA+qd4uQ4R3rEB8SJgR TvMFpU1oCznc6nQL6zbgmo9Lwr3zzB2Pywhxou1iTxV4V2cvOSIY4s+SnDhwAeT1XwHk ux3Y+HvvtmiFuMmjxbp5yh4DriLFOMy2oJo0qB+/bEkPHKf7ajlM7B01C6MlUrG1Aew9 OPkkY9DfM7agZPfnW/bacx9/e5ln+cyGKtr2yLVeiqDABdZ7f63SSrUaLFvqMhZCSo2O mTsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=AvAAkUH2EZspCP26+gi8Iwu1FpFLVxkSG4m1ITzWfOY=; b=QAKhJo8y58Gv/lcyYTZrc6Rujpaugi5FugmNOIsV53WyQ1X5t0VM7+d2DIVwOvqAnS E62fCUMGYQD61c9wJJi7kUwQ9klW4XJ+BKJDAJhIw+ZEtzBxrQBU4akf3GdijW33JbOW MQ5YIUMaqunJyVKZGMWR1oNHZi244e9a31tcoH3kai28DYEc2ZekbfJs8/2xjOojF3tu kE498c1G3ASep88ciZmb7uxcGujO2mYCDVFyL3yRx4X5B5NkKwNvNzTd+N35ow7MSYId 0J7Zisxy6/bBmeU6nWZyU1ubphKIzMM2PONaFCHSZwpajqqJbdXfi5IpC/afttZEOh6g CuPA== Sender: rtc-linux@googlegroups.com X-Gm-Message-State: AOPr4FXMsDE4jIYwzLMdKKEkPcoS0vgIcZ8gMAEOQrEq4J8Sp1RuTO5cltEuoawk9l97mQ== X-Received: by 10.25.79.146 with SMTP id d140mr241990lfb.9.1461796494928; Wed, 27 Apr 2016 15:34:54 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.25.196.130 with SMTP id u124ls131785lff.53.gmail; Wed, 27 Apr 2016 15:34:54 -0700 (PDT) X-Received: by 10.25.87.202 with SMTP id l193mr1319650lfb.5.1461796494374; Wed, 27 Apr 2016 15:34:54 -0700 (PDT) Received: from mout.kundenserver.de (mout.kundenserver.de. [217.72.192.73]) by gmr-mx.google.com with ESMTPS id a65si121520wma.0.2016.04.27.15.34.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Apr 2016 15:34:54 -0700 (PDT) Received-SPF: neutral (google.com: 217.72.192.73 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=217.72.192.73; 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: [rtc-linux] [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= X-Original-Sender: arnd@arndb.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 217.72.192.73 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mailfrom=arnd@arndb.de Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: rtc-linux@googlegroups.com X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , 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