diff options
author | imp <imp@FreeBSD.org> | 2013-05-10 02:57:46 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2013-05-10 02:57:46 +0000 |
commit | 4cfb7cf5acee479be43a8536626786afcc254dbe (patch) | |
tree | 02404d203a787503a960b5e9027e9b4adfc8c07d | |
parent | b6dc2308e13784bb221f5d73d1d88e8644ca81df (diff) | |
download | FreeBSD-src-4cfb7cf5acee479be43a8536626786afcc254dbe.zip FreeBSD-src-4cfb7cf5acee479be43a8536626786afcc254dbe.tar.gz |
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.
-rw-r--r-- | sys/contrib/octeon-sdk/cvmx-rtc.h | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/sys/contrib/octeon-sdk/cvmx-rtc.h b/sys/contrib/octeon-sdk/cvmx-rtc.h index 59858e5..470d528 100644 --- a/sys/contrib/octeon-sdk/cvmx-rtc.h +++ b/sys/contrib/octeon-sdk/cvmx-rtc.h @@ -87,13 +87,8 @@ static inline cvmx_rtc_options_t cvmx_rtc_supported(void) 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(void) 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(uint32_t time) 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; } } |