projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://www.denx.de/git/u-boot
[oweals/u-boot.git]
/
board
/
amcc
/
taihu
/
taihu.c
diff --git
a/board/amcc/taihu/taihu.c
b/board/amcc/taihu/taihu.c
index 9bd30f96a73d1ac7ff2af3dd049649303d9453e7..254e3eb837b37b221ce4c64a186158da1ba4377a 100644
(file)
--- a/
board/amcc/taihu/taihu.c
+++ b/
board/amcc/taihu/taihu.c
@@
-78,10
+78,10
@@
int checkboard(void)
}
/*************************************************************************
}
/*************************************************************************
- *
long in
t initdram
+ *
phys_size_
t initdram
*
************************************************************************/
*
************************************************************************/
-
long in
t initdram(int board)
+
phys_size_
t initdram(int board)
{
return CFG_SDRAM_SIZE_PER_BANK * CFG_SDRAM_BANKS; /* 128Mbytes */
}
{
return CFG_SDRAM_SIZE_PER_BANK * CFG_SDRAM_BANKS; /* 128Mbytes */
}
@@
-165,16
+165,20
@@
unsigned char spi_read(void)
return (unsigned char)gpio_read_in_bit(SPI_DIN_GPIO15);
}
return (unsigned char)gpio_read_in_bit(SPI_DIN_GPIO15);
}
-
void taihu_spi_chipsel(
int cs)
+
int spi_cs_is_valid(unsigned int bus, unsigned
int cs)
{
{
-
gpio_write_bit(SPI_CS_GPIO0, cs)
;
+
return bus == 0 && cs == 0
;
}
}
-spi_chipsel_type spi_chipsel[]= {
- taihu_spi_chipsel
-};
+void spi_cs_activate(struct spi_slave *slave)
+{
+ gpio_write_bit(SPI_CS_GPIO0, 1);
+}
-int spi_chipsel_cnt = sizeof(spi_chipsel) / sizeof(spi_chipsel[0]);
+void spi_cs_deactivate(struct spi_slave *slave)
+{
+ gpio_write_bit(SPI_CS_GPIO0, 0);
+}
#ifdef CONFIG_PCI
static unsigned char int_lines[32] = {
#ifdef CONFIG_PCI
static unsigned char int_lines[32] = {