Commit 8e2644ff authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: omap2: remove unused functions 



These are a number of individual functions that were either never
used, or that had their last user removed in a prior cleanup.

Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 00a5d41e

arch/arm/mach-omap2/clockdomain.c

+0 −40
Original line number Diff line number Diff line
@@ -1043,46 +1043,6 @@ void clkdm_deny_idle(struct clockdomain *clkdm) 
	pwrdm_unlock(clkdm->pwrdm.ptr);

}



/**

 * clkdm_in_hwsup - is clockdomain @clkdm have hardware-supervised idle enabled?

 * @clkdm: struct clockdomain *

 *

 * Returns true if clockdomain @clkdm currently has

 * hardware-supervised idle enabled, or false if it does not or if

 * @clkdm is NULL.  It is only valid to call this function after

 * clkdm_init() has been called.  This function does not actually read

 * bits from the hardware; it instead tests an in-memory flag that is

 * changed whenever the clockdomain code changes the auto-idle mode.

 */

bool clkdm_in_hwsup(struct clockdomain *clkdm)

{

	bool ret;



	if (!clkdm)

		return false;



	ret = (clkdm->_flags & _CLKDM_FLAG_HWSUP_ENABLED) ? true : false;



	return ret;

}



/**

 * clkdm_missing_idle_reporting - can @clkdm enter autoidle even if in use?

 * @clkdm: struct clockdomain *

 *

 * Returns true if clockdomain @clkdm has the

 * CLKDM_MISSING_IDLE_REPORTING flag set, or false if not or @clkdm is

 * null.  More information is available in the documentation for the

 * CLKDM_MISSING_IDLE_REPORTING macro.

 */

bool clkdm_missing_idle_reporting(struct clockdomain *clkdm)

{

	if (!clkdm)

		return false;



	return (clkdm->flags & CLKDM_MISSING_IDLE_REPORTING) ? true : false;

}



/* Public autodep handling functions (deprecated) */



/**

arch/arm/mach-omap2/clockdomain.h

+0 −2
Original line number Diff line number Diff line
@@ -203,8 +203,6 @@ void clkdm_allow_idle_nolock(struct clockdomain *clkdm); 
void clkdm_allow_idle(struct clockdomain *clkdm);

void clkdm_deny_idle_nolock(struct clockdomain *clkdm);

void clkdm_deny_idle(struct clockdomain *clkdm);

bool clkdm_in_hwsup(struct clockdomain *clkdm);

bool clkdm_missing_idle_reporting(struct clockdomain *clkdm);



int clkdm_wakeup_nolock(struct clockdomain *clkdm);

int clkdm_wakeup(struct clockdomain *clkdm);

arch/arm/mach-omap2/common.h

+0 −3
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ static inline void omap5_realtime_timer_init(void) 
void omap2420_init_early(void);

void omap2430_init_early(void);

void omap3430_init_early(void);

void omap35xx_init_early(void);

void omap3630_init_early(void);

void omap3_init_early(void);	/* Do not use this one */

void am33xx_init_early(void);
@@ -133,8 +132,6 @@ void omap4430_init_early(void); 
void omap5_init_early(void);

void omap3_init_late(void);

void omap4430_init_late(void);

void omap2420_init_late(void);

void omap2430_init_late(void);

void ti81xx_init_late(void);

void am33xx_init_late(void);

void omap5_init_late(void);

arch/arm/mach-omap2/control.c

+0 −73
Original line number Diff line number Diff line
@@ -226,68 +226,7 @@ void omap3_ctrl_write_boot_mode(u8 bootmode) 


#endif



/**

 * omap_ctrl_write_dsp_boot_addr - set boot address for a remote processor

 * @bootaddr: physical address of the boot loader

 *

 * Set boot address for the boot loader of a supported processor

 * when a power ON sequence occurs.

 */

void omap_ctrl_write_dsp_boot_addr(u32 bootaddr)

{

	u32 offset = cpu_is_omap243x() ? OMAP243X_CONTROL_IVA2_BOOTADDR :

		     cpu_is_omap34xx() ? OMAP343X_CONTROL_IVA2_BOOTADDR :

		     cpu_is_omap44xx() ? OMAP4_CTRL_MODULE_CORE_DSP_BOOTADDR :

		     soc_is_omap54xx() ? OMAP4_CTRL_MODULE_CORE_DSP_BOOTADDR :

		     0;



	if (!offset) {

		pr_err("%s: unsupported omap type\n", __func__);

		return;

	}



	omap_ctrl_writel(bootaddr, offset);

}



/**

 * omap_ctrl_write_dsp_boot_mode - set boot mode for a remote processor

 * @bootmode: 8-bit value to pass to some boot code

 *

 * Sets boot mode for the boot loader of a supported processor

 * when a power ON sequence occurs.

 */

void omap_ctrl_write_dsp_boot_mode(u8 bootmode)

{

	u32 offset = cpu_is_omap243x() ? OMAP243X_CONTROL_IVA2_BOOTMOD :

		     cpu_is_omap34xx() ? OMAP343X_CONTROL_IVA2_BOOTMOD :

		     0;



	if (!offset) {

		pr_err("%s: unsupported omap type\n", __func__);

		return;

	}



	omap_ctrl_writel(bootmode, offset);

}



#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM)

/*

 * Clears the scratchpad contents in case of cold boot-

 * called during bootup

 */

void omap3_clear_scratchpad_contents(void)

{

	u32 max_offset = OMAP343X_SCRATCHPAD_ROM_OFFSET;

	void __iomem *v_addr;

	u32 offset = 0;



	v_addr = OMAP2_L4_IO_ADDRESS(OMAP343X_SCRATCHPAD_ROM);

	if (omap3xxx_prm_clear_global_cold_reset()) {

		for ( ; offset <= max_offset; offset += 0x4)

			writel_relaxed(0x0, (v_addr + offset));

	}

}



/* Populate the scratchpad structure with restore structure */

void omap3_save_scratchpad_contents(void)

{
@@ -846,15 +785,3 @@ int __init omap_control_init(void) 
	return ret;



}
 


/**

 * omap3_control_legacy_iomap_init - legacy iomap init for clock providers

 *

 * Legacy iomap init for clock provider. Needed only by legacy boot mode,

 * where the base addresses are not parsed from DT, but still required

 * by the clock driver to be setup properly.

 */

void __init omap3_control_legacy_iomap_init(void)

{

	omap2_clk_legacy_provider_init(TI_CLKM_SCRM, omap2_ctrl_base);

}

arch/arm/mach-omap2/control.h

+0 −5
Original line number Diff line number Diff line
@@ -512,8 +512,6 @@ 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 omap3_save_scratchpad_contents(void);

extern void omap3_clear_scratchpad_contents(void);

extern void omap3_restore(void);

extern void omap3_restore_es3(void);

extern void omap3_restore_3630(void);
@@ -521,14 +519,11 @@ extern u32 omap3_arm_context[128]; 
extern void omap3_control_save_context(void);

extern void omap3_control_restore_context(void);

extern void omap3_ctrl_write_boot_mode(u8 bootmode);

extern void omap_ctrl_write_dsp_boot_addr(u32 bootaddr);

extern void omap_ctrl_write_dsp_boot_mode(u8 bootmode);

extern void omap3630_ctrl_disable_rta(void);

extern int omap3_ctrl_save_padconf(void);

void omap3_ctrl_init(void);

int omap2_control_base_init(void);

int omap_control_init(void);

void __init omap3_control_legacy_iomap_init(void);

#else

#define omap_ctrl_readb(x)		0

#define omap_ctrl_readw(x)		0