Merge pull request #5567 from mysterywolf/nxp

#5564 format codes

Author: Guozhanxin

bsp/imxrt/libraries/drivers/drv_can.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -375,7 +375,7 @@ static int can_send(struct rt_can_device *can_dev, const void *buf, rt_uint32_t
         ret = RT_EBUSY;
         break;
     }
-    
+
     return ret;
 }
 

bsp/imxrt/libraries/drivers/drv_can.h

@@ -1,13 +1,13 @@
 /*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
  * Change Logs:
  * Date           Author       Notes
  * 2019-06-28     misonyo     the first version.
  */
- 
+
 #ifndef DRV_CAN_H__
 #define DRV_CAN_H__
 

bsp/imxrt/libraries/drivers/drv_eth.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2019, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -329,7 +329,7 @@ static status_t _ENET_SendFrame(ENET_Type *base, enet_handle_t *handle, const ui
 #endif /* FSL_FEATURE_MEMORY_HAS_ADDRESS_OFFSET */
 
         pbuf_copy_partial((const struct pbuf *)data, (void *)address, length, 0);
-            
+
         /* Set data length. */
         curBuffDescrip->length = length;
 #ifdef ENET_ENHANCEDBUFFERDESCRIPTOR_MODE
@@ -434,7 +434,7 @@ static status_t _ENET_SendFrame(ENET_Type *base, enet_handle_t *handle, const ui
                 address = (uint32_t)curBuffDescrip->buffer;
 #endif /* FSL_FEATURE_MEMORY_HAS_ADDRESS_OFFSET */
                 DCACHE_CleanByRange(address, handle->txBuffSizeAlign[0]);
-#endif  /* FSL_SDK_ENABLE_DRIVER_CACHE_CONTROL */                 
+#endif  /* FSL_SDK_ENABLE_DRIVER_CACHE_CONTROL */
                 /* Active the transmit buffer descriptor. */
                 _ENET_ActiveSend(base, 0);
 
@@ -454,8 +454,8 @@ static status_t _ENET_SendFrame(ENET_Type *base, enet_handle_t *handle, const ui
 /* transmit packet. */
 rt_err_t rt_imxrt_eth_tx(rt_device_t dev, struct pbuf *p)
 {
-	rt_err_t result = RT_EOK;
-	enet_handle_t * enet_handle = &imxrt_eth_device.enet_handle;
+    rt_err_t result = RT_EOK;
+    enet_handle_t * enet_handle = &imxrt_eth_device.enet_handle;
 
     RT_ASSERT(p != NULL);
     RT_ASSERT(enet_handle != RT_NULL);

bsp/imxrt/libraries/drivers/drv_gpio.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -70,7 +70,7 @@ const struct pin_mask mask_tab[5] =
 #endif
 };
 
-const rt_int8_t reg_offset[] = 
+const rt_int8_t reg_offset[] =
 {
 #if defined(SOC_IMXRT1015_SERIES)
     38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 64, 65, 66, 67, 68, 69,

bsp/imxrt/libraries/drivers/drv_gpio.h

@@ -1,18 +1,18 @@
 /*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
  * Change Logs:
  * Date           Author       Notes
  * 2018-4-30     misonyo     the first version.
  */
- 
+
 #ifndef DRV_GPIO_H__
 #define DRV_GPIO_H__
 
-#include <rtthread.h> 
-#include <rtdevice.h> 
+#include <rtthread.h>
+#include <rtdevice.h>
 
 #define GET_PIN(PORTx, PIN)      (32 * (PORTx - 1) + (PIN & 31))    /* PORTx:1,2,3,4,5 */
 

bsp/imxrt/libraries/drivers/drv_i2c.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -18,7 +18,7 @@
 #define LOG_TAG              "drv.i2c"
 #include <drv_log.h>
 
-#if !defined(BSP_USING_I2C1) && !defined(BSP_USING_I2C2) && !defined(BSP_USING_I2C3) && !defined(BSP_USING_I2C4)
+#if !defined(BSP_USING_I2C1) && !defined(BSP_USING_I2C2) && !defined(BSP_USING_I2C3) && !defined(BSP_USING_I2C4) && !defined(BSP_USING_I2C5)&& !defined(BSP_USING_I2C6)
 #error "Please define at least one BSP_USING_I2Cx"
 #endif
 
@@ -35,6 +35,9 @@ struct imxrt_i2c_bus
     volatile rt_uint32_t msg_ptr;
     volatile rt_uint32_t dptr;
     char *device_name;
+#ifdef SOC_IMXRT1170_SERIES
+    clock_root_t clock_root;
+#endif
 };
 
 #if defined (BSP_USING_I2C1)
@@ -55,13 +58,28 @@ struct imxrt_i2c_bus
 #define I2C4BUS_NAME  "i2c4"
 #endif /*BSP_USING_I2C4*/
 
+#if defined (BSP_USING_I2C5)
+#define I2C5BUS_NAME "i2c5"
+#endif /*BSP_USING_I2C5*/
+
+#if defined (BSP_USING_I2C6)
+#define I2C6BUS_NAME  "i2c6"
+#endif /*BSP_USING_I2C6*/
+
 #endif /* MIMXRT1015_SERIES */
 
-#define LPI2C_CLOCK_SOURCE_DIVIDER 4
+/* Select USB1 PLL (360 MHz) as master lpi2c clock source */
+#define LPI2C_CLOCK_SOURCE_SELECT (1U)
+#ifdef SOC_IMXRT1170_SERIES
+/* Clock divider for master lpi2c clock source */
+#define LPI2C_CLOCK_SOURCE_DIVIDER (12U)
+#else
+#define LPI2C_CLOCK_SOURCE_DIVIDER (0U)
 
 /* Get frequency of lpi2c clock */
-#define LPI2C_CLOCK_FREQUENCY ((CLOCK_GetFreq(kCLOCK_Usb1PllClk) / 8) / (LPI2C_CLOCK_SOURCE_DIVIDER))
+#define LPI2C_CLOCK_FREQUENCY ((CLOCK_GetFreq(kCLOCK_Usb1PllClk) / 8) / (LPI2C_CLOCK_SOURCE_DIVIDER + 1U))
 
+#endif
 #ifdef BSP_USING_I2C1
 static struct imxrt_i2c_bus lpi2c1 =
 {
@@ -96,9 +114,25 @@ static struct imxrt_i2c_bus lpi2c4 =
 };
 #endif /* RT_USING_HW_I2C4 */
 
+#ifdef BSP_USING_I2C5
+static struct imxrt_i2c_bus lpi2c5 =
+{
+    .I2C = LPI2C5,
+    .device_name = I2C5BUS_NAME,
+};
+#endif /* RT_USING_HW_I2C5 */
+
+#ifdef BSP_USING_I2C6
+static struct imxrt_i2c_bus lpi2c6 =
+{
+    .I2C = LPI2C6,
+    .device_name = I2C6BUS_NAME,
+};
+#endif /* RT_USING_HW_I2C6 */
+
 #endif /* MIMXRT1015_SERIES */
 
-#if (defined(BSP_USING_I2C1) || defined(BSP_USING_I2C2) || defined(BSP_USING_I2C3) || defined(BSP_USING_I2C4))
+#if (defined(BSP_USING_I2C1) || defined(BSP_USING_I2C2) || defined(BSP_USING_I2C3) || defined(BSP_USING_I2C4) ||defined(BSP_USING_I2C5) || defined(BSP_USING_I2C6))
 
 static rt_size_t imxrt_i2c_mst_xfer(struct rt_i2c_bus_device *bus,
                                     struct rt_i2c_msg msgs[],
@@ -123,7 +157,19 @@ static rt_err_t imxrt_lpi2c_configure(struct imxrt_i2c_bus *bus, lpi2c_master_co
     RT_ASSERT(cfg != RT_NULL);
 
     bus->parent.ops = &imxrt_i2c_ops;
+#ifdef SOC_IMXRT1170_SERIES
+    clock_root_config_t rootCfg = {0};
+    rootCfg.mux = LPI2C_CLOCK_SOURCE_SELECT;
+    rootCfg.div = LPI2C_CLOCK_SOURCE_DIVIDER + 1;
+    CLOCK_SetRootClock(bus->clock_root, &rootCfg);
+    volatile uint32_t freq = CLOCK_GetRootClockFreq(bus->clock_root);
+    LPI2C_MasterInit(bus->I2C, cfg, freq);
+#else
+    CLOCK_SetMux(kCLOCK_Lpi2cMux, LPI2C_CLOCK_SOURCE_SELECT);
+    CLOCK_SetDiv(kCLOCK_Lpi2cDiv, LPI2C_CLOCK_SOURCE_DIVIDER);
     LPI2C_MasterInit(bus->I2C, cfg, LPI2C_CLOCK_FREQUENCY);
+#endif
+
     return RT_EOK;
 }
 
@@ -221,6 +267,37 @@ static rt_size_t imxrt_i2c_mst_xfer(struct rt_i2c_bus_device *bus,
     {
         if (imxrt_i2c->msg[i].flags & RT_I2C_RD)
         {
+            if ((imxrt_i2c->msg[i].flags & RT_I2C_NO_START) != RT_I2C_NO_START)
+            {
+                if (LPI2C_MasterStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr, kLPI2C_Write) != kStatus_Success)
+                {
+                    i = 0;
+                    break;
+                }
+
+                while (LPI2C_MasterGetStatusFlags(imxrt_i2c->I2C) & kLPI2C_MasterNackDetectFlag)
+                {
+                }
+
+                if (LPI2C_MasterRepeatedStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr, kLPI2C_Read) != kStatus_Success)
+                {
+                    i = 0;
+                    break;
+                }
+            }
+            else
+            {
+                if (LPI2C_MasterStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr, kLPI2C_Read) != kStatus_Success)
+                {
+                    i = 0;
+                    break;
+                }
+
+                while (LPI2C_MasterGetStatusFlags(imxrt_i2c->I2C) & kLPI2C_MasterNackDetectFlag)
+                {
+                }
+            }
+
             if (LPI2C_MasterStart(imxrt_i2c->I2C, imxrt_i2c->msg[i].addr, kLPI2C_Read) != kStatus_Success)
             {
                 i = 0;
@@ -245,8 +322,16 @@ static rt_size_t imxrt_i2c_mst_xfer(struct rt_i2c_bus_device *bus,
                 break;
             }
 
-            while (LPI2C_MasterGetStatusFlags(imxrt_i2c->I2C) & kLPI2C_MasterNackDetectFlag)
+            if(LPI2C_MasterWaitForTxFifoAllEmpty(imxrt_i2c->I2C) != kStatus_Success)
             {
+                i = 0;
+                break;
+            }
+
+            if (LPI2C_MasterGetStatusFlags(imxrt_i2c->I2C) & kLPI2C_MasterNackDetectFlag)
+            {
+                i = 0;
+                break;
             }
 
             if (LPI2C_MasterSend(imxrt_i2c->I2C, imxrt_i2c->msg[i].buf, imxrt_i2c->msg[i].len) != kStatus_Success)
@@ -261,11 +346,12 @@ static rt_size_t imxrt_i2c_mst_xfer(struct rt_i2c_bus_device *bus,
                 break;
             }
         }
-    }
 
-    if (LPI2C_MasterStop(imxrt_i2c->I2C) != kStatus_Success)
-    {
-        i = 0;
+        if (LPI2C_MasterStop(imxrt_i2c->I2C) != kStatus_Success)
+        {
+            i = 0;
+        }
+
     }
 
     imxrt_i2c->msg = RT_NULL;
@@ -341,6 +427,31 @@ int rt_hw_i2c_init(void)
     rt_i2c_bus_device_register(&lpi2c4.parent, lpi2c4.device_name);
 #endif /* BSP_USING_I2C4 */
 
+#if   defined(BSP_USING_I2C5)
+    LPI2C_MasterGetDefaultConfig(&masterConfig);
+#if   defined(HW_I2C5_BADURATE_400kHZ)
+    masterConfig.baudRate_Hz = 400000U;
+#elif defined(HW_I2C5_BADURATE_100kHZ)
+    masterConfig.baudRate_Hz = 100000U;
+#endif  /* HW_I2C5_BADURATE_400kHZ */
+    lpi2c5.clock_root = kCLOCK_Root_Lpi2c5;
+    imxrt_lpi2c_configure(&lpi2c5, &masterConfig);
+    rt_i2c_bus_device_register(&lpi2c5.parent, lpi2c5.device_name);
+#endif /* BSP_USING_I2C5 */
+
+#if   defined(BSP_USING_I2C6)
+    LPI2C_MasterGetDefaultConfig(&masterConfig);
+#if   defined(HW_I2C6_BADURATE_400kHZ)
+    masterConfig.baudRate_Hz = 400000U;
+#elif defined(HW_I2C6_BADURATE_100kHZ)
+    masterConfig.baudRate_Hz = 100000U;
+#endif  /* HW_I2C6_BADURATE_400kHZ */
+    lpi2c6.clock_root = kCLOCK_Root_Lpi2c6;
+    imxrt_lpi2c_configure(&lpi2c6, &masterConfig);
+    rt_i2c_bus_device_register(&lpi2c6.parent, lpi2c6.device_name);
+#endif /* BSP_USING_I2C6 */
+
+
 #endif /* MIMXRT1015_SERIES */
 
     return 0;

bsp/imxrt/libraries/drivers/drv_mdio.c

@@ -1,6 +1,5 @@
-
 /*
- * Copyright (c) 2006-2020, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *

bsp/imxrt/libraries/drivers/drv_mdio.h

@@ -1,6 +1,5 @@
-
 /*
- * Copyright (c) 2006-2020, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *

bsp/imxrt/libraries/drivers/drv_pulse_encoder.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -22,7 +22,7 @@
 #if !defined(BSP_USING_PULSE_ENCODER1) && !defined(BSP_USING_PULSE_ENCODER2) && !defined(BSP_USING_PULSE_ENCODER3) \
     && !defined(BSP_USING_PULSE_ENCODER4)
     #error "Please define at least one BSP_USING_PULSE_ENCODERx"
-    /* this driver can be disabled at menuconfig → RT-Thread Components → Device Drivers */
+    /* this driver can be disabled at menuconfig -> RT-Thread Components -> Device Drivers */
 #elif (defined(BSP_USING_PULSE_ENCODER2) || defined(BSP_USING_PULSE_ENCODER3) || defined(BSP_USING_PULSE_ENCODER4)) || defined(SOC_IMXRT1015_SERIES)
     #error "IMXRT1015 had only one quadrature decoder module"
 #elif (defined(BSP_USING_PULSE_ENCODER3) || defined(BSP_USING_PULSE_ENCODER4)) || defined(SOC_IMXRT1020_SERIES)
@@ -157,4 +157,4 @@ int rt_hw_pulse_encoder_init(void)
 }
 INIT_BOARD_EXPORT(rt_hw_pulse_encoder_init);
 
-#endif
+#endif

bsp/imxrt/libraries/drivers/drv_sai.c

@@ -1,13 +1,13 @@
 /*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
  * Change Logs:
  * Date           Author       Notes
  * 2018-4-30     misonyo     the first version.
  */
- 
+
 #include <rtthread.h>
 #include <rthw.h>
 #include <rtdef.h>