xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] RTC: Remove some duplicate BCD definitions

Browse Source 
Remove some duplicate BCD definitions

Signed-off-by: Matt Mackall <mpm@selenic.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Matt Mackall
2006-03-28 01:56:10 -08:00
committed by Linus Torvalds
parent 41623b064f
commit 4f3a36a7d0
7 changed files with 22 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
arch/mips/momentum/ocelot_3/setup.c
View File

@@ -58,6 +58,7 @@
#include <linux/bootmem.h>
#include <linux/mv643xx.h>
#include <linux/pm.h>
#include <linux/bcd.h>
#include <asm/time.h>
#include <asm/page.h>
@@ -131,9 +132,6 @@ void setup_wired_tlb_entries(void)
add_wired_entry(ENTRYLO(0xfc000000), ENTRYLO(0xfd000000), (signed)0xfc000000, PM_16M);
}
#define CONV_BCD_TO_BIN(val) (((val) & 0xf) + (((val) >> 4) * 10))
#define CONV_BIN_TO_BCD(val) (((val) % 10) + (((val) / 10) << 4))
unsigned long m48t37y_get_time(void)
{
unsigned int year, month, day, hour, min, sec;
@@ -143,16 +141,16 @@ unsigned long m48t37y_get_time(void)
/* stop the update */
rtc_base[0x7ff8] = 0x40;
year = CONV_BCD_TO_BIN(rtc_base[0x7fff]);
year += CONV_BCD_TO_BIN(rtc_base[0x7ff1]) * 100;
year = BCD2BIN(rtc_base[0x7fff]);
year += BCD2BIN(rtc_base[0x7ff1]) * 100;
month = CONV_BCD_TO_BIN(rtc_base[0x7ffe]);
month = BCD2BIN(rtc_base[0x7ffe]);
day = CONV_BCD_TO_BIN(rtc_base[0x7ffd]);
day = BCD2BIN(rtc_base[0x7ffd]);
hour = CONV_BCD_TO_BIN(rtc_base[0x7ffb]);
min = CONV_BCD_TO_BIN(rtc_base[0x7ffa]);
sec = CONV_BCD_TO_BIN(rtc_base[0x7ff9]);
hour = BCD2BIN(rtc_base[0x7ffb]);
min = BCD2BIN(rtc_base[0x7ffa]);
sec = BCD2BIN(rtc_base[0x7ff9]);
/* start the update */
rtc_base[0x7ff8] = 0x00;
@@ -175,22 +173,22 @@ int m48t37y_set_time(unsigned long sec)
rtc_base[0x7ff8] = 0x80;
/* year */
rtc_base[0x7fff] = CONV_BIN_TO_BCD(tm.tm_year % 100);
rtc_base[0x7ff1] = CONV_BIN_TO_BCD(tm.tm_year / 100);
rtc_base[0x7fff] = BIN2BCD(tm.tm_year % 100);
rtc_base[0x7ff1] = BIN2BCD(tm.tm_year / 100);
/* month */
rtc_base[0x7ffe] = CONV_BIN_TO_BCD(tm.tm_mon);
rtc_base[0x7ffe] = BIN2BCD(tm.tm_mon);
/* day */
rtc_base[0x7ffd] = CONV_BIN_TO_BCD(tm.tm_mday);
rtc_base[0x7ffd] = BIN2BCD(tm.tm_mday);
/* hour/min/sec */
rtc_base[0x7ffb] = CONV_BIN_TO_BCD(tm.tm_hour);
rtc_base[0x7ffa] = CONV_BIN_TO_BCD(tm.tm_min);
rtc_base[0x7ff9] = CONV_BIN_TO_BCD(tm.tm_sec);
rtc_base[0x7ffb] = BIN2BCD(tm.tm_hour);
rtc_base[0x7ffa] = BIN2BCD(tm.tm_min);
rtc_base[0x7ff9] = BIN2BCD(tm.tm_sec);
/* day of week -- not really used, but let's keep it up-to-date */
rtc_base[0x7ffc] = CONV_BIN_TO_BCD(tm.tm_wday + 1);
rtc_base[0x7ffc] = BIN2BCD(tm.tm_wday + 1);
/* disable writing */
rtc_base[0x7ff8] = 0x00;

12
arch/mips/tx4938/common/rtc_rx5c348.c
View File

@@ -14,6 +14,7 @@
#include <linux/string.h>
#include <linux/rtc.h>
#include <linux/time.h>
#include <linux/bcd.h>
#include <asm/time.h>
#include <asm/tx4938/spi.h>
@@ -77,17 +78,6 @@ spi_rtc_io(unsigned char *inbuf, unsigned char *outbuf, unsigned int count)
inbufs, incounts, outbufs, outcounts, 0);
}
/*
* Conversion between binary and BCD.
*/
#ifndef BCD_TO_BIN
#define BCD_TO_BIN(val) ((val)=((val)&15) + ((val)>>4)*10)
#endif
#ifndef BIN_TO_BCD
#define BIN_TO_BCD(val) ((val)=(((val)/10)<<4) + (val)%10)
#endif
/* RTC-dependent code for time.c */
static int