Commit e65732c6 authored by David Woodhouse's avatar David Woodhouse

PPC SBC82xx: Move RTC to 0xd0000000 to make room for PCI I/O stuff.

parent dc0a8b03
...@@ -57,6 +57,7 @@ sbc82xx_setup_arch(void) ...@@ -57,6 +57,7 @@ sbc82xx_setup_arch(void)
callback_setup_arch(); callback_setup_arch();
} }
#ifdef CONFIG_GEN_RTC
TODC_ALLOC(); TODC_ALLOC();
/* /*
...@@ -64,16 +65,17 @@ TODC_ALLOC(); ...@@ -64,16 +65,17 @@ TODC_ALLOC();
* directly use ioremap() at that time. * directly use ioremap() at that time.
* late_time_init() is call after paging init. * late_time_init() is call after paging init.
*/ */
#ifdef CONFIG_GEN_RTC
static void sbc82xx_time_init(void) static void sbc82xx_time_init(void)
{ {
volatile memctl_cpm2_t *mc = &cpm2_immr->im_memctl; volatile memctl_cpm2_t *mc = &cpm2_immr->im_memctl;
TODC_INIT(TODC_TYPE_MK48T59, 0, 0, SBC82xx_TODC_NVRAM_ADDR, 0);
/* Set up CS11 for RTC chip */ /* Set up CS11 for RTC chip */
mc->memc_br11=0; mc->memc_br11=0;
mc->memc_or11=0xffff0836; mc->memc_or11=0xffff0836;
mc->memc_br11=0x80000801; mc->memc_br11=SBC82xx_TODC_NVRAM_ADDR | 0x0801;
TODC_INIT(TODC_TYPE_MK48T59, 0, 0, SBC82xx_TODC_NVRAM_ADDR, 0);
todc_info->nvram_data = todc_info->nvram_data =
(unsigned int)ioremap(todc_info->nvram_data, 0x2000); (unsigned int)ioremap(todc_info->nvram_data, 0x2000);
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#define CPM_MAP_ADDR 0xf0000000 #define CPM_MAP_ADDR 0xf0000000
#define SBC82xx_TODC_NVRAM_ADDR 0x80000000 #define SBC82xx_TODC_NVRAM_ADDR 0xd0000000
#define SBC82xx_MACADDR_NVRAM_FCC1 0x220000c9 /* JP6B */ #define SBC82xx_MACADDR_NVRAM_FCC1 0x220000c9 /* JP6B */
#define SBC82xx_MACADDR_NVRAM_SCC1 0x220000cf /* JP6A */ #define SBC82xx_MACADDR_NVRAM_SCC1 0x220000cf /* JP6A */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment