From patchwork Fri Apr 25 09:31:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 29047 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f200.google.com (mail-ie0-f200.google.com [209.85.223.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 25A52202E6 for ; Fri, 25 Apr 2014 09:36:46 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id lx4sf20671326iec.3 for ; Fri, 25 Apr 2014 02:36:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=ckmeZp7frQKfnqfj5kc/lM5OWnxSBIhas2bKAkt9G6s=; b=buqKJ6wwZz8s2OHhDv8HhNkG8WIh/DLXTkCJ/vSFbnkHgWvGTo7TJ7irc5Ikgexo6x DJWoi1Pu/YD1eDULyYA6P+11GBRIpCaQTOEYnQOXFjxT1UfvZ0+dt06ZzlKF7Qv0j7+W XW7KQPD4Cdb0q/87VuFOfIgS0xG/pKSt91jSncdqs0m5IdDhDqvm0yhm97AOaPtYeEBA aABxPsJzy4fP1vw2DW3rNWx55OpLf/YVQ9dxNA2/HKNVT+6tfvYizT8QXASzCjFQgrbm RTtmu8Otp91C73+jQy36n7ZgEk2iRJemmLerK5D/bU2w68u3CpFmiJk5pZseYnleWdio 4aSw== X-Gm-Message-State: ALoCoQnZFZfQnMWr+hMXdcKeFqi736hG020XINRF8cZUbjBy066agDaU19stdryayKFu8IZL4yqy X-Received: by 10.182.118.194 with SMTP id ko2mr4058070obb.32.1398418605570; Fri, 25 Apr 2014 02:36:45 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.35.210 with SMTP id n76ls1563102qgn.15.gmail; Fri, 25 Apr 2014 02:36:45 -0700 (PDT) X-Received: by 10.221.20.199 with SMTP id qp7mr5922592vcb.24.1398418605410; Fri, 25 Apr 2014 02:36:45 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id vr6si1569594vcb.190.2014.04.25.02.36.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 25 Apr 2014 02:36:45 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id im17so4405615vcb.14 for ; Fri, 25 Apr 2014 02:36:45 -0700 (PDT) X-Received: by 10.52.108.164 with SMTP id hl4mr4952570vdb.25.1398418605327; Fri, 25 Apr 2014 02:36:45 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp83616vcb; Fri, 25 Apr 2014 02:36:44 -0700 (PDT) X-Received: by 10.66.240.130 with SMTP id wa2mr6613365pac.73.1398418604567; Fri, 25 Apr 2014 02:36:44 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id iw3si4432661pac.301.2014.04.25.02.36.43 for ; Fri, 25 Apr 2014 02:36:44 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753076AbaDYJf6 (ORCPT + 28 others); Fri, 25 Apr 2014 05:35:58 -0400 Received: from fw-tnat.austin.arm.com ([217.140.110.23]:24934 "EHLO collaborate-mta1.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752417AbaDYJbY (ORCPT ); Fri, 25 Apr 2014 05:31:24 -0400 Received: from e102391-lin.cambridge.arm.com (e102391-lin.cambridge.arm.com [10.1.209.166]) by collaborate-mta1.arm.com (Postfix) with ESMTP id 8B21713FCF2; Fri, 25 Apr 2014 04:31:23 -0500 (CDT) From: Marc Zyngier To: linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com Cc: Russell King , Will Deacon , Catalin Marinas , Alessandro Zummo Subject: [PATCH 7/7] arm64: rtc: plug the PC CMOS RTC using MMIO accessors Date: Fri, 25 Apr 2014 10:31:15 +0100 Message-Id: <1398418275-9671-8-git-send-email-marc.zyngier@arm.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1398418275-9671-1-git-send-email-marc.zyngier@arm.com> References: <1398418275-9671-1-git-send-email-marc.zyngier@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: marc.zyngier@arm.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Add the now minimal gunk to enable the PC-style CMOS RTC. Signed-off-by: Marc Zyngier --- arch/arm64/include/asm/mc146818rtc.h | 10 ++++++++++ drivers/rtc/Kconfig | 5 +++-- drivers/rtc/rtc-cmos.c | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 arch/arm64/include/asm/mc146818rtc.h diff --git a/arch/arm64/include/asm/mc146818rtc.h b/arch/arm64/include/asm/mc146818rtc.h new file mode 100644 index 0000000..79cc1f3 --- /dev/null +++ b/arch/arm64/include/asm/mc146818rtc.h @@ -0,0 +1,10 @@ +/* + * Machine dependent access functions for RTC registers. + * In the arm64 case, pretty much nothing. + */ +#ifndef __ARM64_MC146818RTC_H__ +#define __ARM64_MC146818RTC_H__ + +#define RTC_ALWAYS_BCD 0 + +#endif /* __ARM64_MC146818RTC_H__ */ diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index b2a512e..5944c92 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -660,10 +660,11 @@ comment "Platform RTC drivers" config RTC_DRV_CMOS tristate "PC-style 'CMOS'" - depends on X86 || ARM || M32R || PPC || MIPS || SPARC64 + depends on X86 || ARM || M32R || PPC || MIPS || SPARC64 || ARM64 default y if X86 select RTC_DRV_CMOS_MMIO if ARM - select RTC_DRV_CMOS_PRIV_LOCK if ARM + select RTC_DRV_CMOS_MMIO_STRICT if ARM64 + select RTC_DRV_CMOS_PRIV_LOCK if (ARM || ARM64) help Say "yes" here to get direct support for the real time clock found in every PC or ACPI-based system, and some other boards. diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index eb5d05c..d84e3a5 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c @@ -754,7 +754,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) address_space = 64; #elif defined(__i386__) || defined(__x86_64__) || defined(__arm__) \ || defined(__sparc__) || defined(__mips__) \ - || defined(__powerpc__) + || defined(__powerpc__) || defined(CONFIG_ARM64) address_space = 128; #else #warning Assuming 128 bytes of RTC+NVRAM address space, not 64 bytes.