Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efde2346 authored by Tero Kristo's avatar Tero Kristo
Browse files

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: default avatarTero Kristo <t-kristo@ti.com>
parent 23d34981

arch/arm/mach-omap2/control.c

+1 −23
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 


static void __iomem *omap2_ctrl_base;

static s16 omap2_ctrl_offset;

static void __iomem *omap4_ctrl_pad_base;

static struct regmap *omap2_ctrl_syscon;



#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM)
@@ -139,13 +138,9 @@ struct omap3_control_regs { 
static struct omap3_control_regs control_context;

#endif /* CONFIG_ARCH_OMAP3 && CONFIG_PM */



#define OMAP4_CTRL_PAD_REGADDR(reg)	(omap4_ctrl_pad_base + (reg))



void __init omap2_set_globals_control(void __iomem *ctrl,

				      void __iomem *ctrl_pad)

void __init omap2_set_globals_control(void __iomem *ctrl)

{

	omap2_ctrl_base = ctrl;

	omap4_ctrl_pad_base = ctrl_pad;

}



u8 omap_ctrl_readb(u16 offset)
@@ -218,23 +213,6 @@ void omap_ctrl_writel(u32 val, u16 offset) 
			     val);

}



/*

 * On OMAP4 control pad are not addressable from control

 * core base. So the common omap_ctrl_read/write APIs breaks

 * Hence export separate APIs to manage the omap4 pad control

 * registers. This APIs will work only for OMAP4

 */



u32 omap4_ctrl_pad_readl(u16 offset)

{

	return readl_relaxed(OMAP4_CTRL_PAD_REGADDR(offset));

}



void omap4_ctrl_pad_writel(u32 val, u16 offset)

{

	writel_relaxed(val, OMAP4_CTRL_PAD_REGADDR(offset));

}



#ifdef CONFIG_ARCH_OMAP3



/**

arch/arm/mach-omap2/control.h

+1 −4
Original line number Diff line number Diff line
@@ -443,11 +443,9 @@ 
extern u8 omap_ctrl_readb(u16 offset);

extern u16 omap_ctrl_readw(u16 offset);

extern u32 omap_ctrl_readl(u16 offset);

extern u32 omap4_ctrl_pad_readl(u16 offset);

extern void omap_ctrl_writeb(u8 val, u16 offset);

extern void omap_ctrl_writew(u16 val, u16 offset);

extern void omap_ctrl_writel(u32 val, u16 offset);

extern void omap4_ctrl_pad_writel(u32 val, u16 offset);



extern void omap3_save_scratchpad_contents(void);

extern void omap3_clear_scratchpad_contents(void);
@@ -465,8 +463,7 @@ extern int omap3_ctrl_save_padconf(void); 
void omap3_ctrl_init(void);

int omap2_control_base_init(void);

int omap_control_init(void);

extern void omap2_set_globals_control(void __iomem *ctrl,

				      void __iomem *ctrl_pad);

void omap2_set_globals_control(void __iomem *ctrl);

void __init omap3_control_legacy_iomap_init(void);

#else

#define omap_ctrl_readb(x)		0

arch/arm/mach-omap2/io.c

+4 −7
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ void __init omap3_init_early(void) 
	/* XXX: remove these once OMAP3 is DT only */

	if (!of_have_populated_dt()) {

		omap2_set_globals_control(

			OMAP2_L4_IO_ADDRESS(OMAP343X_CTRL_BASE), NULL);

			OMAP2_L4_IO_ADDRESS(OMAP343X_CTRL_BASE));

		omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP3430_PRM_BASE));

		omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(OMAP3430_CM_BASE),

				     NULL);
@@ -631,8 +631,7 @@ void __init omap4430_init_early(void) 
{

	omap2_set_globals_tap(OMAP443X_CLASS,

			      OMAP2_L4_IO_ADDRESS(OMAP443X_SCM_BASE));

	omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP443X_SCM_BASE),

				  OMAP2_L4_IO_ADDRESS(OMAP443X_CTRL_BASE));

	omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP443X_SCM_BASE));

	omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP4430_PRCM_MPU_BASE));

	omap4xxx_check_revision();

	omap4xxx_check_features();
@@ -660,8 +659,7 @@ void __init omap5_init_early(void) 
{

	omap2_set_globals_tap(OMAP54XX_CLASS,

			      OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE));

	omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE),

				  OMAP2_L4_IO_ADDRESS(OMAP54XX_CTRL_BASE));

	omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE));

	omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE));

	omap4_pm_init_early();

	omap2_prcm_base_init();
@@ -686,8 +684,7 @@ void __init omap5_init_late(void) 
void __init dra7xx_init_early(void)

{

	omap2_set_globals_tap(-1, OMAP2_L4_IO_ADDRESS(DRA7XX_TAP_BASE));

	omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE),

				  OMAP2_L4_IO_ADDRESS(DRA7XX_CTRL_BASE));

	omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE));

	omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE));

	omap4_pm_init_early();

	omap2_prcm_base_init();