Prepare v2018.03-rc3

[people/ms/u-boot.git] / drivers / qe / uccf.c

diff --git a/drivers/qe/uccf.c b/drivers/qe/uccf.c
index c5477e0d7ec03ba09b35e70ca8adf00641d5370a..bab545312812319d29d725cbf2863ba459a1cb5e 100644 (file)
--- a/drivers/qe/uccf.c
+++ b/drivers/qe/uccf.c
@@ -4,31 +4,17 @@
  * Dave Liu <daveliu@freescale.com>
  * based on source code of Shlomi Gridish
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#include "common.h"
-#include "malloc.h"
-#include "asm/errno.h"
-#include "asm/io.h"
-#include "asm/immap_qe.h"
-#include "qe.h"
+#include <common.h>
+#include <malloc.h>
+#include <linux/errno.h>
+#include <asm/io.h>
+#include <linux/immap_qe.h>
 #include "uccf.h"
+#include <fsl_qe.h>
 
-#if defined(CONFIG_QE)
 void ucc_fast_transmit_on_demand(ucc_fast_private_t *uccf)
 {
        out_be16(&uccf->uf_regs->utodr, UCC_FAST_TOD);
@@ -369,7 +355,7 @@ int ucc_fast_init(ucc_fast_info_t *uf_info, ucc_fast_private_t  **uccf_ret)
                out_be16(&uf_regs->urfset, UCC_GETH_URFSET_INIT);
                out_be16(&uf_regs->utfs, UCC_GETH_UTFS_INIT);
                out_be16(&uf_regs->utfet, UCC_GETH_UTFET_INIT);
-               out_be16(&uf_regs->utftt, UCC_GETH_UTFTT_INIT);
+               out_be16(&uf_regs->utftt, UCC_GETH_UTFTT_INIT);
        }
 
        /* Rx clock routing */
@@ -401,4 +387,3 @@ int ucc_fast_init(ucc_fast_info_t *uf_info, ucc_fast_private_t  **uccf_ret)
        *uccf_ret = uccf;
        return 0;
 }
-#endif /* CONFIG_QE */