[sam] Fix SPI bug in handling of CPHA/CPOL

modm-io · Feb 7, 2022 · ac46099 · ac46099
1 parent 3f3ff3d
commit ac46099
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/modm/platform/spi/sam/spi_master.hpp.in b/src/modm/platform/spi/sam/spi_master.hpp.in
@@ -105,8 +105,10 @@ public:
 
 	static void
 	setDataMode(DataMode mode) {
-		uint32_t value = (uint32_t)mode ^ 2; // Flip CPHA bit
-		Regs()->SPI_CSR[0] = (Regs()->SPI_CSR[0] & ~(SPI_CSR_CPOL | SPI_CSR_NCPHA)) | (value << SPI_CSR_CPOL_Pos);
+		uint32_t value = (uint32_t)mode ^ 1; // Flip CPHA bit
+		Regs()->SPI_CSR[0] = (Regs()->SPI_CSR[0] & ~(SPI_CSR_CPOL | SPI_CSR_NCPHA)) |
+			(((value & 2) >> 1) << SPI_CSR_CPOL_Pos) |
+			((value & 1) << SPI_CSR_NCPHA_Pos);
 	}
 
 	static void