From b05a5a6f3d676eb1e328db53894d829505cf3adf Mon Sep 17 00:00:00 2001 From: zhuangwei123 Date: Sat, 9 Jun 2018 21:09:33 +0800 Subject: [PATCH] =?UTF-8?q?[bsp/ls1cdev]SPI0=E6=B7=BB=E5=8A=A0CS0=E6=94=AF?= =?UTF-8?q?=E6=8C=81=EF=BC=8C=E7=A7=BB=E9=99=A4drv=5Fspi.c=E4=B8=AD?= =?UTF-8?q?=E7=9A=84msd=5Finit=E3=80=82SPI00=E5=8F=AF=E7=94=A8=E4=BA=8E?= =?UTF-8?q?=E6=B3=A8=E5=86=8CNORFLASH=E9=A9=B1=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/ls1cdev/drivers/drv_spi.c | 21 ++++++++++++++------- bsp/ls1cdev/libraries/ls1c_spi.c | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/bsp/ls1cdev/drivers/drv_spi.c b/bsp/ls1cdev/drivers/drv_spi.c index 900f7e4aa..4e7012dc7 100644 --- a/bsp/ls1cdev/drivers/drv_spi.c +++ b/bsp/ls1cdev/drivers/drv_spi.c @@ -20,6 +20,7 @@ * Change Logs: * Date Author Notes * 2017-11-02 Ϊ first version + * 2018-06-09 zhuangwei add spi0 cs0 support,remove msd_init */ #include @@ -235,13 +236,15 @@ int ls1c_hw_spi_init(void) pin_set_purpose(79, PIN_PURPOSE_OTHER); pin_set_purpose(80, PIN_PURPOSE_OTHER); pin_set_purpose(83, PIN_PURPOSE_OTHER);//cs2 - SD card - pin_set_purpose(82, PIN_PURPOSE_OTHER);//cs1 + pin_set_purpose(82, PIN_PURPOSE_OTHER);//cs1 + pin_set_purpose(81, PIN_PURPOSE_OTHER);//cs0 - pin_set_remap(78, PIN_REMAP_FOURTH); - pin_set_remap(79, PIN_REMAP_FOURTH); - pin_set_remap(80, PIN_REMAP_FOURTH); - pin_set_remap(83, PIN_REMAP_FOURTH);//cs2 - SD card - pin_set_remap(82, PIN_REMAP_FOURTH);//cs1 + pin_set_remap(78, PIN_REMAP_DEFAULT); + pin_set_remap(79, PIN_REMAP_DEFAULT); + pin_set_remap(80, PIN_REMAP_DEFAULT); + pin_set_remap(83, PIN_REMAP_DEFAULT);//cs2 - SD card + pin_set_remap(82, PIN_REMAP_DEFAULT);//CS1 + pin_set_remap(81, PIN_REMAP_DEFAULT);//cs0 ls1c_spi_bus_register(LS1C_SPI_0,"spi0"); #endif @@ -262,8 +265,10 @@ int ls1c_hw_spi_init(void) #ifdef RT_USING_SPI0 /* attach cs */ { + static struct rt_spi_device spi_device0; static struct rt_spi_device spi_device1; static struct rt_spi_device spi_device2; + static struct ls1c_spi_cs spi_cs0; static struct ls1c_spi_cs spi_cs1; static struct ls1c_spi_cs spi_cs2; @@ -272,7 +277,8 @@ int ls1c_hw_spi_init(void) rt_spi_bus_attach_device(&spi_device2, "spi02", "spi0", (void*)&spi_cs2); spi_cs1.cs = LS1C_SPI_CS_1; rt_spi_bus_attach_device(&spi_device1, "spi01", "spi0", (void*)&spi_cs1); - msd_init("sd0", "spi02"); + spi_cs0.cs = LS1C_SPI_CS_0; + rt_spi_bus_attach_device(&spi_device0, "spi00", "spi0", (void*)&spi_cs0); } #endif #ifdef RT_USING_SPI1 @@ -287,6 +293,7 @@ int ls1c_hw_spi_init(void) #endif } + INIT_BOARD_EXPORT(ls1c_hw_spi_init); #endif diff --git a/bsp/ls1cdev/libraries/ls1c_spi.c b/bsp/ls1cdev/libraries/ls1c_spi.c index e3df72906..eff1deb74 100644 --- a/bsp/ls1cdev/libraries/ls1c_spi.c +++ b/bsp/ls1cdev/libraries/ls1c_spi.c @@ -260,7 +260,7 @@ inline void ls1c_spi_clear(void *spi_base) val = reg_read_8(spi_base + LS1C_SPI_SPSR_OFFSET); if (LS1C_SPI_SPSR_WCOL_MASK & val) { - rt_kprintf("[%s] clear register SPSR's wcol!\r\n"); // 手册和linux源码中不一样，加个打印看看 + rt_kprintf("[%s] clear register SPSR's wcol!\r\n",__FUNCTION__); // 手册和linux源码中不一样，加个打印看看 reg_write_8(val & ~LS1C_SPI_SPSR_WCOL_MASK, spi_base + LS1C_SPI_SPSR_OFFSET); // 写0，linux源码中是写0 // reg_write_8(val | LS1C_SPI_SPSR_WCOL_MASK, spi_base + LS1C_SPI_SPSR_OFFSET); // 写1，按照1c手册，应该写1 } -- GitLab