From f6e7f07c17bdf4c9c4c03375dc913b77c39dbe1d Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Fri, 29 May 2015 17:30:00 +0900
Subject: ARM: UniPhier: replace <asm/io.h> with <linux/io.h>

In the Linux coding style, it is recommended to include <linux/io.h>
rather than <asm/io.h>.  Follow this trend.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
 drivers/usb/host/ehci-uniphier.c | 6 ++----
 drivers/usb/host/xhci-uniphier.c | 5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'drivers/usb')

diff --git a/drivers/usb/host/ehci-uniphier.c b/drivers/usb/host/ehci-uniphier.c
index 846bf509d6..c3f827ca0a 100644
--- a/drivers/usb/host/ehci-uniphier.c
+++ b/drivers/usb/host/ehci-uniphier.c
@@ -1,14 +1,12 @@
 /*
- * Copyright (C) 2014 Panasonic Corporation
- * Copyright (C) 2015 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
 #include <linux/err.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <usb.h>
 #include <mach/mio-regs.h>
 #include <fdtdec.h>
diff --git a/drivers/usb/host/xhci-uniphier.c b/drivers/usb/host/xhci-uniphier.c
index e0ef322172..1b3f3d22de 100644
--- a/drivers/usb/host/xhci-uniphier.c
+++ b/drivers/usb/host/xhci-uniphier.c
@@ -1,13 +1,12 @@
 /*
- * Copyright (C) 2015 Panasonic Corporation
- * Copyright (C) 2015 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
 #include <linux/err.h>
+#include <linux/io.h>
 #include <usb.h>
 #include <fdtdec.h>
 #include "xhci.h"
-- 
cgit v1.2.1


From b6ef3a3f04b96336f1f4b519d62c12aad1f9f7b8 Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Fri, 29 May 2015 17:30:01 +0900
Subject: ARM: UniPhier: update the vendor name of UniPhier in Kconfig

The business for UniPhier Soc family has been transferred from
Panasonic Corporation to Socionext Inc.

Update the SoC select menu in Kconfig.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
 drivers/usb/host/Kconfig | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'drivers/usb')

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 24a595fb42..8705c7c44c 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -18,12 +18,11 @@ config USB_XHCI
 if USB_XHCI_HCD
 
 config USB_XHCI_UNIPHIER
-	bool "Support for Panasonic UniPhier on-chip xHCI USB controller"
+	bool "Support for UniPhier on-chip xHCI USB controller"
 	depends on ARCH_UNIPHIER
 	default y
 	---help---
-	  Enables support for the on-chip xHCI controller on Panasonic
-	  UniPhier SoCs.
+	  Enables support for the on-chip xHCI controller on UniPhier SoCs.
 
 endif
 
@@ -54,11 +53,10 @@ config USB_EHCI
 if USB_EHCI_HCD
 
 config USB_EHCI_UNIPHIER
-	bool "Support for Panasonic UniPhier on-chip EHCI USB controller"
+	bool "Support for UniPhier on-chip EHCI USB controller"
 	depends on ARCH_UNIPHIER && OF_CONTROL
 	default y
 	---help---
-	  Enables support for the on-chip EHCI controller on Panasonic
-	  UniPhier SoCs.
+	  Enables support for the on-chip EHCI controller on UniPhier SoCs.
 
 endif
-- 
cgit v1.2.1