aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Miao <eric.miao@linaro.org>2012-01-12 16:04:55 +0800
committerEric Miao <eric.miao@linaro.org>2012-01-12 16:04:55 +0800
commit34cb74a680fc92f9f3f854620bce26f3e7c6ded2 (patch)
treefdf1d6faf52e266b5bbd728f4d19b03516a8e79a
parentb2c2a8105a63ac5201f108646e9767a8b3843f24 (diff)
downloadlinux-linaro-34cb74a680fc92f9f3f854620bce26f3e7c6ded2.tar.gz
imx6q-sabrelite: add support for eCSPI1 and SPI-NOR flash
Signed-off-by: Eric Miao <eric.miao@linaro.org>
-rw-r--r--arch/arm/boot/dts/imx6q-sabrelite.dts12
-rw-r--r--arch/arm/mach-imx/mach-imx6q.c5
2 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts
index 9e8557f5f13..6d27997acb7 100644
--- a/arch/arm/boot/dts/imx6q-sabrelite.dts
+++ b/arch/arm/boot/dts/imx6q-sabrelite.dts
@@ -29,6 +29,18 @@
fsl,ssi-uses-dma;
fsl,ssi-synchronous-mode;
};
+
+ ecspi@02008000 { /* eCSPI1 */
+ fsl,spi-num-chipselects = <1>;
+ cs-gpios = <&gpio3 19 0>;
+ status = "okay";
+
+ flash: m25p32@0 {
+ compatible = "st,m25p32", "st,m25p";
+ spi-max-frequency = <20000000>;
+ reg = <0>;
+ };
+ };
};
ldb@020e0000 {
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index 4978c7aa95b..6dbb50655be 100644
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -87,6 +87,11 @@ static iomux_v3_cfg_t imx6q_sabrelite_pads[] = {
/* I2C3 */
MX6Q_PAD_GPIO_5__I2C3_SCL,
MX6Q_PAD_GPIO_16__I2C3_SDA,
+ /* ECSPI1 */
+ MX6Q_PAD_EIM_D17__ECSPI1_MISO,
+ MX6Q_PAD_EIM_D18__ECSPI1_MOSI,
+ MX6Q_PAD_EIM_D16__ECSPI1_SCLK,
+ MX6Q_PAD_EIM_D19__GPIO_3_19, /*SS1*/
/* GPIO */
MX6Q_PAD_NANDF_D0__GPIO_2_0,
MX6Q_PAD_EIM_D23__GPIO_3_23,