summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Lin <tony.lin@freescale.com>2011-03-16 10:43:26 +0800
committerTony Lin <tony.lin@freescale.com>2011-03-16 17:55:32 +0800
commit36913edd6354fc84ebd70287ea8da0104fd03644 (patch)
tree7dfa826b0ca611bd629b71c6e854a863913c72e0
parentb965c7ab7c40f6e46beaffdf46a143055cd17a05 (diff)
ENGR00140699-2 [mx28 spi] add a parameter to select spi master/slave mode
add a parameter to select spi master/slave mode by default, spi master mode is selected. Signed-off-by: Tony Lin <tony.lin@freescale.com>
-rw-r--r--arch/arm/mach-mx28/device.c1
-rw-r--r--arch/arm/plat-mxs/include/mach/device.h3
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-mx28/device.c b/arch/arm/mach-mx28/device.c
index 410928fc7d32..2545a72c2de3 100644
--- a/arch/arm/mach-mx28/device.c
+++ b/arch/arm/mach-mx28/device.c
@@ -662,6 +662,7 @@ static void mx28_init_mmc(void)
#if defined(CONFIG_SPI_MXS) || defined(CONFIG_SPI_MXS_MODULE)
static struct mxs_spi_platform_data spi_data = {
.clk = "ssp.2",
+ .slave_mode = 0,
};
static struct resource ssp2_resources[] = {
{
diff --git a/arch/arm/plat-mxs/include/mach/device.h b/arch/arm/plat-mxs/include/mach/device.h
index 080add7d8fa2..f46b984b12a2 100644
--- a/arch/arm/plat-mxs/include/mach/device.h
+++ b/arch/arm/plat-mxs/include/mach/device.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright (C) 2009-2011 Freescale Semiconductor, Inc. All Rights Reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -129,6 +129,7 @@ struct mxs_spi_platform_data {
int (*hw_pin_init)(void);
int (*hw_pin_release)(void);
+ int slave_mode;
char *clk;
};