Skip to content

Commit

Permalink
Merge pull request #4869 from toyowata/lpc_spi_fix
Browse files Browse the repository at this point in the history 
HAL LPCs SPI: Fix mask bits for SPI clock rate
  • Loading branch information
@theotherjimmy
theotherjimmy committed Aug 14, 2017
2 parents 9607441 + da7fa0d commit 1c41a9b
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions targets/TARGET_NXP/TARGET_LPC11U6X/spi_api.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) {

int FRF = 0; // FRF (frame format) = SPI
uint32_t tmp = obj->spi->CR0;
tmp &= ~(0xFFFF);
tmp &= ~(0x00FF); // Clear DSS, FRF, CPOL and CPHA [7:0]
tmp |= DSS << 0
| FRF << 4
| SPO << 6
Expand Down Expand Up @@ -146,7 +146,7 @@ void spi_frequency(spi_t *obj, int hz) {
obj->spi->CPSR = prescaler;

// divider
obj->spi->CR0 &= ~(0xFFFF << 8);
obj->spi->CR0 &= ~(0xFF00); // Clear SCR: Serial clock rate [15:8]
obj->spi->CR0 |= (divider - 1) << 8;
ssp_enable(obj);
return;
Expand Down
4 changes: 2 additions & 2 deletions targets/TARGET_NXP/TARGET_LPC11UXX/spi_api.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) {

int FRF = 0; // FRF (frame format) = SPI
uint32_t tmp = obj->spi->CR0;
tmp &= ~(0xFFFF);
tmp &= ~(0x00FF); // Clear DSS, FRF, CPOL and CPHA [7:0]
tmp |= DSS << 0
| FRF << 4
| SPO << 6
Expand Down Expand Up @@ -112,7 +112,7 @@ void spi_frequency(spi_t *obj, int hz) {
obj->spi->CPSR = prescaler;

// divider
obj->spi->CR0 &= ~(0xFFFF << 8);
obj->spi->CR0 &= ~(0xFF00); // Clear SCR: Serial clock rate [15:8]
obj->spi->CR0 |= (divider - 1) << 8;
ssp_enable(obj);
return;
Expand Down
4 changes: 2 additions & 2 deletions targets/TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) {

int FRF = 0; // FRF (frame format) = SPI
uint32_t tmp = obj->spi->CR0;
tmp &= ~(0xFFFF);
tmp &= ~(0x00FF); // Clear DSS, FRF, CPOL and CPHA [7:0]
tmp |= DSS << 0
| FRF << 4
| SPO << 6
Expand Down Expand Up @@ -148,7 +148,7 @@ void spi_frequency(spi_t *obj, int hz) {
obj->spi->CPSR = prescaler;

// divider
obj->spi->CR0 &= ~(0xFFFF << 8);
obj->spi->CR0 &= ~(0xFF00); // Clear SCR: Serial clock rate [15:8]
obj->spi->CR0 |= (divider - 1) << 8;
ssp_enable(obj);
return;
Expand Down
4 changes: 2 additions & 2 deletions targets/TARGET_NXP/TARGET_LPC13XX/spi_api.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) {

int FRF = 0; // FRF (frame format) = SPI
uint32_t tmp = obj->spi->CR0;
tmp &= ~(0xFFFF);
tmp &= ~(0x00FF); // Clear DSS, FRF, CPOL and CPHA [7:0]
tmp |= DSS << 0
| FRF << 4
| SPO << 6
Expand Down Expand Up @@ -140,7 +140,7 @@ void spi_frequency(spi_t *obj, int hz) {
obj->spi->CPSR = prescaler;

// divider
obj->spi->CR0 &= ~(0xFFFF << 8);
obj->spi->CR0 &= ~(0xFF00); // Clear SCR: Serial clock rate [15:8]
obj->spi->CR0 |= (divider - 1) << 8;
ssp_enable(obj);
return;
Expand Down
4 changes: 2 additions & 2 deletions targets/TARGET_NXP/TARGET_LPC176X/spi_api.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) {

int FRF = 0; // FRF (frame format) = SPI
uint32_t tmp = obj->spi->CR0;
tmp &= ~(0xFFFF);
tmp &= ~(0x00FF); // Clear DSS, FRF, CPOL and CPHA [7:0]
tmp |= DSS << 0
| FRF << 4
| SPO << 6
Expand Down Expand Up @@ -146,7 +146,7 @@ void spi_frequency(spi_t *obj, int hz) {
obj->spi->CPSR = prescaler;

// divider
obj->spi->CR0 &= ~(0xFFFF << 8);
obj->spi->CR0 &= ~(0xFF00); // Clear SCR: Serial clock rate [15:8]
obj->spi->CR0 |= (divider - 1) << 8;
ssp_enable(obj);
return;
Expand Down
4 changes: 2 additions & 2 deletions targets/TARGET_NXP/TARGET_LPC408X/TARGET_LPC4088/spi_api.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) {

int FRF = 0; // FRF (frame format) = SPI
uint32_t tmp = obj->spi->CR0;
tmp &= ~(0xFFFF);
tmp &= ~(0x00FF); // Clear DSS, FRF, CPOL and CPHA [7:0]
tmp |= DSS << 0
| FRF << 4
| SPO << 6
Expand Down Expand Up @@ -153,7 +153,7 @@ void spi_frequency(spi_t *obj, int hz) {
obj->spi->CPSR = prescaler;

// divider
obj->spi->CR0 &= ~(0xFFFF << 8);
obj->spi->CR0 &= ~(0xFF00); // Clear SCR: Serial clock rate [15:8]
obj->spi->CR0 |= (divider - 1) << 8;
ssp_enable(obj);
return;
Expand Down
4 changes: 2 additions & 2 deletions targets/TARGET_NXP/TARGET_LPC408X/TARGET_LPC4088_DM/spi_api.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) {

int FRF = 0; // FRF (frame format) = SPI
uint32_t tmp = obj->spi->CR0;
tmp &= ~(0xFFFF);
tmp &= ~(0x00FF); // Clear DSS, FRF, CPOL and CPHA [7:0]
tmp |= DSS << 0
| FRF << 4
| SPO << 6
Expand Down Expand Up @@ -133,7 +133,7 @@ void spi_frequency(spi_t *obj, int hz) {
obj->spi->CPSR = prescaler;

// divider
obj->spi->CR0 &= ~(0xFFFF << 8);
obj->spi->CR0 &= ~(0xFF00); // Clear SCR: Serial clock rate [15:8]
obj->spi->CR0 |= (divider - 1) << 8;
ssp_enable(obj);
return;
Expand Down
4 changes: 2 additions & 2 deletions targets/TARGET_NXP/TARGET_LPC43XX/spi_api.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) {

int FRF = 0; // FRF (frame format) = SPI
uint32_t tmp = obj->spi->CR0;
tmp &= ~(0xFFFF);
tmp &= ~(0x00FF); // Clear DSS, FRF, CPOL and CPHA [7:0]
tmp |= DSS << 0
| FRF << 4
| SPO << 6
Expand Down Expand Up @@ -152,7 +152,7 @@ void spi_frequency(spi_t *obj, int hz) {
obj->spi->CPSR = prescaler;

// divider
obj->spi->CR0 &= ~(0xFFFF << 8);
obj->spi->CR0 &= ~(0xFF00); // Clear SCR: Serial clock rate [15:8]
obj->spi->CR0 |= (divider - 1) << 8;
ssp_enable(obj);
return;
Expand Down

0 comments on commit 1c41a9b

Please sign in to comment.