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 'next' branch
[oweals/u-boot.git]
/
board
/
ssv
/
adnpesc1
/
adnpesc1.c
diff --git
a/board/ssv/adnpesc1/adnpesc1.c
b/board/ssv/adnpesc1/adnpesc1.c
index 71de20899ef787bc9681a6849d0a3633e591a729..9d32741499ee7bf5997caa1a5cbb2a1acfa1d187 100644
(file)
--- a/
board/ssv/adnpesc1/adnpesc1.c
+++ b/
board/ssv/adnpesc1/adnpesc1.c
@@
-76,14
+76,14
@@
int spi_cs_is_valid(unsigned int bus, unsigned int cs)
void spi_cs_activate(struct spi_slave *slave)
{
void spi_cs_activate(struct spi_slave *slave)
{
- nios_spi_t *spi = (nios_spi_t *)C
FG
_NIOS_SPIBASE;
+ nios_spi_t *spi = (nios_spi_t *)C
ONFIG_SYS
_NIOS_SPIBASE;
spi->slaveselect = SPI_RTC_CS_MASK; /* activate (1) */
}
void spi_cs_deactivate(struct spi_slave *slave)
{
spi->slaveselect = SPI_RTC_CS_MASK; /* activate (1) */
}
void spi_cs_deactivate(struct spi_slave *slave)
{
- nios_spi_t *spi = (nios_spi_t *)C
FG
_NIOS_SPIBASE;
+ nios_spi_t *spi = (nios_spi_t *)C
ONFIG_SYS
_NIOS_SPIBASE;
spi->slaveselect = 0; /* deactivate (0) */
}
spi->slaveselect = 0; /* deactivate (0) */
}