summaryrefslogtreecommitdiff
path: root/board/r7780mp/r7780mp.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-07-09 23:09:36 +0200
committerWolfgang Denk <wd@denx.de>2008-07-09 23:09:36 +0200
commit2caea1ebee1fb20e1b229f1f821225829fb87f0e (patch)
tree86070cd53a417f857754822f15ba8536a9df2c40 /board/r7780mp/r7780mp.c
parent417faf285b2527acb2de24c5cd3e2621d385408c (diff)
parent689c1b30caacba3fbca0b1813facb3ab70b6cd63 (diff)
downloadu-boot-imx-2caea1ebee1fb20e1b229f1f821225829fb87f0e.zip
u-boot-imx-2caea1ebee1fb20e1b229f1f821225829fb87f0e.tar.gz
u-boot-imx-2caea1ebee1fb20e1b229f1f821225829fb87f0e.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-sh
Diffstat (limited to 'board/r7780mp/r7780mp.c')
-rw-r--r--board/r7780mp/r7780mp.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/board/r7780mp/r7780mp.c b/board/r7780mp/r7780mp.c
index 1a37711..19c35d3 100644
--- a/board/r7780mp/r7780mp.c
+++ b/board/r7780mp/r7780mp.c
@@ -38,12 +38,12 @@ int checkboard(void)
int board_init(void)
{
/* SCIF Enable */
- *(vu_short*)PHCR = 0x0000;
+ writew(0x0, PHCR);
return 0;
}
-int dram_init (void)
+int dram_init(void)
{
DECLARE_GLOBAL_DATA_PTR;
@@ -53,29 +53,27 @@ int dram_init (void)
return 0;
}
-void led_set_state (unsigned short value)
+void led_set_state(unsigned short value)
{
}
-void ide_set_reset (int idereset)
+void ide_set_reset(int idereset)
{
/* if reset = 1 IDE reset will be asserted */
- if (idereset){
- (*(vu_short *)FPGA_CFCTL) = 0x432;
+ if (idereset) {
+ writew(0x432, FPGA_CFCTL);
#if defined(CONFIG_R7780MP)
- (*(vu_short *)FPGA_CFPOW) |= 0x01;
+ writew(inw(FPGA_CFPOW)|0x01, FPGA_CFPOW);
#else
- (*(vu_short *)FPGA_CFPOW) |= 0x02;
+ writew(inw(FPGA_CFPOW)|0x02, FPGA_CFPOW);
#endif
- (*(vu_short *)FPGA_CFCDINTCLR) = 0x01;
+ writew(0x01, FPGA_CFCDINTCLR);
}
}
-#if defined(CONFIG_PCI)
static struct pci_controller hose;
void pci_init_board(void)
{
- pci_sh7780_init( &hose );
+ pci_sh7780_init(&hose);
}
-#endif