drivers/memory/spiflash: Add support for QSPI interface.
The spiflash memory driver is reworked to allow the underlying bus to be
either normal SPI or QSPI. In both cases the bus can be implemented in
software or hardware, as long as the spiflash driver is passed the correct
configuration structure.
diff --git a/drivers/memory/spiflash.h b/drivers/memory/spiflash.h
index cd96b16..79ba549 100644
--- a/drivers/memory/spiflash.h
+++ b/drivers/memory/spiflash.h
@@ -3,7 +3,7 @@
*
* The MIT License (MIT)
*
- * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2016-2018 Damien P. George
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -26,14 +26,36 @@
#ifndef MICROPY_INCLUDED_DRIVERS_MEMORY_SPIFLASH_H
#define MICROPY_INCLUDED_DRIVERS_MEMORY_SPIFLASH_H
+#include "drivers/bus/qspi.h"
#include "extmod/machine_spi.h"
+enum {
+ MP_SPIFLASH_BUS_SPI,
+ MP_SPIFLASH_BUS_QSPI,
+};
+
+typedef struct _mp_spiflash_config_t {
+ uint32_t bus_kind;
+ union {
+ struct {
+ mp_hal_pin_obj_t cs;
+ void *data;
+ const mp_machine_spi_p_t *proto;
+ } u_spi;
+ struct {
+ void *data;
+ const mp_qspi_proto_t *proto;
+ } u_qspi;
+ } bus;
+} mp_spiflash_config_t;
+
typedef struct _mp_spiflash_t {
- mp_hal_pin_obj_t cs;
- mp_obj_base_t *spi; // object must have protocol pointing to mp_machine_spi_p_t struct
+ const mp_spiflash_config_t *config;
+ volatile uint32_t flags;
} mp_spiflash_t;
void mp_spiflash_init(mp_spiflash_t *self);
+void mp_spiflash_flush(mp_spiflash_t *self);
void mp_spiflash_read(mp_spiflash_t *self, uint32_t addr, size_t len, uint8_t *dest);
int mp_spiflash_write(mp_spiflash_t *self, uint32_t addr, size_t len, const uint8_t *src);