diff options
author | Wolfgang Denk <wd@denx.de> | 2009-08-31 22:21:47 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-08-31 22:21:47 +0200 |
commit | 3aa8b68d80dbcb6829af60485c1e388b39af793d (patch) | |
tree | b76a4e1624cfddceb5358d6221acd08a57c45b74 /drivers/rtc/ds1306.c | |
parent | 3d35d87d5482de23cd5dc4d7721b1086107cae50 (diff) | |
parent | 2d04db088e6df8a008bb09f604876a45031df93b (diff) | |
download | u-boot-imx-3aa8b68d80dbcb6829af60485c1e388b39af793d.zip u-boot-imx-3aa8b68d80dbcb6829af60485c1e388b39af793d.tar.gz u-boot-imx-3aa8b68d80dbcb6829af60485c1e388b39af793d.tar.bz2 |
Merge branch 'next' of ../next
Diffstat (limited to 'drivers/rtc/ds1306.c')
-rw-r--r-- | drivers/rtc/ds1306.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/rtc/ds1306.c b/drivers/rtc/ds1306.c index 75f88a9..288c5f8 100644 --- a/drivers/rtc/ds1306.c +++ b/drivers/rtc/ds1306.c @@ -62,9 +62,6 @@ #define RTC_USER_RAM_BASE 0x20 -static unsigned int bin2bcd (unsigned int n); -static unsigned char bcd2bin (unsigned char c); - /* ************************************************************************* */ #ifdef CONFIG_SXNI855T /* !!! SHOULD BE CHANGED TO NEW CODE !!! */ @@ -459,19 +456,4 @@ static void rtc_write (unsigned char reg, unsigned char val) #endif /* end of code exclusion (see #ifdef CONFIG_SXNI855T above) */ -/* ------------------------------------------------------------------------- */ - -static unsigned char bcd2bin (unsigned char n) -{ - return ((((n >> 4) & 0x0F) * 10) + (n & 0x0F)); -} - -/* ------------------------------------------------------------------------- */ - -static unsigned int bin2bcd (unsigned int n) -{ - return (((n / 10) << 4) | (n % 10)); -} -/* ------------------------------------------------------------------------- */ - #endif |