From a2badca703d5f2221f11bf0ba6f39f67963919c3 Mon Sep 17 00:00:00 2001 From: patacongo Date: Tue, 20 Dec 2011 21:16:39 +0000 Subject: [PATCH] Update M25P driver per feedback from Mohammed Elwakeel git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4207 42af7a65-404d-4744-a932-0658087f49c3 --- configs/ea3131/pgnsh/defconfig | 5 +++++ configs/stm3240g-eval/README.txt | 9 +++++---- configs/stm3240g-eval/include/board.h | 7 ++++--- configs/stm3240g-eval/src/stm3240g-internal.h | 7 ++++--- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/configs/ea3131/pgnsh/defconfig b/configs/ea3131/pgnsh/defconfig index 252a64c0922..d6643a3f3c1 100644 --- a/configs/ea3131/pgnsh/defconfig +++ b/configs/ea3131/pgnsh/defconfig @@ -176,6 +176,11 @@ CONFIG_UART_BITS=8 CONFIG_UART_PARITY=0 CONFIG_UART_2STOP=0 +# +# MP25x Configuration +# +CONFIG_MP25P_SPIMODE=3 + # # General build options # diff --git a/configs/stm3240g-eval/README.txt b/configs/stm3240g-eval/README.txt index 746d0e5ecae..a7e49a73a37 100755 --- a/configs/stm3240g-eval/README.txt +++ b/configs/stm3240g-eval/README.txt @@ -207,9 +207,10 @@ events as follows: PWM === -The STM3240G-Eval has no real on-board PWM devices, but the board can be configured to output -a pulse train using TIM4 CH2. This pin is used by FSMC is connect to CN5 just for this -purpose: +The STM3240G-Eval has no real on-board PWM devices, but the board can be +configured to output a pulse train using TIM4 CH2. This pin is used by +FSMC is but is also connected to the Motor Control Connector (CN5) just +for this purpose: PD13 FSMC_A18 / MC_TIM4_CH2 pin 33 (EnB) @@ -217,7 +218,7 @@ FSMC must be disabled in this case! PD13 is available at: Daughterboard Extension Connector, CN3, pin 32 - available TFT LCD Connector, CN19, pin 17 -- not available without removing the LCD. - Motor Control Connector CN15, pin 33 -- no available unless to connect SB14. + Motor Control Connector CN15, pin 33 -- not available unless you bridge SB14. STM3240G-EVAL-specific Configuration Options ============================================ diff --git a/configs/stm3240g-eval/include/board.h b/configs/stm3240g-eval/include/board.h index 046691dd9fd..0f6f2fca102 100755 --- a/configs/stm3240g-eval/include/board.h +++ b/configs/stm3240g-eval/include/board.h @@ -285,8 +285,9 @@ /* PWM * - * The STM3240G-Eval has no real on-board PWM devices, but the board can be configured to output - * a pulse train using TIM4 CH2. This pin is used by FSMC is connect to CN5 just for this + * The STM3240G-Eval has no real on-board PWM devices, but the board can be + * configured to output a pulse train using TIM4 CH2. This pin is used by FSMC is + * but is also connected to the Motor Control Connector (CN5) just for this * purpose: * * PD13 FSMC_A18 / MC_TIM4_CH2 pin 33 (EnB) @@ -295,7 +296,7 @@ * * Daughterboard Extension Connector, CN3, pin 32 - available * TFT LCD Connector, CN19, pin 17 -- not available without removing the LCD. - * Motor Control Connector CN15, pin 33 -- no available unless to connect SB14. + * Motor Control Connector CN15, pin 33 -- not available unless you bridge SB14. */ #define GPIO_TIM4_CH2 GPIO_TIM4_CH2_2 diff --git a/configs/stm3240g-eval/src/stm3240g-internal.h b/configs/stm3240g-eval/src/stm3240g-internal.h index 0ccdaf40a3b..fb4ce466b8f 100644 --- a/configs/stm3240g-eval/src/stm3240g-internal.h +++ b/configs/stm3240g-eval/src/stm3240g-internal.h @@ -86,8 +86,9 @@ /* PWM * - * The STM3240G-Eval has no real on-board PWM devices, but the board can be configured to output - * a pulse train using TIM4 CH2. This pin is used by FSMC is connect to CN5 just for this + * The STM3240G-Eval has no real on-board PWM devices, but the board can be + * configured to output a pulse train using TIM4 CH2. This pin is used by FSMC is + * but is also connected to the Motor Control Connector (CN5) just for this * purpose: * * PD13 FSMC_A18 / MC_TIM4_CH2 pin 33 (EnB) @@ -96,7 +97,7 @@ * * Daughterboard Extension Connector, CN3, pin 32 - available * TFT LCD Connector, CN19, pin 17 -- not available without removing the LCD. - * Motor Control Connector CN15, pin 33 -- no available unless to connect SB14. + * Motor Control Connector CN15, pin 33 -- not available unless you bridge SB14. */ #define STM3240G_EVAL_PWMTIMER 4