From owner-svn-src-all@FreeBSD.ORG Fri May 10 02:57:47 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id F378F985; Fri, 10 May 2013 02:57:46 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E66EC290; Fri, 10 May 2013 02:57:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4A2vkfV062812; Fri, 10 May 2013 02:57:46 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4A2vkfd062811; Fri, 10 May 2013 02:57:46 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201305100257.r4A2vkfd062811@svn.freebsd.org> From: Warner Losh Date: Fri, 10 May 2013 02:57:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r250426 - head/sys/contrib/octeon-sdk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 May 2013 02:57:47 -0000 Author: imp Date: Fri May 10 02:57:46 2013 New Revision: 250426 URL: http://svnweb.freebsd.org/changeset/base/250426 Log: Both my EBH5200 and GE WANIC 6354 have a RTC as well. It looks from the Linux tree that they always include this chip in their FDT, so make support for the ds1337 opt-out rather than opt-in. Now my boards boot with the correct time. Modified: head/sys/contrib/octeon-sdk/cvmx-rtc.h Modified: head/sys/contrib/octeon-sdk/cvmx-rtc.h ============================================================================== --- head/sys/contrib/octeon-sdk/cvmx-rtc.h Thu May 9 22:29:33 2013 (r250425) +++ head/sys/contrib/octeon-sdk/cvmx-rtc.h Fri May 10 02:57:46 2013 (r250426) @@ -87,13 +87,8 @@ static inline cvmx_rtc_options_t cvmx_rt supported = CVMX_RTC_READ | CVMX_RTC_WRITE | CVMX_RTC_TIME_EPOCH; break; - case CVMX_BOARD_TYPE_EBH3000: - case CVMX_BOARD_TYPE_CN3010_EVB_HS5: - supported = CVMX_RTC_READ | CVMX_RTC_WRITE | CVMX_RTC_TIME_CAL; - break; - default: - supported = 0; + supported = CVMX_RTC_READ | CVMX_RTC_WRITE | CVMX_RTC_TIME_CAL; break; } @@ -122,14 +117,9 @@ static inline uint32_t cvmx_rtc_read(voi return cvmx_rtc_ds1374_read(); break; - case CVMX_BOARD_TYPE_EBH3000: - case CVMX_BOARD_TYPE_CN3010_EVB_HS5: + default: return cvmx_rtc_ds1337_read(); break; - - default: - return 0; - break; } } @@ -148,14 +138,9 @@ static inline uint32_t cvmx_rtc_write(ui return cvmx_rtc_ds1374_write(time); break; - case CVMX_BOARD_TYPE_EBH3000: - case CVMX_BOARD_TYPE_CN3010_EVB_HS5: + default: return cvmx_rtc_ds1337_write(time); break; - - default: - return 0; - break; } }