From 5301a1b9d35fd285aa6ad64555bedf25228aacfc Mon Sep 17 00:00:00 2001
From: tangyuxin <462747508@qq.com>
Date: Thu, 8 Mar 2018 12:01:13 +0800
Subject: [PATCH] =?UTF-8?q?[bsp][allwinner=5Ftina]=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E8=A1=A8=E6=84=8F=E4=B8=8D=E6=B8=85=E6=99=B0=E7=9A=84=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bsp/allwinner_tina/drivers/drv_clock.c | 4 ++--
 bsp/allwinner_tina/drivers/drv_clock.h | 9 ---------
 bsp/allwinner_tina/drivers/drv_uart.c  | 6 +++---
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/bsp/allwinner_tina/drivers/drv_clock.c b/bsp/allwinner_tina/drivers/drv_clock.c
index 8c8431b913..ad0d829683 100644
--- a/bsp/allwinner_tina/drivers/drv_clock.c
+++ b/bsp/allwinner_tina/drivers/drv_clock.c
@@ -485,7 +485,7 @@ rt_err_t bus_gate_clk_disalbe(enum bus_gate bus)
     return RT_EOK;
 }
 
-rt_err_t bus_software_reset_enalbe(enum bus_gate bus)
+rt_err_t bus_software_reset_disalbe(enum bus_gate bus)
 {
     rt_uint32_t offset;
     rt_uint32_t gate_reg;
@@ -505,7 +505,7 @@ rt_err_t bus_software_reset_enalbe(enum bus_gate bus)
     return RT_EOK;
 }
 
-rt_err_t bus_software_reset_disalbe(enum bus_gate bus)
+rt_err_t bus_software_reset_enalbe(enum bus_gate bus)
 {
     rt_uint32_t offset;
     rt_uint32_t gate_reg;
diff --git a/bsp/allwinner_tina/drivers/drv_clock.h b/bsp/allwinner_tina/drivers/drv_clock.h
index 4818d06dc8..7b71d77fa0 100644
--- a/bsp/allwinner_tina/drivers/drv_clock.h
+++ b/bsp/allwinner_tina/drivers/drv_clock.h
@@ -42,7 +42,6 @@
 #define CSI_GATING_DRAM         (0x1<<1)
 #define VE_GATING_DRAM          (0x1<<0)
 
-
 /*  */
 #define TCON_PLL_VIDEO_X1       (0x000)
 #define TCON_PLL_VIDEO_X2       (0x002)
@@ -218,13 +217,6 @@ typedef struct tina_ccu *tina_ccu_t;
 
 #define CCU ((tina_ccu_t) CCU_BASE_ADDR)
 
-
-
-
-
-
-
-
 int cpu_get_pll_clk(void);
 int audio_get_pll_clk(void);
 int video_get_pll_clk(void);
@@ -243,7 +235,6 @@ rt_err_t periph_set_pll_clk(int clk);
 
 rt_err_t cpu_set_clk(int clk);
 
-
 rt_err_t bus_gate_clk_enalbe(enum bus_gate bus);
 rt_err_t bus_gate_clk_disalbe(enum bus_gate bus);
 rt_err_t bus_software_reset_enalbe(enum bus_gate bus);
diff --git a/bsp/allwinner_tina/drivers/drv_uart.c b/bsp/allwinner_tina/drivers/drv_uart.c
index 8dd7e68bee..9113dcdb66 100644
--- a/bsp/allwinner_tina/drivers/drv_uart.c
+++ b/bsp/allwinner_tina/drivers/drv_uart.c
@@ -184,20 +184,20 @@ static rt_err_t uart_configure(struct rt_serial_device *serial, struct serial_co
     if ((rt_uint32_t)(uart->hw_base) == UART0_BASE_ADDR)
     {
         bus_gate_clk_enalbe(UART0_GATING);
-        bus_software_reset_disalbe(UART0_GATING);
         bus_software_reset_enalbe(UART0_GATING);
+        bus_software_reset_disalbe(UART0_GATING);
     }
     else if ((rt_uint32_t)(uart->hw_base) == UART1_BASE_ADDR)
     {
         bus_gate_clk_enalbe(UART1_GATING);
-        bus_software_reset_disalbe(UART1_GATING);
         bus_software_reset_enalbe(UART1_GATING);
+        bus_software_reset_disalbe(UART1_GATING);
     }
     else if ((rt_uint32_t)(uart->hw_base) == UART2_BASE_ADDR)
     {
         bus_gate_clk_enalbe(UART2_GATING);
-        bus_software_reset_disalbe(UART2_GATING);
         bus_software_reset_enalbe(UART2_GATING);
+        bus_software_reset_disalbe(UART2_GATING);
     }
     else
         RT_ASSERT(0);
-- 
GitLab