diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-10-17 22:18:03 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-10-18 14:27:13 +0900 |
| commit | 70dda1b1e8a2ed69470b4af0b3087630776e477d (patch) | |
| tree | e6c565b03bdd1093fd6c177b50afa0fb947fbc77 /arch/arm/mach-uniphier/clk/clk-pro4.c | |
| parent | 52159d27ffe6b2a1a7e874cb2fda5aadbd4f03e5 (diff) | |
ARM: uniphier: remove unnecessary EHCI reset deassertion
It is now deasserted by the reset controller driver. Drop the
ad-hoc code.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier/clk/clk-pro4.c')
| -rw-r--r-- | arch/arm/mach-uniphier/clk/clk-pro4.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-uniphier/clk/clk-pro4.c b/arch/arm/mach-uniphier/clk/clk-pro4.c index 8746d7df51..92b73384ab 100644 --- a/arch/arm/mach-uniphier/clk/clk-pro4.c +++ b/arch/arm/mach-uniphier/clk/clk-pro4.c @@ -1,5 +1,7 @@ /* - * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com> + * Copyright (C) 2011-2015 Panasonic Corporation + * Copyright (C) 2015-2016 Socionext Inc. + * Author: Masahiro Yamada <yamada.masahiro@socionext.com> * * SPDX-License-Identifier: GPL-2.0+ */ @@ -22,9 +24,6 @@ void uniphier_pro4_clk_init(void) #ifdef CONFIG_UNIPHIER_ETH tmp |= SC_RSTCTRL_NRST_ETHER; #endif -#ifdef CONFIG_USB_EHCI - tmp |= SC_RSTCTRL_NRST_STDMAC; -#endif #ifdef CONFIG_NAND_DENALI tmp |= SC_RSTCTRL_NRST_NAND; #endif |