iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: kirkwood: use devicetree for rtc-mv

Browse Source 
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Jason Cooper 2012-03-06 23:55:04 +00:00
parent ea983ede11
commit e871b87a1e
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/boot/dts/kirkwood.dtsi
View File

@ -26,5 +26,11 @@
/* set clock-frequency in board dts */ /* set clock-frequency in board dts */
status = "disabled"; status = "disabled";
}; };
rtc@10300 {
compatible = "mrvl,kirkwood-rtc", "mrvl,orion-rtc";
reg = <0x10300 0x20>;
interrupts = <53>;
};
}; };
}; };

1
arch/arm/mach-kirkwood/board-dt.c
View File

@ -43,7 +43,6 @@ static void __init kirkwood_dt_init(void)
#endif #endif
/* internal devices that every board has */ /* internal devices that every board has */
kirkwood_rtc_init();
kirkwood_wdt_init(); kirkwood_wdt_init();
kirkwood_xor0_init(); kirkwood_xor0_init();
kirkwood_xor1_init(); kirkwood_xor1_init();

2
arch/arm/mach-kirkwood/common.c
View File

@ -163,7 +163,7 @@ void __init kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts,
/***************************************************************************** /*****************************************************************************
* SoC RTC * SoC RTC
****************************************************************************/ ****************************************************************************/
void __init kirkwood_rtc_init(void) static void __init kirkwood_rtc_init(void)
{ {
orion_rtc_init(RTC_PHYS_BASE, IRQ_KIRKWOOD_RTC); orion_rtc_init(RTC_PHYS_BASE, IRQ_KIRKWOOD_RTC);
} }

1
arch/arm/mach-kirkwood/common.h
View File

@ -61,7 +61,6 @@ static inline void dreamplug_init(void) {};
/* early init functions not converted to fdt yet */ /* early init functions not converted to fdt yet */
char *kirkwood_id(void); char *kirkwood_id(void);
void kirkwood_l2_init(void); void kirkwood_l2_init(void);
void kirkwood_rtc_init(void);
void kirkwood_wdt_init(void); void kirkwood_wdt_init(void);
void kirkwood_xor0_init(void); void kirkwood_xor0_init(void);
void kirkwood_xor1_init(void); void kirkwood_xor1_init(void);