diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/qspi.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/qspi.h
index 710baa7e9f..c1f81f6ad6 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/qspi.h
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/qspi.h
@@ -141,8 +141,8 @@ typedef struct {
 typedef struct {
 	uint32_t      TxDataSize;     /* Tx buffer size */
 	uint32_t      RxDataSize;     /* Rx buffer size */
-	uint32_t      *pDataTx;       /* Tx buffer */
-	uint32_t      *pDataRx;       /* Rx buffer */
+	const void    *pDataTx;       /* Tx buffer */
+	void          *pDataRx;       /* Rx buffer */
 } QspiBuffer_t;
 
 
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/source/qspi.c b/c/src/lib/libbsp/arm/atsam/libraries/libchip/source/qspi.c
index 367789f4d2..fd9de3ae8a 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/source/qspi.c
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/source/qspi.c
@@ -744,7 +744,7 @@ QspidStatus_t QSPI_ReadWriteMem(Qspid_t *pQspid, Access_t const ReadWrite)
 {
 	QspidStatus_t Status = QSPI_UNKNOWN_ERROR;
 	QspiInstFrame_t *const pFrame = pQspid->pQspiFrame;
-	uint32_t *pQspiMem = (uint32_t *)(QSPIMEM_ADDR | pFrame->Addr);
+	void *pQspiMem = (void *)(QSPIMEM_ADDR | pFrame->Addr);
 	QspiBuffer_t    pBuffer     =  pQspid->qspiBuffer;
 
 	assert(((ReadWrite > CmdAccess)