Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Mozi
rt-thread
提交
98900342
R
rt-thread
项目概览
Mozi
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
98900342
编写于
12月 12, 2018
作者:
H
Hao Zhu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[bsp][stm32][stm32f767] 移植qspi
上级
819c7d89
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
117 addition
and
16 deletion
+117
-16
bsp/stm32/libraries/HAL_Drivers/config/f7/spi_config.h
bsp/stm32/libraries/HAL_Drivers/config/f7/spi_config.h
+2
-2
bsp/stm32/libraries/HAL_Drivers/drv_adc.c
bsp/stm32/libraries/HAL_Drivers/drv_adc.c
+7
-6
bsp/stm32/libraries/HAL_Drivers/drv_qspi.c
bsp/stm32/libraries/HAL_Drivers/drv_qspi.c
+19
-5
bsp/stm32/libraries/HAL_Drivers/drv_spi.c
bsp/stm32/libraries/HAL_Drivers/drv_spi.c
+1
-0
bsp/stm32/stm32f767-fire-challenger/board/Kconfig
bsp/stm32/stm32f767-fire-challenger/board/Kconfig
+8
-1
bsp/stm32/stm32f767-fire-challenger/board/SConscript
bsp/stm32/stm32f767-fire-challenger/board/SConscript
+2
-2
bsp/stm32/stm32f767-fire-challenger/board/ports/drv_qspi_flash.c
...32/stm32f767-fire-challenger/board/ports/drv_qspi_flash.c
+77
-0
bsp/stm32/stm32f767-fire-challenger/rtconfig.h
bsp/stm32/stm32f767-fire-challenger/rtconfig.h
+1
-0
未找到文件。
bsp/stm32/libraries/HAL_Drivers/config/f7/spi_config.h
浏览文件 @
98900342
...
...
@@ -37,8 +37,8 @@
{ \
.Instance = SPI2, \
.bus_name = "spi2", \
.dma_rx.dma_rcc = RCC_AHB1ENR_DMA1EN, \
.dma_tx.dma_rcc = RCC_AHB1ENR_DMA1EN, \
.dma_rx.dma_rcc = RCC_AHB1ENR_DMA1EN,
\
.dma_tx.dma_rcc = RCC_AHB1ENR_DMA1EN,
\
.dma_rx.Instance = DMA1_Stream3, \
.dma_rx.channel = DMA_CHANNEL_0, \
.dma_rx.dma_irq = DMA1_Stream3_IRQn, \
...
...
bsp/stm32/libraries/HAL_Drivers/drv_adc.c
浏览文件 @
98900342
...
...
@@ -6,11 +6,12 @@
* Change Logs:
* Date Author Notes
* 2018-12-05 zylx first version
* 2018-12-12 greedyhao Porting for stm32f7xx
*/
#include <board.h>
#if defined(BSP_USING_ADC1) || defined(BSP_USING_ADC2) || defined(BSP_USING_ADC3)
//
#if defined(BSP_USING_ADC1) || defined(BSP_USING_ADC2) || defined(BSP_USING_ADC3)
#include "drv_config.h"
//#define DRV_DEBUG
...
...
@@ -126,7 +127,7 @@ static rt_uint32_t stm32_adc_get_channel(rt_uint32_t channel)
case
17
:
stm32_channel
=
ADC_CHANNEL_17
;
break
;
#if defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32L4)
#if defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32
F7) || defined(SOC_SERIES_STM32
L4)
case
18
:
stm32_channel
=
ADC_CHANNEL_18
;
break
;
...
...
@@ -148,7 +149,7 @@ static rt_err_t stm32_get_adc_value(struct rt_adc_device *device, rt_uint32_t ch
#if defined(SOC_SERIES_STM32F1)
if
(
channel
<=
17
)
#elif defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32L4)
#elif defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32
F7) || defined(SOC_SERIES_STM32
L4)
if
(
channel
<=
18
)
#endif
{
...
...
@@ -159,7 +160,7 @@ static rt_err_t stm32_get_adc_value(struct rt_adc_device *device, rt_uint32_t ch
{
#if defined(SOC_SERIES_STM32F1)
LOG_E
(
"ADC channel must be between 0 and 17."
);
#elif defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32L4)
#elif defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32
F7) || defined(SOC_SERIES_STM32
L4)
LOG_E
(
"ADC channel must be between 0 and 18."
);
#endif
return
-
RT_ERROR
;
...
...
@@ -167,12 +168,12 @@ static rt_err_t stm32_get_adc_value(struct rt_adc_device *device, rt_uint32_t ch
ADC_ChanConf
.
Rank
=
1
;
#if defined(SOC_SERIES_STM32F1)
ADC_ChanConf
.
SamplingTime
=
ADC_SAMPLETIME_55CYCLES_5
;
#elif defined(SOC_SERIES_STM32F4)
#elif defined(SOC_SERIES_STM32F4)
|| defined(SOC_SERIES_STM32F7)
ADC_ChanConf
.
SamplingTime
=
ADC_SAMPLETIME_112CYCLES
;
#elif defined(SOC_SERIES_STM32L4)
ADC_ChanConf
.
SamplingTime
=
ADC_SAMPLETIME_247CYCLES_5
;
#endif
#if defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32L4)
#if defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32
F7) || defined(SOC_SERIES_STM32
L4)
ADC_ChanConf
.
Offset
=
0
;
#endif
#ifdef SOC_SERIES_STM32L4
...
...
bsp/stm32/libraries/HAL_Drivers/drv_qspi.c
浏览文件 @
98900342
...
...
@@ -6,6 +6,7 @@
* Change Logs:
* Date Author Notes
* 2018-11-27 zylx change to new framework
* 2018-12-12 greedyhao Porting for stm32f7xx
*/
#include "board.h"
...
...
@@ -20,6 +21,14 @@
#if defined(BSP_USING_QSPI)
#if defined (SOC_SERIES_STM32L4)
#define QUADSPI_DMA_IRQ DMA1_Channel5_IRQn
#define QUADSPI_DMA_IRQHandler DMA1_Channel5_IRQHandler
#elif defined (SOC_SERIES_STM32F7)
#define QUADSPI_DMA_IRQ DMA2_Stream2_IRQn
#define QUADSPI_DMA_IRQHandler DMA2_Stream2_IRQHandler
#endif
/* SOC_SERIES_STM32L4 */
struct
stm32_hw_spi_cs
{
uint16_t
Pin
;
...
...
@@ -97,14 +106,19 @@ static int stm32_qspi_init(struct rt_qspi_device *device, struct rt_qspi_configu
/* QSPI interrupts must be enabled when using the HAL_QSPI_Receive_DMA */
HAL_NVIC_SetPriority
(
QUADSPI_IRQn
,
0
,
0
);
HAL_NVIC_EnableIRQ
(
QUADSPI_IRQn
);
HAL_NVIC_SetPriority
(
DMA1_Channel5_IRQn
,
0
,
0
);
HAL_NVIC_EnableIRQ
(
DMA1_Channel5_IRQn
);
HAL_NVIC_SetPriority
(
QUADSPI_DMA_IRQ
,
0
,
0
);
HAL_NVIC_EnableIRQ
(
QUADSPI_DMA_IRQ
);
/* init QSPI DMA */
__HAL_RCC_DMA1_CLK_ENABLE
();
/* init QSPI DMA */
__HAL_RCC_DMA1_CLK_ENABLE
();
HAL_DMA_DeInit
(
qspi_bus
->
QSPI_Handler
.
hdma
);
#if defined(SOC_SERIES_STM32F4)
qspi_bus
->
hdma_quadspi
.
Instance
=
DMA1_Channel5
;
qspi_bus
->
hdma_quadspi
.
Init
.
Request
=
DMA_REQUEST_5
;
#elif defined(SOC_SERIES_STM32F7)
qspi_bus
->
hdma_quadspi
.
Instance
=
DMA2_Stream2
;
qspi_bus
->
hdma_quadspi
.
Init
.
channel
=
DMA_CHANNEL_11
;
#endif
qspi_bus
->
hdma_quadspi
.
Init
.
Direction
=
DMA_PERIPH_TO_MEMORY
;
qspi_bus
->
hdma_quadspi
.
Init
.
PeriphInc
=
DMA_PINC_DISABLE
;
qspi_bus
->
hdma_quadspi
.
Init
.
MemInc
=
DMA_MINC_ENABLE
;
...
...
@@ -377,7 +391,7 @@ void QUADSPI_IRQHandler(void)
rt_interrupt_leave
();
}
void
DMA1_Channel5
_IRQHandler
(
void
)
void
QUADSPI_DMA
_IRQHandler
(
void
)
{
/* enter interrupt */
rt_interrupt_enter
();
...
...
bsp/stm32/libraries/HAL_Drivers/drv_spi.c
浏览文件 @
98900342
...
...
@@ -6,6 +6,7 @@
* Change Logs:
* Date Author Notes
* 2018-11-5 SummerGift change to new framework
* 2018-12-11 greedyhao Porting for stm32f7xx
*/
#include "board.h"
...
...
bsp/stm32/stm32f767-fire-challenger/board/Kconfig
浏览文件 @
98900342
...
...
@@ -20,7 +20,14 @@ menu "Onboard Peripheral Drivers"
config BSP_USING_SDRAM
bool "Enable SDRAM"
default n
config BSP_USING_QSPI_FLASH
bool "Enable QSPI FLASH (W25Q128 spi5)"
select BSP_USING_SPI5
select RT_USING_SFUD
select RT_SFUD_USING_SFDP
default n
endmenu
menu "On-chip Peripheral Drivers"
...
...
bsp/stm32/stm32f767-fire-challenger/board/SConscript
浏览文件 @
98900342
...
...
@@ -10,8 +10,8 @@ src += Glob('CubeMX_Config/Src/stm32f7xx_hal_msp.c')
if
GetDepend
([
'BSP_USING_ETH'
]):
src
+=
Glob
(
'ports/phy_reset.c'
)
if
GetDepend
([
'BSP_USING_SPI_FLASH'
]):
src
+=
Glob
(
'ports/spi_flash_init.c'
)
if
GetDepend
([
'BSP_USING_
Q
SPI_FLASH'
]):
src
+=
Glob
(
'ports/
q
spi_flash_init.c'
)
path
=
[
cwd
]
path
+=
[
cwd
+
'/CubeMX_Config/Inc'
]
...
...
bsp/stm32/stm32f767-fire-challenger/board/ports/drv_qspi_flash.c
0 → 100644
浏览文件 @
98900342
/*
* Copyright (c) 2006-2018, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
* 2018-11-27 zylx change to new framework
*/
#include <board.h>
#include <drv_qspi.h>
#include <rtdevice.h>
#include <rthw.h>
#include <finsh.h>
#ifdef BSP_USING_QSPI_FLASH
#include "spi_flash.h"
#include "spi_flash_sfud.h"
char
w25qxx_read_status_register2
(
struct
rt_qspi_device
*
device
)
{
/* 0x35 read status register2 */
char
instruction
=
0x35
,
status
;
rt_qspi_send_then_recv
(
device
,
&
instruction
,
1
,
&
status
,
1
);
return
status
;
}
void
w25qxx_write_enable
(
struct
rt_qspi_device
*
device
)
{
/* 0x06 write enable */
char
instruction
=
0x06
;
rt_qspi_send
(
device
,
&
instruction
,
1
);
}
void
w25qxx_enter_qspi_mode
(
struct
rt_qspi_device
*
device
)
{
char
status
=
0
;
/* 0x38 enter qspi mode */
char
instruction
=
0x38
;
char
write_status2_buf
[
2
]
=
{
0
};
/* 0x31 write status register2 */
write_status2_buf
[
0
]
=
0x31
;
status
=
w25qxx_read_status_register2
(
device
);
if
(
!
(
status
&
0x02
))
{
status
|=
1
<<
1
;
w25qxx_write_enable
(
device
);
write_status2_buf
[
1
]
=
status
;
rt_qspi_send
(
device
,
&
write_status2_buf
,
2
);
rt_qspi_send
(
device
,
&
instruction
,
1
);
rt_kprintf
(
"flash already enter qspi mode
\n
"
);
rt_thread_mdelay
(
10
);
}
}
static
int
rt_hw_qspi_flash_with_sfud_init
(
void
)
{
stm32_qspi_bus_attach_device
(
"qspi1"
,
"qspi10"
,
RT_NULL
,
4
,
w25qxx_enter_qspi_mode
,
RT_NULL
);
/* init w25q128 */
if
(
RT_NULL
==
rt_sfud_flash_probe
(
"w25q128"
,
"qspi10"
))
{
return
-
RT_ERROR
;
}
return
RT_EOK
;
}
INIT_COMPONENT_EXPORT
(
rt_hw_qspi_flash_with_sfud_init
);
#endif
/* BSP_USING_QSPI_FLASH */
bsp/stm32/stm32f767-fire-challenger/rtconfig.h
浏览文件 @
98900342
...
...
@@ -78,6 +78,7 @@
#define RT_USING_DEVICE_IPC
#define RT_PIPE_BUFSZ 512
#define RT_USING_SERIAL
#define RT_SERIAL_USING_DMA
#define RT_USING_PIN
/* Using WiFi */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录