aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorTero Kristo <t-kristo@ti.com>2015-02-06 09:20:13 -0500
committerTero Kristo <t-kristo@ti.com>2015-03-31 14:26:55 -0400
commitae0f6798474053eb76863fa9b3befd9deea58ba6 (patch)
tree791f22218319f2ee02ea908d1e18c81a55343a2e /arch/arm
parent80cbb224b789d256ad5cb36b0af3e5c04ed46bca (diff)
ARM: OMAP2+: control: remove API for getting control module base address
This shall not be used anymore, as control module driver is converted into using regmap. Signed-off-by: Tero Kristo <t-kristo@ti.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/control.c5
-rw-r--r--arch/arm/mach-omap2/control.h2
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index 4b4094685087..202fc725426b 100644
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -145,11 +145,6 @@ void __init omap2_set_globals_control(void __iomem *ctrl,
145 omap4_ctrl_pad_base = ctrl_pad; 145 omap4_ctrl_pad_base = ctrl_pad;
146} 146}
147 147
148void __iomem *omap_ctrl_base_get(void)
149{
150 return omap2_ctrl_base;
151}
152
153u8 omap_ctrl_readb(u16 offset) 148u8 omap_ctrl_readb(u16 offset)
154{ 149{
155 return readb_relaxed(OMAP_CTRL_REGADDR(offset)); 150 return readb_relaxed(OMAP_CTRL_REGADDR(offset));
diff --git a/arch/arm/mach-omap2/control.h b/arch/arm/mach-omap2/control.h
index c1057eb9d4e4..5353ff45bf83 100644
--- a/arch/arm/mach-omap2/control.h
+++ b/arch/arm/mach-omap2/control.h
@@ -440,7 +440,6 @@
440 440
441#ifndef __ASSEMBLY__ 441#ifndef __ASSEMBLY__
442#ifdef CONFIG_ARCH_OMAP2PLUS 442#ifdef CONFIG_ARCH_OMAP2PLUS
443extern void __iomem *omap_ctrl_base_get(void);
444extern u8 omap_ctrl_readb(u16 offset); 443extern u8 omap_ctrl_readb(u16 offset);
445extern u16 omap_ctrl_readw(u16 offset); 444extern u16 omap_ctrl_readw(u16 offset);
446extern u32 omap_ctrl_readl(u16 offset); 445extern u32 omap_ctrl_readl(u16 offset);
@@ -470,7 +469,6 @@ extern void omap2_set_globals_control(void __iomem *ctrl,
470 void __iomem *ctrl_pad); 469 void __iomem *ctrl_pad);
471void __init omap3_control_legacy_iomap_init(void); 470void __init omap3_control_legacy_iomap_init(void);
472#else 471#else
473#define omap_ctrl_base_get() 0
474#define omap_ctrl_readb(x) 0 472#define omap_ctrl_readb(x) 0
475#define omap_ctrl_readw(x) 0 473#define omap_ctrl_readw(x) 0
476#define omap_ctrl_readl(x) 0 474#define omap_ctrl_readl(x) 0