Skip to content

Commit efde234

Browse files
author
Tero Kristo
committed
ARM: OMAP4+: control: remove support for legacy pad read/write
omap4_ctrl_pad_readl/writel are no longer used by anybody, so remove these. Syscon / pinctrl should be used to access the padconf area instead. Signed-off-by: Tero Kristo <t-kristo@ti.com>
1 parent 23d3498 commit efde234

File tree

3 files changed

+6
-34
lines changed

3 files changed

+6
-34
lines changed

‎arch/arm/mach-omap2/control.c

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636

3737
static void __iomem *omap2_ctrl_base;
3838
static s16 omap2_ctrl_offset;
39-
static void __iomem *omap4_ctrl_pad_base;
4039
static struct regmap *omap2_ctrl_syscon;
4140

4241
#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM)
@@ -139,13 +138,9 @@ struct omap3_control_regs {
139138
static struct omap3_control_regs control_context;
140139
#endif /* CONFIG_ARCH_OMAP3 && CONFIG_PM */
141140

142-
#define OMAP4_CTRL_PAD_REGADDR(reg) (omap4_ctrl_pad_base + (reg))
143-
144-
void __init omap2_set_globals_control(void __iomem *ctrl,
145-
void __iomem *ctrl_pad)
141+
void __init omap2_set_globals_control(void __iomem *ctrl)
146142
{
147143
omap2_ctrl_base = ctrl;
148-
omap4_ctrl_pad_base = ctrl_pad;
149144
}
150145

151146
u8 omap_ctrl_readb(u16 offset)
@@ -218,23 +213,6 @@ void omap_ctrl_writel(u32 val, u16 offset)
218213
val);
219214
}
220215

221-
/*
222-
* On OMAP4 control pad are not addressable from control
223-
* core base. So the common omap_ctrl_read/write APIs breaks
224-
* Hence export separate APIs to manage the omap4 pad control
225-
* registers. This APIs will work only for OMAP4
226-
*/
227-
228-
u32 omap4_ctrl_pad_readl(u16 offset)
229-
{
230-
return readl_relaxed(OMAP4_CTRL_PAD_REGADDR(offset));
231-
}
232-
233-
void omap4_ctrl_pad_writel(u32 val, u16 offset)
234-
{
235-
writel_relaxed(val, OMAP4_CTRL_PAD_REGADDR(offset));
236-
}
237-
238216
#ifdef CONFIG_ARCH_OMAP3
239217

240218
/**

‎arch/arm/mach-omap2/control.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -443,11 +443,9 @@
443443
extern u8 omap_ctrl_readb(u16 offset);
444444
extern u16 omap_ctrl_readw(u16 offset);
445445
extern u32 omap_ctrl_readl(u16 offset);
446-
extern u32 omap4_ctrl_pad_readl(u16 offset);
447446
extern void omap_ctrl_writeb(u8 val, u16 offset);
448447
extern void omap_ctrl_writew(u16 val, u16 offset);
449448
extern void omap_ctrl_writel(u32 val, u16 offset);
450-
extern void omap4_ctrl_pad_writel(u32 val, u16 offset);
451449

452450
extern void omap3_save_scratchpad_contents(void);
453451
extern void omap3_clear_scratchpad_contents(void);
@@ -465,8 +463,7 @@ extern int omap3_ctrl_save_padconf(void);
465463
void omap3_ctrl_init(void);
466464
int omap2_control_base_init(void);
467465
int omap_control_init(void);
468-
extern void omap2_set_globals_control(void __iomem *ctrl,
469-
void __iomem *ctrl_pad);
466+
void omap2_set_globals_control(void __iomem *ctrl);
470467
void __init omap3_control_legacy_iomap_init(void);
471468
#else
472469
#define omap_ctrl_readb(x) 0

‎arch/arm/mach-omap2/io.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ void __init omap3_init_early(void)
443443
/* XXX: remove these once OMAP3 is DT only */
444444
if (!of_have_populated_dt()) {
445445
omap2_set_globals_control(
446-
OMAP2_L4_IO_ADDRESS(OMAP343X_CTRL_BASE), NULL);
446+
OMAP2_L4_IO_ADDRESS(OMAP343X_CTRL_BASE));
447447
omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP3430_PRM_BASE));
448448
omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(OMAP3430_CM_BASE),
449449
NULL);
@@ -631,8 +631,7 @@ void __init omap4430_init_early(void)
631631
{
632632
omap2_set_globals_tap(OMAP443X_CLASS,
633633
OMAP2_L4_IO_ADDRESS(OMAP443X_SCM_BASE));
634-
omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP443X_SCM_BASE),
635-
OMAP2_L4_IO_ADDRESS(OMAP443X_CTRL_BASE));
634+
omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP443X_SCM_BASE));
636635
omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP4430_PRCM_MPU_BASE));
637636
omap4xxx_check_revision();
638637
omap4xxx_check_features();
@@ -660,8 +659,7 @@ void __init omap5_init_early(void)
660659
{
661660
omap2_set_globals_tap(OMAP54XX_CLASS,
662661
OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE));
663-
omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE),
664-
OMAP2_L4_IO_ADDRESS(OMAP54XX_CTRL_BASE));
662+
omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE));
665663
omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE));
666664
omap4_pm_init_early();
667665
omap2_prcm_base_init();
@@ -686,8 +684,7 @@ void __init omap5_init_late(void)
686684
void __init dra7xx_init_early(void)
687685
{
688686
omap2_set_globals_tap(-1, OMAP2_L4_IO_ADDRESS(DRA7XX_TAP_BASE));
689-
omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE),
690-
OMAP2_L4_IO_ADDRESS(DRA7XX_CTRL_BASE));
687+
omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE));
691688
omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE));
692689
omap4_pm_init_early();
693690
omap2_prcm_base_init();

0 commit comments

Comments
 (0)