diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2020-12-05 09:27:22 +0300 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2020-12-05 09:27:22 +0300 |
| commit | 87b6a5e28b2b2d41a3e3300b9edfcb917eae7add (patch) | |
| tree | 57385b47c75db197240f68601f82d62a251317dc /include | |
| parent | 3650b228f83adda7e5ee532e2b90429c03f7b9ec (diff) | |
| parent | 44a9e78f9242872c889f176782777fa2ed535650 (diff) | |
| download | linux-87b6a5e28b2b2d41a3e3300b9edfcb917eae7add.tar.xz | |
Merge tag 'clk-v5.11-samsung' of https://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk into clk-samsung
Pull Samsung clk driver updates from Sylwester Nawrocki:
- Correction of Kconfig dependencies for better compile test coverage
- Refactoring of the PLL clocks driver
* tag 'clk-v5.11-samsung' of https://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk:
clk: samsung: Prevent potential endless loop in the PLL ops
clk: samsung: Allow compile testing of Exynos, S3C64xx and S5Pv210
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/clk/samsung.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/clk/samsung.h b/include/linux/clk/samsung.h index 79097e365f7f..38b774001712 100644 --- a/include/linux/clk/samsung.h +++ b/include/linux/clk/samsung.h @@ -10,7 +10,7 @@ struct device_node; -#ifdef CONFIG_ARCH_S3C64XX +#ifdef CONFIG_S3C64XX_COMMON_CLK void s3c64xx_clk_init(struct device_node *np, unsigned long xtal_f, unsigned long xusbxti_f, bool s3c6400, void __iomem *base); @@ -19,7 +19,7 @@ static inline void s3c64xx_clk_init(struct device_node *np, unsigned long xtal_f, unsigned long xusbxti_f, bool s3c6400, void __iomem *base) { } -#endif /* CONFIG_ARCH_S3C64XX */ +#endif /* CONFIG_S3C64XX_COMMON_CLK */ #ifdef CONFIG_S3C2410_COMMON_CLK void s3c2410_common_clk_init(struct device_node *np, unsigned long xti_f, |