diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-01-29 09:53:55 +0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-01-29 09:53:55 +0400 |
commit | e9a371100dfdfa4c9f994059d19d98c9b4fd80af (patch) | |
tree | 11e9d240d87834f9da927aaa4027e7dfcbd01eb8 /include/linux | |
parent | d891ea23d5203e5c47439b2a174f86a00b356a6c (diff) | |
parent | bc75059422338197ce487d338ac9c898761e1e61 (diff) | |
download | linux-e9a371100dfdfa4c9f994059d19d98c9b4fd80af.tar.xz |
Merge remote-tracking branch 'agust/next' into next
<<
Switch mpc512x to the common clock framework and adapt mpc512x
drivers to use the new clock driver. Old PPC_CLOCK code is
removed entirely since there are no users any more.
>>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/clk-provider.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 999b28ba38f7..f1a098a4450c 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -542,6 +542,20 @@ static inline const char *of_clk_get_parent_name(struct device_node *np, * for improved portability across platforms */ +#if IS_ENABLED(CONFIG_PPC) + +static inline u32 clk_readl(u32 __iomem *reg) +{ + return ioread32be(reg); +} + +static inline void clk_writel(u32 val, u32 __iomem *reg) +{ + iowrite32be(val, reg); +} + +#else /* platform dependent I/O accessors */ + static inline u32 clk_readl(u32 __iomem *reg) { return readl(reg); @@ -552,5 +566,7 @@ static inline void clk_writel(u32 val, u32 __iomem *reg) writel(val, reg); } +#endif /* platform dependent I/O accessors */ + #endif /* CONFIG_COMMON_CLK */ #endif /* CLK_PROVIDER_H */ |