]> git.sur5r.net Git - u-boot/commitdiff
ARM: uniphier: remove unnecessary EHCI reset deassertion
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Mon, 17 Oct 2016 13:18:03 +0000 (22:18 +0900)
committerMasahiro Yamada <yamada.masahiro@socionext.com>
Tue, 18 Oct 2016 05:27:13 +0000 (14:27 +0900)
It is now deasserted by the reset controller driver.  Drop the
ad-hoc code.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
arch/arm/mach-uniphier/clk/clk-ld4.c
arch/arm/mach-uniphier/clk/clk-pro4.c

index 8744d266e24a102c0042238b367e150d68a0a809..62b6927732a630402360cd4daae5ade7a87ebaa3 100644 (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+
  */
@@ -18,9 +20,6 @@ void uniphier_ld4_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
index 8746d7df518dcc35b9141d5080ff81e1e1e1401f..92b73384abd29eda35c85b158eea5927b39a0620 100644 (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+
  */
@@ -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