UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[ARM] orion5x: ts78xx amend RTC registering to not depend on ifdef's 

amend RTC registering to not depend on ifdef's

Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
Signed-off-by: Nicolas Pitre <nico@cam.org>
This commit is contained in:
Alexander Clouter 2009-02-23 22:38:50 +00:00 committed by Nicolas Pitre
parent f5273fa310
commit 673492a800
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/mach-orion5x/ts78xx-setup.c
View File

@ -75,7 +75,6 @@ static struct mv_sata_platform_data ts78xx_sata_data = {
/***************************************************************************** /*****************************************************************************
* RTC M48T86 - nicked^Wborrowed from arch/arm/mach-ep93xx/ts72xx.c * RTC M48T86 - nicked^Wborrowed from arch/arm/mach-ep93xx/ts72xx.c
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_RTC_DRV_M48T86
#define TS_RTC_CTRL (TS78XX_FPGA_REGS_VIRT_BASE | 0x808) #define TS_RTC_CTRL (TS78XX_FPGA_REGS_VIRT_BASE | 0x808)
#define TS_RTC_DATA (TS78XX_FPGA_REGS_VIRT_BASE | 0x80c) #define TS_RTC_DATA (TS78XX_FPGA_REGS_VIRT_BASE | 0x80c)
@ -150,16 +149,6 @@ static void ts78xx_ts_rtc_unload(void)
{ {
platform_device_del(&ts78xx_ts_rtc_device); platform_device_del(&ts78xx_ts_rtc_device);
} }
#else
static int ts78xx_ts_rtc_load(void)
{
return -ENODEV;
}
static void ts78xx_ts_rtc_unload(void)
{
}
#endif
/***************************************************************************** /*****************************************************************************
* FPGA 'hotplug' support code * FPGA 'hotplug' support code
@ -188,8 +177,7 @@ static int ts78xx_fpga_load_devices(void)
if (ts78xx_fpga.supports.ts_rtc.present == 1) { if (ts78xx_fpga.supports.ts_rtc.present == 1) {
tmp = ts78xx_ts_rtc_load(); tmp = ts78xx_ts_rtc_load();
if (tmp) { if (tmp) {
printk(KERN_INFO "TS-78xx RTC" printk(KERN_INFO "TS-78xx: RTC not registered\n");
" not detected or enabled\n");
ts78xx_fpga.supports.ts_rtc.present = 0; ts78xx_fpga.supports.ts_rtc.present = 0;
} }
ret |= tmp; ret |= tmp;