diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-18 18:48:04 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-18 18:48:04 -0400 |
| commit | 68ff827ec74fdca8f17d469f22e1032ed14cb795 (patch) | |
| tree | 882aa0fd6d942bd4001682cbbc5c63f13c23844e /arch/arm/mach-uniphier/clk/clk-pro4.c | |
| parent | bb297ceea8bf6cc0291c556f64f49b89368f10ba (diff) | |
| parent | 12a5ce72738a34eaa11b559778039f1051425dbd (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
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 8746d7df518..92b73384abd 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 |