| From 8ab3b44a26ce41c6643a996ecf0defa18265fcbf Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Wed, 1 Jun 2016 14:56:58 +0200 |
| Subject: [PATCH 184/299] clk: renesas: rcar-gen3-cpg: Remove obsolete |
| rcar_gen3_read_mode_pins() |
| |
| All R-Car Gen3 clock drivers now obtain the values of the mode pins from |
| the R-Car RST driver. |
| |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Acked-by: Dirk Behme <dirk.behme@de.bosch.com> |
| Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| (cherry picked from commit ddab5aed8ecd277bd34b6421736c882fdff2dfe1) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/clk/renesas/rcar-gen3-cpg.c | 17 ----------------- |
| drivers/clk/renesas/rcar-gen3-cpg.h | 1 - |
| 2 files changed, 18 deletions(-) |
| |
| --- a/drivers/clk/renesas/rcar-gen3-cpg.c |
| +++ b/drivers/clk/renesas/rcar-gen3-cpg.c |
| @@ -333,23 +333,6 @@ struct clk * __init rcar_gen3_cpg_clk_re |
| __clk_get_name(parent), 0, mult, div); |
| } |
| |
| -/* |
| - * Reset register definitions. |
| - */ |
| -#define MODEMR 0xe6160060 |
| - |
| -u32 __init rcar_gen3_read_mode_pins(void) |
| -{ |
| - void __iomem *modemr = ioremap_nocache(MODEMR, 4); |
| - u32 mode; |
| - |
| - BUG_ON(!modemr); |
| - mode = ioread32(modemr); |
| - iounmap(modemr); |
| - |
| - return mode; |
| -} |
| - |
| int __init rcar_gen3_cpg_init(const struct rcar_gen3_cpg_pll_config *config, |
| unsigned int clk_extalr) |
| { |
| --- a/drivers/clk/renesas/rcar-gen3-cpg.h |
| +++ b/drivers/clk/renesas/rcar-gen3-cpg.h |
| @@ -33,7 +33,6 @@ struct rcar_gen3_cpg_pll_config { |
| |
| #define CPG_RCKCR 0x240 |
| |
| -u32 rcar_gen3_read_mode_pins(void); |
| struct clk *rcar_gen3_cpg_clk_register(struct device *dev, |
| const struct cpg_core_clk *core, const struct cpg_mssr_info *info, |
| struct clk **clks, void __iomem *base); |