diff options
Diffstat (limited to 'arch/arm/mach-uniphier/early-clk')
| -rw-r--r-- | arch/arm/mach-uniphier/early-clk/Makefile | 14 | ||||
| -rw-r--r-- | arch/arm/mach-uniphier/early-clk/early-clk-ld4.c (renamed from arch/arm/mach-uniphier/early-clk/early-clk-ph1-ld4.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-uniphier/early-clk/early-clk-pro5.c (renamed from arch/arm/mach-uniphier/early-clk/early-clk-ph1-pro5.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-uniphier/early-clk/early-clk-pxs2.c (renamed from arch/arm/mach-uniphier/early-clk/early-clk-proxstream2.c) | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm/mach-uniphier/early-clk/Makefile b/arch/arm/mach-uniphier/early-clk/Makefile index 3e1e1b2bc8..59058cdb1f 100644 --- a/arch/arm/mach-uniphier/early-clk/Makefile +++ b/arch/arm/mach-uniphier/early-clk/Makefile @@ -2,10 +2,10 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD3) += early-clk-ph1-ld4.o -obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4) += early-clk-ph1-ld4.o -obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO4) += early-clk-ph1-ld4.o -obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD8) += early-clk-ph1-ld4.o -obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO5) += early-clk-ph1-pro5.o -obj-$(CONFIG_ARCH_UNIPHIER_PROXSTREAM2) += early-clk-proxstream2.o -obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD6B) += early-clk-proxstream2.o +obj-$(CONFIG_ARCH_UNIPHIER_SLD3) += early-clk-ld4.o +obj-$(CONFIG_ARCH_UNIPHIER_LD4) += early-clk-ld4.o +obj-$(CONFIG_ARCH_UNIPHIER_PRO4) += early-clk-ld4.o +obj-$(CONFIG_ARCH_UNIPHIER_SLD8) += early-clk-ld4.o +obj-$(CONFIG_ARCH_UNIPHIER_PRO5) += early-clk-pro5.o +obj-$(CONFIG_ARCH_UNIPHIER_PXS2) += early-clk-pxs2.o +obj-$(CONFIG_ARCH_UNIPHIER_LD6B) += early-clk-pxs2.o diff --git a/arch/arm/mach-uniphier/early-clk/early-clk-ph1-ld4.c b/arch/arm/mach-uniphier/early-clk/early-clk-ld4.c index 6574767f30..b6e8b646f9 100644 --- a/arch/arm/mach-uniphier/early-clk/early-clk-ph1-ld4.c +++ b/arch/arm/mach-uniphier/early-clk/early-clk-ld4.c @@ -11,7 +11,7 @@ #include "../init.h" #include "../sc-regs.h" -int ph1_ld4_early_clk_init(const struct uniphier_board_data *bd) +int uniphier_ld4_early_clk_init(const struct uniphier_board_data *bd) { u32 tmp; @@ -24,7 +24,7 @@ int ph1_ld4_early_clk_init(const struct uniphier_board_data *bd) writel(tmp, SC_RSTCTRL); readl(SC_RSTCTRL); /* dummy read */ - /* privide clocks */ + /* provide clocks */ tmp = readl(SC_CLKCTRL); tmp |= SC_CLKCTRL_CEN_UMC | SC_CLKCTRL_CEN_SBC | SC_CLKCTRL_CEN_PERI; writel(tmp, SC_CLKCTRL); diff --git a/arch/arm/mach-uniphier/early-clk/early-clk-ph1-pro5.c b/arch/arm/mach-uniphier/early-clk/early-clk-pro5.c index d98635878b..c41a8ead2e 100644 --- a/arch/arm/mach-uniphier/early-clk/early-clk-ph1-pro5.c +++ b/arch/arm/mach-uniphier/early-clk/early-clk-pro5.c @@ -9,7 +9,7 @@ #include "../init.h" #include "../sc-regs.h" -int ph1_pro5_early_clk_init(const struct uniphier_board_data *bd) +int uniphier_pro5_early_clk_init(const struct uniphier_board_data *bd) { u32 tmp; @@ -26,7 +26,7 @@ int ph1_pro5_early_clk_init(const struct uniphier_board_data *bd) writel(tmp, SC_RSTCTRL4); readl(SC_RSTCTRL); /* dummy read */ - /* privide clocks */ + /* provide clocks */ tmp = readl(SC_CLKCTRL); tmp |= SC_CLKCTRL_CEN_SBC | SC_CLKCTRL_CEN_PERI; writel(tmp, SC_CLKCTRL); diff --git a/arch/arm/mach-uniphier/early-clk/early-clk-proxstream2.c b/arch/arm/mach-uniphier/early-clk/early-clk-pxs2.c index a573a96ee5..665ecd510f 100644 --- a/arch/arm/mach-uniphier/early-clk/early-clk-proxstream2.c +++ b/arch/arm/mach-uniphier/early-clk/early-clk-pxs2.c @@ -11,7 +11,7 @@ #include "../init.h" #include "../sc-regs.h" -int proxstream2_early_clk_init(const struct uniphier_board_data *bd) +int uniphier_pxs2_early_clk_init(const struct uniphier_board_data *bd) { u32 tmp; @@ -30,7 +30,7 @@ int proxstream2_early_clk_init(const struct uniphier_board_data *bd) writel(tmp, SC_RSTCTRL4); readl(SC_RSTCTRL4); /* dummy read */ - /* privide clocks */ + /* provide clocks */ tmp = readl(SC_CLKCTRL); tmp |= SC_CLKCTRL_CEN_SBC | SC_CLKCTRL_CEN_PERI; writel(tmp, SC_CLKCTRL); |