diff options
| author | Tom Rini <trini@konsulko.com> | 2016-02-14 08:39:32 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-02-14 08:39:32 -0500 |
| commit | 823ecd72bb08344acc7d076ba13864eb0e18ba61 (patch) | |
| tree | 9d2137d4bd38f1b2c3cef8d6021115bc2ad8864f /arch/arm/mach-uniphier/clk/clk-ph1-ld4.c | |
| parent | e4b40e921dcf0e39d5c10984d366023f459facef (diff) | |
| parent | 3f23111722ebf5b2416c7989eab7eb77be5ad0cf (diff) | |
| download | talos-obmc-uboot-823ecd72bb08344acc7d076ba13864eb0e18ba61.tar.gz talos-obmc-uboot-823ecd72bb08344acc7d076ba13864eb0e18ba61.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'arch/arm/mach-uniphier/clk/clk-ph1-ld4.c')
| -rw-r--r-- | arch/arm/mach-uniphier/clk/clk-ph1-ld4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-uniphier/clk/clk-ph1-ld4.c b/arch/arm/mach-uniphier/clk/clk-ph1-ld4.c index 4de9bfb102..7a34beea03 100644 --- a/arch/arm/mach-uniphier/clk/clk-ph1-ld4.c +++ b/arch/arm/mach-uniphier/clk/clk-ph1-ld4.c @@ -18,7 +18,7 @@ void ph1_ld4_clk_init(void) #ifdef CONFIG_UNIPHIER_ETH tmp |= SC_RSTCTRL_NRST_ETHER; #endif -#ifdef CONFIG_USB_EHCI_UNIPHIER +#ifdef CONFIG_USB_EHCI tmp |= SC_RSTCTRL_NRST_STDMAC; #endif #ifdef CONFIG_NAND_DENALI @@ -32,7 +32,7 @@ void ph1_ld4_clk_init(void) #ifdef CONFIG_UNIPHIER_ETH tmp |= SC_CLKCTRL_CEN_ETHER; #endif -#ifdef CONFIG_USB_EHCI_UNIPHIER +#ifdef CONFIG_USB_EHCI tmp |= SC_CLKCTRL_CEN_MIO | SC_CLKCTRL_CEN_STDMAC; #endif #ifdef CONFIG_NAND_DENALI |
