From patchwork Wed Nov 4 15:49:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangjin Wu X-Patchwork-Id: 37592 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-yw0-f159.google.com (mail-yw0-f159.google.com [209.85.211.159]) by ozlabs.org (Postfix) with ESMTP id A8BDFB7BDB for ; Thu, 5 Nov 2009 02:49:40 +1100 (EST) Received: by ywh31 with SMTP id 31so11572546ywh.29 for ; Wed, 04 Nov 2009 07:49:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=domainkey-signature:received:received:x-sender:x-apparently-to :received:received:received:received-spf:received:dkim-signature :domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:reply-to:sender:precedence:x-google-loop :mailing-list:list-id:list-post:list-help:list-unsubscribe :x-beenthere-env:x-beenthere; bh=Ck9ZF3ZT46dHMUq2xzu8LussiGO3FfN7pgrAXnviPas=; b=ttfRMMkIlVqwY9ny5uSFZvQhI5vzgdb0nGWJ0n/NQJdidbwU7/g99qmc+GdH7ARFtY 1cmaJXdK5Khs7YH+yU6gbm+E95grGFfufIBeeRXsUTnuDy9Tul4F+HzhWpow3e4YPhdw H9m51qM0HLKHEnMbfNWh0GyqnD8XLYhEZjxE8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlegroups.com; s=beta; h=x-sender:x-apparently-to:received-spf:authentication-results :dkim-signature:domainkey-signature:from:to:cc:subject:date :message-id:x-mailer:reply-to:sender:precedence:x-google-loop :mailing-list:list-id:list-post:list-help:list-unsubscribe :x-beenthere-env:x-beenthere; b=zPP+S6OJNuMJYTtlTu4+PdlSXabk7uIqo3EWs7EJr0wugLiEENCfyn/f065RV2rWhH WvTj72ClRal/6dVYAFJME8yvOL+wU8QNfCaiw1lQ8KYlauNAP5IzJxgsfLHNI0oVMSgP MqYFQytT+MoBKDbIGD2Xvu0hBTrGI8cEStnes= Received: by 10.100.80.6 with SMTP id d6mr38696anb.25.1257349777026; Wed, 04 Nov 2009 07:49:37 -0800 (PST) Received: by 10.176.241.26 with SMTP id o26gr3012yqh.0; Wed, 04 Nov 2009 07:49:37 -0800 (PST) X-Sender: wuzhangjin@gmail.com X-Apparently-To: rtc-linux@googlegroups.com Received: by 10.213.89.204 with SMTP id f12mr159769ebm.1.1257349775222; Wed, 04 Nov 2009 07:49:35 -0800 (PST) Received: by 10.213.89.204 with SMTP id f12mr159768ebm.1.1257349775195; Wed, 04 Nov 2009 07:49:35 -0800 (PST) Received: from mail-ew0-f212.google.com (mail-ew0-f212.google.com [209.85.219.212]) by gmr-mx.google.com with ESMTP id 13si1968396ewy.2.2009.11.04.07.49.34; Wed, 04 Nov 2009 07:49:34 -0800 (PST) Received-SPF: pass (google.com: domain of wuzhangjin@gmail.com designates 209.85.219.212 as permitted sender) client-ip=209.85.219.212; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of wuzhangjin@gmail.com designates 209.85.219.212 as permitted sender) smtp.mail=wuzhangjin@gmail.com; dkim=pass (test mode) header.i=@gmail.com Received: by ewy8 with SMTP id 8so1710559ewy.41 for ; Wed, 04 Nov 2009 07:49:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=HOQSeZ/FNM3eCDt4OL6hUbwqaeP9eZ6tUZEzVq+EmhQ=; b=BqIQVdCmsSbWbL9OgA81mmA90hzaZA9mK8FxWhFlE/K469RmCTMY3ZnqQVqqDFUou+ xsJm7bRoU9HRkbLLCIZRNccLJNUkYDcxdb29akOVM22aQ1Htyc9Tv9lMyY+hJXZ8WNSL 4GKF7jNUL3m+3YB8hbkUGUtFq+AEugzgGCIo0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=eUkVqZ0eIDiNFDeCAYijh/iqAxRAf7mJHuLT3HhDy/FB5MfzFuKHMGzQw91vdiSOG0 y6GPbQilcZuQu/6PzCHY7x1iWHEQe3nf9QcTDMnXflDZvhtxpMNNApRTfqRno0tCUBiD xgGiBdzfam04NJcvjPPLnykNW2lPMkw68jWss= Received: by 10.216.93.68 with SMTP id k46mr494926wef.161.1257349773065; Wed, 04 Nov 2009 07:49:33 -0800 (PST) Received: from localhost.localdomain ([222.92.8.142]) by mx.google.com with ESMTPS id q9sm3529060gve.0.2009.11.04.07.49.29 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 04 Nov 2009 07:49:32 -0800 (PST) From: Wu Zhangjin To: Ralf Baechle Cc: Arnaud Patard , Wu Zhangjin , linux-mips@linux-mips.org, rtc-linux@googlegroups.com Subject: [rtc-linux] [PATCH 1/2] RTC: enable RTC_LIB for fuloong2e and fuloong2f Date: Wed, 4 Nov 2009 23:49:22 +0800 Message-Id: <1257349762-21407-1-git-send-email-wuzhangjin@gmail.com> X-Mailer: git-send-email 1.6.2.1 Reply-To: rtc-linux@googlegroups.com Sender: rtc-linux@googlegroups.com Precedence: bulk X-Google-Loop: groups Mailing-List: list rtc-linux@googlegroups.com; contact rtc-linux+owner@googlegroups.com List-Id: List-Post: List-Help: List-Unsubscribe: , X-BeenThere-Env: rtc-linux@googlegroups.com X-BeenThere: rtc-linux@googlegroups.com This patch fixes the following warning with RTC_LIB on MIPS: drivers/rtc/rtc-cmos.c:697:2: warning: #warning Assuming 128 bytes of RTC+NVRAM address space, not 64 bytes. and also, enables the RTC_DM_BINARY support. without this support, RTC_LIB of fuloong2e and fuloong2f does not work. The platform RTC device driver is coming in the next patch. Signed-off-by: Wu Zhangjin --- drivers/rtc/rtc-cmos.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index f7a4701..820bdad 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c @@ -691,7 +691,8 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) */ #if defined(CONFIG_ATARI) address_space = 64; -#elif defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__sparc__) +#elif defined(__i386__) || defined(__x86_64__) || defined(__arm__) \ + || defined(__sparc__) || defined(__mips__) address_space = 128; #else #warning Assuming 128 bytes of RTC+NVRAM address space, not 64 bytes. @@ -756,9 +757,8 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) /* FIXME teach the alarm code how to handle binary mode; * doesn't know 12-hour mode either. */ - if (is_valid_irq(rtc_irq) && - (!(rtc_control & RTC_24H) || (rtc_control & (RTC_DM_BINARY)))) { - dev_dbg(dev, "only 24-hr BCD mode supported\n"); + if (is_valid_irq(rtc_irq) && !(rtc_control & RTC_24H)) { + dev_dbg(dev, "only 24-hr supported\n"); retval = -ENXIO; goto cleanup1; }