From 65568d1c0333b35cc2e7af26dca197989deef24f Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 19 Jun 2013 20:50:27 -0600 Subject: More Freedom KL25Z changed to and from Alan Carvalho de Assis --- nuttx/arch/arm/src/kl/kl_spi.c | 1 + nuttx/configs/freedom-kl25z/include/board.h | 113 ++---------------------- nuttx/configs/freedom-kl25z/src/freedom-kl25z.h | 4 +- 3 files changed, 12 insertions(+), 106 deletions(-) diff --git a/nuttx/arch/arm/src/kl/kl_spi.c b/nuttx/arch/arm/src/kl/kl_spi.c index efce2d6e8..e73fa8403 100755 --- a/nuttx/arch/arm/src/kl/kl_spi.c +++ b/nuttx/arch/arm/src/kl/kl_spi.c @@ -53,6 +53,7 @@ #include "kl_spi.h" #include "kl_gpio.h" #include "chip/kl_memorymap.h" +#include "chip/kl_sim.h" #include "chip/kl_spi.h" #include "chip/kl_pinmux.h" diff --git a/nuttx/configs/freedom-kl25z/include/board.h b/nuttx/configs/freedom-kl25z/include/board.h index 08e9e0afe..f3e0c8de4 100644 --- a/nuttx/configs/freedom-kl25z/include/board.h +++ b/nuttx/configs/freedom-kl25z/include/board.h @@ -175,113 +175,16 @@ /* The Freedom KL25Z board has no standard GPIO contact buttons */ /* Alternative pin resolution *******************************************************/ -/* If there are alternative configurations for various pins in the - * kinetis_k40pinmux.h header file, those alternative pins will be labeled with a - * suffix like _1, _2, etc. The logic in this file must select the correct pin - * configuration for the board by defining a pin configuration (with no suffix) that - * maps to the correct alternative. +/* If there are alternative configurations for various pins in the k25z128_pinmux.h + * header file, those alternative pins will be labeled with a suffix like _1, _2, + * etc. The logic in this file must select the correct pin configuration for the + * board by defining a pin configuration (with no suffix) that maps to the correct + * alternative. */ -/* On-Board Connections - * - * ------------------- -------------------------- -------- ------------------- - * FEATURE CONNECTION PORT/PIN PIN FUNCTION - * ------------------- -------------------------- -------- ------------------- - * Audio Jack Output Audio Amp On PTE28 PTE28 - * Audio Output DAC1_OUT DAC1_OUT - * Volume Up PTD10 PTD10 - * Volume Down PTD11 PTD11 - * Buzzer Audio Out PTA8 FTM1_CH0 - * Microphone Microphone input PTA7 ADC0_SE10 - * SD Card Slot SD Clock PTE2 SDHC0_DCLK - * SD Command PTE3 SDHC0_CMD - * SD Data0 PTD12 SDHC0_D4 - * SD Data1 PTD13 SDHC0_D5 - * SD Data2 PTD14 SDHC0_D6 - * SD Data3 PTD15 SDHC0_D7 - * SD Card Detect PTE27 PTE27 - * SD Card On PTE6 PTE6 - * Infrared Port IR Transmit PTE4 IR_TX - * IR Receive PTA13 CMP2_IN0 - * Touch Pads E1 / Touch PTB0 TSI0_CH0 - * E2 / Touch PTA4 TSI0_CH5 - * E3 / Touch PTA24 PTA24 - * E4 / Touch PTA25 PTA25 - * E5 / Touch PTA26 PTA26 - * E6 / Touch PTA27 PTA27 - */ - -#define PIN_FTM1_CH0 PIN_FTM1_CH0_1 - -/* Connections via the General Purpose Tower Plug-in (TWRPI) Socket - * ------------------- -------------------------- -------- ------------------- - * FEATURE CONNECTION PORT/PIN PIN FUNCTION - * ------------------- -------------------------- -------- ------------------- - * General Purpose TWRPI AN0 (J8 Pin 8) ? ADC0_DP0/ADC1_DP3 - * TWRPI Socket TWRPI AN1 (J8 Pin 9) ? ADC0_DM0/ADC1_DM3 - * TWRPI AN2 (J8 Pin 12) ? ADC1_DP0/ADC0_DP3 - * TWRPI ID0 (J8 Pin 17) ? ADC0_DP1 - * TWRPI ID1 (J8 Pin 18) ? ADC0_DM1 - * TWRPI I2C SCL (J9 Pin 3) PTC10 I2C1_SCL - * TWRPI I2C SDA (J9 Pin 4) PTC11 I2C1_SDA - * TWRPI SPI MISO (J9 Pin 9) PTB23 SPI2_SIN - * TWRPI SPI MOSI (J9 Pin 10) PTB22 SPI2_SOUT - * TWRPI SPI SS (J9 Pin 11) PTB20 SPI2_PCS0 - * TWRPI SPI CLK (J9 Pin 12) PTB21 SPI2_SCK - * TWRPI GPIO0 (J9 Pin 15) PTC12 PTC12 - * TWRPI GPIO1 (J9 Pin 16) PTB9 PTB9 - * TWRPI GPIO2 (J9 Pin 17) PTB10 PTB10 - * TWRPI GPIO3 (J9 Pin 18) PTC5 PTC5 - * TWRPI GPIO4 (J9 Pin 19) PTA5 PTA5 - */ - -#define PIN_I2C1_SCL PIN_I2C1_SCL_1 -#define PIN_I2C1_SDA PIN_I2C1_SDA_1 -#define PIN_SPI2_SIN PIN_SPI2_SIN_1 -#define PIN_SPI2_SOUT PIN_SPI2_SOUT_1 -#define PIN_SPI2_PCS0 PIN_SPI2_PCS0_1 -#define PIN_SPI2_SCK PIN_SPI2_SCK_1 - -/* Connections via the Tower Primary Connector Side A - * --- -------------------- -------------------------------- - * PIN NAME USAGE - * --- -------------------- -------------------------------- - * A9 GPIO9 / CTS1 PTE10/UART_CTS - * A43 RXD1 PTE9/UART_RX - * A44 TXD1 PTE8/UART_TX - * A63 RSTOUT_b PTA9/FTM1_CH1 - */ - -#define PIN_UART5_CTS PIN_UART5_CTS_2 -#define PIN_FTM1_CH1 PIN_FTM1_CH1_1 - -/* Connections via the Tower Primary Connector Side B - * --- -------------------- -------------------------------- - * PIN NAME USAGE - * --- -------------------- -------------------------------- - * B21 GPIO1 / RTS1 PTE7/UART_RTS - * B37 PWM7 PTA8/FTM1_CH0 - * B38 PWM6 PTA9/FTM1_CH1 - * B41 CANRX0 PTE25/CAN1_RX - * B42 CANTX0 PTE24/CAN1_TX - * B44 SPI0_MISO PTA17/SPI0_SIN - * B45 SPI0_MOSI PTA16/SPI0_SOUT - * B46 SPI0_CS0_b PTA14/SPI0_PCS0 - * B48 SPI0_CLK PTA15/SPI0_SCK - * B50 SCL1 PTE1/I2C1_SCL - * B51 SDA1 PTE0/I2C1_SDA - * B52 GPIO5 / SD_CARD_DET PTA16 - */ - -#define PIN_UART3_RTS PIN_UART3_RTS_3 -#define PIN_CAN1_RX PIN_CAN1_RX_2 -#define PIN_CAN1_TX PIN_CAN1_TX_2 -#define PIN_SPI0_SIN PIN_SPI0_SIN_1 -#define PIN_SPI0_SOUT PIN_SPI0_SOUT_1 -#define PIN_SPI0_SCK PIN_SPI0_SCK_1 -#define PIN_SPI0_PCS0 PIN_SPI0_PCS0_1 -#define PIN_I2C1_SCL PIN_I2C1_SCL_2 -#define PIN_I2C1_SDA PIN_I2C1_SDA_2 +#define PIN_SPI0_SCK PIN_SPI0_SCK_2 +#define PIN_SPI0_MISO PIN_SPI0_MISO_4 +#define PIN_SPI0_MOSI PIN_SPI0_MOSI_3 /************************************************************************************ * Public Data diff --git a/nuttx/configs/freedom-kl25z/src/freedom-kl25z.h b/nuttx/configs/freedom-kl25z/src/freedom-kl25z.h index 7638c4558..cc46a884c 100644 --- a/nuttx/configs/freedom-kl25z/src/freedom-kl25z.h +++ b/nuttx/configs/freedom-kl25z/src/freedom-kl25z.h @@ -83,9 +83,11 @@ #define GPIO_LED_G (GPIO_OUTPUT | GPIO_OUTPUT_ONE | PIN_PORTB | PIN19) #define GPIO_LED_B (GPIO_OUTPUT | GPIO_OUTPUT_ONE | PIN_PORTD | PIN1) -/* Button definitions ***************************************************************/ +/* Button definitions *******************************************************************************/ /* The Freedom KL25Z has no buttons */ +/* Chip selects ************************************************************************************/ + /**************************************************************************************************** * Public Types ****************************************************************************************************/ -- cgit v1.2.3