projects
/
platform
/
kernel
/
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://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
drivers
/
spi
/
kirkwood_spi.c
diff --git
a/drivers/spi/kirkwood_spi.c
b/drivers/spi/kirkwood_spi.c
index
135895f
..
dfe542d
100644
(file)
--- a/
drivers/spi/kirkwood_spi.c
+++ b/
drivers/spi/kirkwood_spi.c
@@
-27,6
+27,7
@@
#include <common.h>
#include <malloc.h>
#include <spi.h>
#include <common.h>
#include <malloc.h>
#include <spi.h>
+#include <asm/io.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/spi.h>
#include <asm/arch/mpp.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/spi.h>
#include <asm/arch/mpp.h>
@@
-106,6
+107,10
@@
int spi_cs_is_valid(unsigned int bus, unsigned int cs)
}
#endif
}
#endif
+void spi_init(void)
+{
+}
+
void spi_cs_activate(struct spi_slave *slave)
{
writel(readl(&spireg->ctrl) | KWSPI_IRQUNMASK, &spireg->ctrl);
void spi_cs_activate(struct spi_slave *slave)
{
writel(readl(&spireg->ctrl) | KWSPI_IRQUNMASK, &spireg->ctrl);