From patchwork Tue Apr 26 21:44:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 615336 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-lf0-x23d.google.com (mail-lf0-x23d.google.com [IPv6:2a00:1450:4010:c07::23d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qvc846jwKz9t6X for ; Wed, 27 Apr 2016 07:45:08 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b=mJaCH1uJ; dkim-atps=neutral Received: by mail-lf0-x23d.google.com with SMTP id r18sf15356287lfr.0 for ; Tue, 26 Apr 2016 14:45:08 -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=wbdvnY7m8p8kTdRSCKkNVaL6NKdAc6fTh11frm4NnCk=; b=mJaCH1uJesz8hIUwqpe5sGllqyzNgKJTClPPoJeitldxGW03nBu6gSZsP86WVFTn5g FbY4hVPp0PRMyrrxLzbNT3o4c8Q8D9UEvUOL/sXlgd66WWYNpo7zdUWL8ef4ARdYJ4vt cdnyVjIlxCFuf14rRS8kRfZN7msd9scO9sxMOYhMexT85jLPo4QZZGLdRNxetIRWXm/+ G+w8ZZY0YPTdebW1FPf4EN3qoKiQ26yfWSp7zqDvdbIhNLD1n3T0gVm/4paIopBrXU2P dqVmP0aCkA5FEn+MNRSLHV7zAUlwai1EouEGFLKKk1l0PZ3IAAH4tXHTbJstuRC6W2z8 dARw== 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=wbdvnY7m8p8kTdRSCKkNVaL6NKdAc6fTh11frm4NnCk=; b=Od9gMA0rbdAz9EMbrQppXdigVs42etufvsz4FGS+ibNYX2C1MNL/oi0vPjHdIEEpM1 8DczuuWINov9b5mhWlKCtJSXzNtGA+aS/fMk9rMx0KH5vsDSEPeo64avuuNAv5L5vsgK arIBg5JCnUBM6rqZh6vLxCiZA5iDZWZZWxglkXqUI9kB/avbuhr2Vp90DE3bIeZLd93j 5YC4Q76HUd3BJpwiBAY/LpLBAjnvhhyqoW8nDOb1Qr+uWU2sOmZ7GIbZ5WgMhXykcDKr iugYA9KCj5gT1PWgdfCePHxf/8kcqYS+AzVsMXShaBYm6pgBfihDQGwxSZRa6qkVX0qG jhqg== Sender: rtc-linux@googlegroups.com X-Gm-Message-State: AOPr4FWAfsfngTbhMV14I6y9e63Zr/q35H829bJefjKhl10iTvoBRbdMu7zfCmfw6mQWnQ== X-Received: by 10.25.33.141 with SMTP id h135mr107805lfh.11.1461707106140; Tue, 26 Apr 2016 14:45:06 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.25.147.17 with SMTP id v17ls607965lfd.37.gmail; Tue, 26 Apr 2016 14:45:05 -0700 (PDT) X-Received: by 10.112.155.41 with SMTP id vt9mr617831lbb.16.1461707105708; Tue, 26 Apr 2016 14:45:05 -0700 (PDT) Received: from mout.kundenserver.de (mout.kundenserver.de. [212.227.126.135]) by gmr-mx.google.com with ESMTPS id a65si761243wma.0.2016.04.26.14.45.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Apr 2016 14:45:05 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.126.135 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.126.135; Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue003) with ESMTPA (Nemesis) id 0LhzeA-1bY4JP1Rsw-00n7Mk; Tue, 26 Apr 2016 23:44:49 +0200 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: Arnd Bergmann , tony.luck@intel.com, geert@linux-m68k.org, jejb@parisc-linux.org, deller@gmx.de, benh@kernel.crashing.org, mpe@ellerman.id.au, dalias@libc.org, dhowells@redhat.com, yasutake.koichi@jp.panasonic.com, rth@twiddle.net, ink@jurassic.park.msu.ru, linux-alpha@vger.kernel.org, x86@kernel.org, a.zummo@towertech.it, alexandre.belloni@free-electrons.com, linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, rtc-linux@googlegroups.com, linux-arch@vger.kernel.org Subject: [rtc-linux] [PATCH 5/8] char/genrtc: powerpc: use asm-generic/rtc.h Date: Tue, 26 Apr 2016 23:44:09 +0200 Message-Id: <1461707052-1337718-6-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1461707052-1337718-1-git-send-email-arnd@arndb.de> References: <1461707052-1337718-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:n6EnnEqhTcyhUez+lE/8RFP0cwH+yHqEoK3+G7YpPf1MQ0qAb/h rrdRZ/m8fxh4Wo/C1ROrTVcz17U0HTicwoH05lXz5WgxjyMxSNNJy82PG1Ye4l5w393wnr2 Ryxjj6++VLbVG3o4vRmA0ZSxJHjK2TwGYaxzWgZ+Wy+KJeC9iuEbbwwqPbikUr9EEJq4wQe 7IVII3PqLbm+IF3fkJoiQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:xJZ/ob6cTmE=:yJ+b9/YSpzNPRm9v9dg29n VcUy+P+UtwGxw7Ow77Mfxiu3PoNrGf/Hy26F/L8r6VVlkXDyMoZH85QFGbbPSsk9khieiiU8H H5HGK5B9c6+uEp/IzVHal9yE1eobxfbiczTPW19emVM2xnaqmtpXq6PV85XhUxLk/bg4e7j9E s2etQrZcUb4nKXV/AEi7nYiKxSYUHG8fi/hBUiIV1UiZ2vOTsVdNTBYrG4H30O4hrYlPtfMAB hVpLTxTv+NF/P3OX20QUgqgg7itFHugQF4A+XrcVR5EFOxI/8BpeTY+RvP3Hz7xvJXiwYgU2J gDKgWIzEuVUZrlnLIJhLsm3kOP/bIV3R6JYRBytT6Yywqy1Hb9bkx527bs1YeVIZkXfHrOtkp FSsTNS61UB3WDzkG1bw96CKj0mN2C8KJmbMGtX0T0QQIvVa09a4n8Q7XCzKGFhKyb+Fr5aoOB wnhGB1rwd++uEaHA9oVuu0CZREe/mOtnWt9I+2tlRRUbT2pS+qUG1kg843K2Mac+gBLo/3Ptm W+dKyYdc7u69XZl80/+0bvcbp6QPbmdoB2o40wMHpfNDVw0te5xQ+cUILQF+UryOfofqEs1sb +EhI22m0AIFYTe3lfRYkxCE28C210+RSyKl7h+4bpz2Hz+9EI4W6I8h7XVAklazxjPh1g6a3D jDAt5ApsLKdvK8gI4VkKJDsm2DJsoleW2pxgcrEtKNN8XLuh+ay/dS/SGedKcJCuxEog= X-Original-Sender: arnd@arndb.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 212.227.126.135 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 asm-generic/rtc.h header can now be included by architectures that provide their own set_rtc_time/get_rtc_time macros, letting us remove most of the common contents in the powerpc implementation. Signed-off-by: Arnd Bergmann --- arch/powerpc/include/asm/rtc.h | 36 +++++------------------------------- 1 file changed, 5 insertions(+), 31 deletions(-) diff --git a/arch/powerpc/include/asm/rtc.h b/arch/powerpc/include/asm/rtc.h index f5802926b6c0..c6659582bd1e 100644 --- a/arch/powerpc/include/asm/rtc.h +++ b/arch/powerpc/include/asm/rtc.h @@ -26,23 +26,14 @@ #ifdef __KERNEL__ -#include +#define get_rtc_time powerpc_get_rtc_time +#define set_rtc_time powerpc_set_rtc_time +#include #include #include -#define RTC_PIE 0x40 /* periodic interrupt enable */ -#define RTC_AIE 0x20 /* alarm interrupt enable */ -#define RTC_UIE 0x10 /* update-finished interrupt enable */ - -/* some dummy definitions */ -#define RTC_BATT_BAD 0x100 /* battery bad */ -#define RTC_SQWE 0x08 /* enable square-wave output */ -#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */ -#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */ -#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */ - -static inline unsigned int get_rtc_time(struct rtc_time *time) +static inline unsigned int powerpc_get_rtc_time(struct rtc_time *time) { if (ppc_md.get_rtc_time) ppc_md.get_rtc_time(time); @@ -50,29 +41,12 @@ static inline unsigned int get_rtc_time(struct rtc_time *time) } /* Set the current date and time in the real time clock. */ -static inline int set_rtc_time(struct rtc_time *time) +static inline int powerpc_set_rtc_time(struct rtc_time *time) { if (ppc_md.set_rtc_time) return ppc_md.set_rtc_time(time); return -EINVAL; } -static inline unsigned int get_rtc_ss(void) -{ - struct rtc_time h; - - get_rtc_time(&h); - return h.tm_sec; -} - -static inline int get_rtc_pll(struct rtc_pll_info *pll) -{ - return -EINVAL; -} -static inline int set_rtc_pll(struct rtc_pll_info *pll) -{ - return -EINVAL; -} - #endif /* __KERNEL__ */ #endif /* __ASM_POWERPC_RTC_H__ */