]> rtime.felk.cvut.cz Git - hercules2020/nv-tegra/linux-4.4.git/blob - rt-patches/0319-clk-at91-pmc-drop-at91_pmc_base.patch
rt_patches: required rebase due to printk change
[hercules2020/nv-tegra/linux-4.4.git] / rt-patches / 0319-clk-at91-pmc-drop-at91_pmc_base.patch
1 From 642ab5d971cb97a8d991d4e99263a287a2b547cb Mon Sep 17 00:00:00 2001
2 From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
3 Date: Wed, 30 Sep 2015 13:02:01 +0200
4 Subject: [PATCH 319/366] clk: at91: pmc: drop at91_pmc_base
5
6 at91_pmc_base is not used anymore, remove it along with at91_pmc_read and
7 at91_pmc_write.
8
9 Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
10 Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
11 Acked-by: Stephen Boyd <sboyd@codeaurora.org>
12 Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
13 ---
14  drivers/clk/at91/pmc.c       |  7 -------
15  include/linux/clk/at91_pmc.h | 12 ------------
16  2 files changed, 19 deletions(-)
17
18 diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c
19 index 361ea0c..dce2855 100644
20 --- a/drivers/clk/at91/pmc.c
21 +++ b/drivers/clk/at91/pmc.c
22 @@ -12,7 +12,6 @@
23  #include <linux/clkdev.h>
24  #include <linux/clk/at91_pmc.h>
25  #include <linux/of.h>
26 -#include <linux/of_address.h>
27  #include <linux/mfd/syscon.h>
28  #include <linux/regmap.h>
29  
30 @@ -29,9 +28,6 @@ struct at91_pmc {
31         const struct at91_pmc_caps *caps;
32  };
33  
34 -void __iomem *at91_pmc_base;
35 -EXPORT_SYMBOL_GPL(at91_pmc_base);
36 -
37  int of_at91_get_clk_range(struct device_node *np, const char *propname,
38                           struct clk_range *range)
39  {
40 @@ -108,11 +104,8 @@ static void __init of_at91_pmc_setup(struct device_node *np,
41                                      const struct at91_pmc_caps *caps)
42  {
43         struct at91_pmc *pmc;
44 -       void __iomem *regbase = of_iomap(np, 0);
45         struct regmap *regmap;
46  
47 -       at91_pmc_base = regbase;
48 -
49         regmap = syscon_node_to_regmap(np);
50         if (IS_ERR(regmap))
51                 panic("Could not retrieve syscon regmap");
52 diff --git a/include/linux/clk/at91_pmc.h b/include/linux/clk/at91_pmc.h
53 index 1e69322..17f413b 100644
54 --- a/include/linux/clk/at91_pmc.h
55 +++ b/include/linux/clk/at91_pmc.h
56 @@ -16,18 +16,6 @@
57  #ifndef AT91_PMC_H
58  #define AT91_PMC_H
59  
60 -#ifndef __ASSEMBLY__
61 -extern void __iomem *at91_pmc_base;
62 -
63 -#define at91_pmc_read(field) \
64 -       readl_relaxed(at91_pmc_base + field)
65 -
66 -#define at91_pmc_write(field, value) \
67 -       writel_relaxed(value, at91_pmc_base + field)
68 -#else
69 -.extern at91_pmc_base
70 -#endif
71 -
72  #define        AT91_PMC_SCER           0x00                    /* System Clock Enable Register */
73  #define        AT91_PMC_SCDR           0x04                    /* System Clock Disable Register */
74  
75 -- 
76 1.9.1
77