leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: uniphier: remove unnecessary EHCI reset deassertion

Browse Source 
It is now deasserted by the reset controller driver.  Drop the
ad-hoc code.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2016-10-17 22:18:03 +09:00
parent 52159d27ff
commit 70dda1b1e8
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-uniphier/clk/clk-ld4.c
View File

@ -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+ * SPDX-License-Identifier: GPL-2.0+
*/ */
@ -18,9 +20,6 @@ void uniphier_ld4_clk_init(void)
#ifdef CONFIG_UNIPHIER_ETH #ifdef CONFIG_UNIPHIER_ETH
tmp |= SC_RSTCTRL_NRST_ETHER; tmp |= SC_RSTCTRL_NRST_ETHER;
#endif #endif
#ifdef CONFIG_USB_EHCI
tmp |= SC_RSTCTRL_NRST_STDMAC;
#endif
#ifdef CONFIG_NAND_DENALI #ifdef CONFIG_NAND_DENALI
tmp |= SC_RSTCTRL_NRST_NAND; tmp |= SC_RSTCTRL_NRST_NAND;
#endif #endif

7
arch/arm/mach-uniphier/clk/clk-pro4.c
View File

@ -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+ * SPDX-License-Identifier: GPL-2.0+
*/ */
@ -22,9 +24,6 @@ void uniphier_pro4_clk_init(void)
#ifdef CONFIG_UNIPHIER_ETH #ifdef CONFIG_UNIPHIER_ETH
tmp |= SC_RSTCTRL_NRST_ETHER; tmp |= SC_RSTCTRL_NRST_ETHER;
#endif #endif
#ifdef CONFIG_USB_EHCI
tmp |= SC_RSTCTRL_NRST_STDMAC;
#endif
#ifdef CONFIG_NAND_DENALI #ifdef CONFIG_NAND_DENALI
tmp |= SC_RSTCTRL_NRST_NAND; tmp |= SC_RSTCTRL_NRST_NAND;
#endif #endif