svn commit: r250426 - head/sys/contrib/octeon-sdk

[Warner Losh]

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;
     }
 }