diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2015-02-27 02:26:55 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2015-03-01 00:02:49 +0900 |
| commit | 4c7d025368fce4825a23aee90bd9a8fa1a95bbd7 (patch) | |
| tree | 99a594ebefc99384b08ff91ed76b95e8a4559ec7 | |
| parent | 44f597adebb369ceb5921d4f18b73e415e83441f (diff) | |
| download | talos-obmc-uboot-4c7d025368fce4825a23aee90bd9a8fa1a95bbd7.tar.gz talos-obmc-uboot-4c7d025368fce4825a23aee90bd9a8fa1a95bbd7.zip | |
ARM: UniPhier: move uniphier_ehci_reset() function
Because uniphier_ehci_reset() is only called from ehci-uniphier.c,
it can be a static function there.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Marek Vasut <marex@denx.de>
| -rw-r--r-- | arch/arm/mach-uniphier/include/mach/ehci-uniphier.h | 27 | ||||
| -rw-r--r-- | drivers/usb/host/ehci-uniphier.c | 15 |
2 files changed, 14 insertions, 28 deletions
diff --git a/arch/arm/mach-uniphier/include/mach/ehci-uniphier.h b/arch/arm/mach-uniphier/include/mach/ehci-uniphier.h deleted file mode 100644 index 3ba31833c3..0000000000 --- a/arch/arm/mach-uniphier/include/mach/ehci-uniphier.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2014-2015 Panasonic Corporation - * Author: Masahiro Yamada <yamada.m@jp.panasonic.com> - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef __PLAT_UNIPHIER_EHCI_H -#define __PLAT_UNIPHIER_EHCI_H - -#include <linux/types.h> -#include <asm/io.h> -#include "mio-regs.h" - -static inline void uniphier_ehci_reset(int index, int on) -{ - u32 tmp; - - tmp = readl(MIO_USB_RSTCTRL(index)); - if (on) - tmp &= ~MIO_USB_RSTCTRL_XRST; - else - tmp |= MIO_USB_RSTCTRL_XRST; - writel(tmp, MIO_USB_RSTCTRL(index)); -} - -#endif /* __PLAT_UNIPHIER_EHCI_H */ diff --git a/drivers/usb/host/ehci-uniphier.c b/drivers/usb/host/ehci-uniphier.c index 68959efb20..b5ec296918 100644 --- a/drivers/usb/host/ehci-uniphier.c +++ b/drivers/usb/host/ehci-uniphier.c @@ -7,8 +7,9 @@ #include <common.h> #include <linux/err.h> +#include <asm/io.h> #include <usb.h> -#include <mach/ehci-uniphier.h> +#include <mach/mio-regs.h> #include <fdtdec.h> #include "ehci.h" @@ -35,6 +36,18 @@ static int get_uniphier_ehci_base(int index, struct ehci_hccr **base) return -ENODEV; /* not found */ } +static void uniphier_ehci_reset(int index, int on) +{ + u32 tmp; + + tmp = readl(MIO_USB_RSTCTRL(index)); + if (on) + tmp &= ~MIO_USB_RSTCTRL_XRST; + else + tmp |= MIO_USB_RSTCTRL_XRST; + writel(tmp, MIO_USB_RSTCTRL(index)); +} + int ehci_hcd_init(int index, enum usb_init_type init, struct ehci_hccr **hccr, struct ehci_hcor **hcor) { |
