ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7979 from yossi2le/fix_spif_sd_config 

Using SPI_ macros from PinNames in SPIF and SD config files.
pull/8554/head
Martin Kojtal 2018-10-26 09:35:29 +01:00 committed by GitHub
parent de6ba91644 d9a84c42cf
commit 93a17c1d65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/storage/blockdevice/COMPONENT_DATAFLASH/mbed_lib.json
View File

@ -1,10 +1,10 @@
{
"name": "dataflash",
"config": {
"SPI_MOSI": "NC",
"SPI_MISO": "NC",
"SPI_CLK": "NC",
"SPI_CS": "NC",
"SPI_MOSI": "SPI_MOSI",
"SPI_MISO": "SPI_MISO",
"SPI_CLK": "SPI_SCK",
"SPI_CS": "SPI_CS",
"SPI_FREQ": "40000000",
"binary-size": {
"help": "Configure device to use binary address space.",

16
components/storage/blockdevice/COMPONENT_SD/config/mbed_lib.json
View File

@ -1,11 +1,10 @@
{
"name": "sd",
"config": {
"SPI_CS": "NC",
"SPI_MOSI": "NC",
"SPI_MISO": "NC",
"SPI_CLK": "NC",
"DEVICE_SPI": 1,
"SPI_CS": "SPI_CS",
"SPI_MOSI": "SPI_MOSI",
"SPI_MISO": "SPI_MISO",
"SPI_CLK": "SPI_SCK",
"FSFAT_SDCARD_INSTALLED": 1,
"CMD_TIMEOUT": 10000,
"CMD0_IDLE_STATE_RETRIES": 5,
@ -60,12 +59,6 @@
"SPI_CLK": "PTD5",
"SPI_CS": "PTD4"
},
"K64F": {
"SPI_MOSI": "PTE3",
"SPI_MISO": "PTE1",
"SPI_CLK": "PTE2",
"SPI_CS": "PTE4"
},
"K66F": {
"SPI_MOSI": "PTE3",
"SPI_MISO": "PTE1",
@ -216,5 +209,6 @@
"SPI_CLK": "PC_10",
"SPI_CS": "PA_15"
}
}
}

14
components/storage/blockdevice/COMPONENT_SPIF/mbed_lib.json
View File

@ -1,19 +1,13 @@
{
"name": "spif-driver",
"config": {
"SPI_MOSI": "NC",
"SPI_MISO": "NC",
"SPI_CLK": "NC",
"SPI_CS": "NC",
"SPI_MOSI": "SPI_MOSI",
"SPI_MISO": "SPI_MISO",
"SPI_CLK": "SPI_SCK",
"SPI_CS": "SPI_CS",
"SPI_FREQ": "40000000"
},
"target_overrides": {
"K82F": {
"SPI_MOSI": "PTE2",
"SPI_MISO": "PTE4",
"SPI_CLK": "PTE1",
"SPI_CS": "PTE5"
},
"LPC54114": {
"SPI_MOSI": "P0_20",
"SPI_MISO": "P0_18",

2
targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/TARGET_FRDM/PinNames.h
View File

@ -176,7 +176,7 @@ typedef enum {
SPI_MOSI = PTE2,
SPI_MISO = PTE4,
SPI_SCK = PTE1,
SPI_PERSISTENT_MEM_CS = PTE5,
SPI_CS = PTE5,
/**** QSPI FLASH pins ****/
QSPI_FLASH1_IO0 = PTE2,

2
targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_FRDM/PinNames.h
View File

@ -246,7 +246,7 @@ typedef enum {
SPI_MOSI = PTE3,
SPI_MISO = PTE1,
SPI_SCK = PTE2,
SPI_PERSISTENT_MEM_CS = PTE4,
SPI_CS = PTE4,
// Not connected
NC = (int)0xFFFFFFFF

2
targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_HEXIWEAR/PinNames.h
View File

@ -218,7 +218,7 @@ typedef enum {
SPI_MOSI = PTE3,
SPI_MISO = PTE1,
SPI_SCK = PTE2,
SPI_PERSISTENT_MEM_CS = PTE4,
SPI_CS = PTE4,
// Not connected
NC = (int)0xFFFFFFFF

2
targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_RAPIDIOT/PinNames.h
View File

@ -227,7 +227,7 @@ typedef enum {
SPI_MOSI = PTC6,
SPI_MISO = PTC7,
SPI_SCK = PTC5,
SPI_PERSISTENT_MEM_CS = PTC4,
SPI_CS = PTC4,
DAC0_OUT = 0xFEFE, /* DAC does not have Pin Name in RM */
// Not connected