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://git.denx.de/u-boot-mmc
[oweals/u-boot.git]
/
drivers
/
spi
/
mpc8xxx_spi.c
diff --git
a/drivers/spi/mpc8xxx_spi.c
b/drivers/spi/mpc8xxx_spi.c
index 9eaf9860b4f83d720cffa7661c5c24a3fdc397d7..44ab39dd3ff622b5d6d17c81cd1e6b89e4b0f0d4 100644
(file)
--- a/
drivers/spi/mpc8xxx_spi.c
+++ b/
drivers/spi/mpc8xxx_spi.c
@@
-1,6
+1,6
@@
/*
* Copyright (c) 2006 Ben Warren, Qstreams Networks Inc.
/*
* Copyright (c) 2006 Ben Warren, Qstreams Networks Inc.
- * With help from the common/soft_spi and cpu/mpc8260 drivers
+ * With help from the common/soft_spi and
arch/powerpc/
cpu/mpc8260 drivers
*
* See file CREDITS for list of people who contributed to this
* project.
*
* See file CREDITS for list of people who contributed to this
* project.
@@
-67,7
+67,7
@@
void spi_free_slave(struct spi_slave *slave)
void spi_init(void)
{
void spi_init(void)
{
- volatile spi8xxx_t *spi = &((immap_t *) (C
FG
_IMMR))->spi;
+ volatile spi8xxx_t *spi = &((immap_t *) (C
ONFIG_SYS
_IMMR))->spi;
/*
* SPI pins on the MPC83xx are not muxed, so all we do is initialize
/*
* SPI pins on the MPC83xx are not muxed, so all we do is initialize
@@
-94,7
+94,7
@@
void spi_release_bus(struct spi_slave *slave)
int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
void *din, unsigned long flags)
{
int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
void *din, unsigned long flags)
{
- volatile spi8xxx_t *spi = &((immap_t *) (C
FG
_IMMR))->spi;
+ volatile spi8xxx_t *spi = &((immap_t *) (C
ONFIG_SYS
_IMMR))->spi;
unsigned int tmpdout, tmpdin, event;
int numBlks = bitlen / 32 + (bitlen % 32 ? 1 : 0);
int tm, isRead = 0;
unsigned int tmpdout, tmpdin, event;
int numBlks = bitlen / 32 + (bitlen % 32 ? 1 : 0);
int tm, isRead = 0;