git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
[pandora-kernel.git]
/
arch
/
arm
/
mach-u300
/
dummyspichip.c
diff --git
a/arch/arm/mach-u300/dummyspichip.c
b/arch/arm/mach-u300/dummyspichip.c
index
5f55012
..
03f7936
100644
(file)
--- a/
arch/arm/mach-u300/dummyspichip.c
+++ b/
arch/arm/mach-u300/dummyspichip.c
@@
-46,7
+46,6
@@
static ssize_t dummy_looptest(struct device *dev,
* struct, this is just used here to alter the behaviour of the chip
* in order to perform tests.
*/
* struct, this is just used here to alter the behaviour of the chip
* in order to perform tests.
*/
- struct pl022_config_chip *chip_info = spi->controller_data;
int status;
u8 txbuf[14] = {0xDE, 0xAD, 0xBE, 0xEF, 0x2B, 0xAD,
0xCA, 0xFE, 0xBA, 0xBE, 0xB1, 0x05,
int status;
u8 txbuf[14] = {0xDE, 0xAD, 0xBE, 0xEF, 0x2B, 0xAD,
0xCA, 0xFE, 0xBA, 0xBE, 0xB1, 0x05,
@@
-72,7
+71,7
@@
static ssize_t dummy_looptest(struct device *dev,
* Force chip to 8 bit mode
* WARNING: NEVER DO THIS IN REAL DRIVER CODE, THIS SHOULD BE STATIC!
*/
* Force chip to 8 bit mode
* WARNING: NEVER DO THIS IN REAL DRIVER CODE, THIS SHOULD BE STATIC!
*/
-
chip_info->data_size = SSP_DATA_BITS_
8;
+
spi->bits_per_word =
8;
/* You should NOT DO THIS EITHER */
spi->master->setup(spi);
/* You should NOT DO THIS EITHER */
spi->master->setup(spi);
@@
-159,7
+158,7
@@
static ssize_t dummy_looptest(struct device *dev,
* Force chip to 16 bit mode
* WARNING: NEVER DO THIS IN REAL DRIVER CODE, THIS SHOULD BE STATIC!
*/
* Force chip to 16 bit mode
* WARNING: NEVER DO THIS IN REAL DRIVER CODE, THIS SHOULD BE STATIC!
*/
-
chip_info->data_size = SSP_DATA_BITS_
16;
+
spi->bits_per_word =
16;
/* You should NOT DO THIS EITHER */
spi->master->setup(spi);
/* You should NOT DO THIS EITHER */
spi->master->setup(spi);