| From 9aae041bed378e3f58a9f29a3b02f3184386d0ad Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Mon, 5 Dec 2016 11:39:41 +0100 |
| Subject: [PATCH 090/255] ARM: shmobile: rcar-gen2: Remove unused |
| rcar_gen2_read_mode_pins() |
| |
| After |
| 1. commit 9f5ce39ddb8f68b3 ("ARM: shmobile: rcar-gen2: Obtain extal |
| frequency from DT"), |
| 2. commit 80951f04c3f92533 ("ARM: shmobile: rcar-gen2: Stop passing |
| mode pins state to clock driver"), |
| 3. and handling of debug resource reset, |
| there are no more users of rcar_gen2_read_mode_pins() left. |
| Remove the function and its support definitions. |
| |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 70def3e53694a65c5583fb5f411491a5074bab18) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/rcar-gen2.h | 2 -- |
| arch/arm/mach-shmobile/setup-rcar-gen2.c | 18 ------------------ |
| 2 files changed, 20 deletions(-) |
| |
| --- a/arch/arm/mach-shmobile/rcar-gen2.h |
| +++ b/arch/arm/mach-shmobile/rcar-gen2.h |
| @@ -2,8 +2,6 @@ |
| #define __ASM_RCAR_GEN2_H__ |
| |
| void rcar_gen2_timer_init(void); |
| -#define MD(nr) BIT(nr) |
| -u32 rcar_gen2_read_mode_pins(void); |
| void rcar_gen2_reserve(void); |
| void rcar_gen2_pm_init(void); |
| |
| --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c |
| +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c |
| @@ -29,24 +29,6 @@ |
| #include "common.h" |
| #include "rcar-gen2.h" |
| |
| -#define MODEMR 0xe6160060 |
| - |
| -u32 rcar_gen2_read_mode_pins(void) |
| -{ |
| - static u32 mode; |
| - static bool mode_valid; |
| - |
| - if (!mode_valid) { |
| - void __iomem *modemr = ioremap_nocache(MODEMR, 4); |
| - BUG_ON(!modemr); |
| - mode = ioread32(modemr); |
| - iounmap(modemr); |
| - mode_valid = true; |
| - } |
| - |
| - return mode; |
| -} |
| - |
| static unsigned int __init get_extal_freq(void) |
| { |
| struct device_node *cpg, *extal; |