ARM: UniPhier: replace <asm/io.h> with <linux/io.h>

[karo-tx-uboot.git] / arch / arm / mach-uniphier / ph1-pro4 / pinctrl.c

diff --git a/arch/arm/mach-uniphier/ph1-pro4/pinctrl.c b/arch/arm/mach-uniphier/ph1-pro4/pinctrl.c
index 4e3d47615b64161d7f36797916f3271d223703cd..72cd34678d816ac137ade183b126b3a26649ba42 100644 (file)
--- a/arch/arm/mach-uniphier/ph1-pro4/pinctrl.c
+++ b/arch/arm/mach-uniphier/ph1-pro4/pinctrl.c
@@ -1,28 +1,16 @@
 /*
- * Copyright (C) 2011-2014 Panasonic Corporation
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#include <common.h>
-#include <asm/io.h>
-#include <asm/arch/sg-regs.h>
+#include <linux/io.h>
+#include <mach/sg-regs.h>
 
 void pin_init(void)
 {
        /* Comment format:    PAD Name -> Function Name */
 
-#ifdef CONFIG_UNIPHIER_SERIAL
-       sg_set_pinsel(127, 0);  /* RXD0 -> RXD0 */
-       sg_set_pinsel(128, 0);  /* TXD0 -> TXD0 */
-       sg_set_pinsel(129, 0);  /* RXD1 -> RXD1 */
-       sg_set_pinsel(130, 0);  /* TXD1 -> TXD1 */
-       sg_set_pinsel(131, 0);  /* RXD2 -> RXD2 */
-       sg_set_pinsel(132, 0);  /* TXD2 -> TXD2 */
-       sg_set_pinsel(88, 2);   /* CH6CLK -> RXD3 */
-       sg_set_pinsel(89, 2);   /* CH6VAL -> TXD3 */
-#endif
-
 #ifdef CONFIG_NAND_DENALI
        sg_set_pinsel(40, 0);   /* NFD0   -> NFD0 */
        sg_set_pinsel(41, 0);   /* NFD1   -> NFD1 */
@@ -41,6 +29,13 @@ void pin_init(void)
        sg_set_pinsel(54, 0);   /* NRYBY0 -> NRYBY0 */
 #endif
 
+#ifdef CONFIG_USB_XHCI_UNIPHIER
+       sg_set_pinsel(180, 0);  /* USB0VBUS -> USB0VBUS */
+       sg_set_pinsel(181, 0);  /* USB0OD   -> USB0OD */
+       sg_set_pinsel(182, 0);  /* USB1VBUS -> USB1VBUS */
+       sg_set_pinsel(183, 0);  /* USB1OD   -> USB1OD */
+#endif
+
 #ifdef CONFIG_USB_EHCI_UNIPHIER
        sg_set_pinsel(184, 0);  /* USB2VBUS -> USB2VBUS */
        sg_set_pinsel(185, 0);  /* USB2OD   -> USB2OD */