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

Commit a7073b8b authored Sep 19, 2007 by Russell King Committed by Russell King Oct 12, 2007

[ARM] pxa: mark pxa_set_cken deprecated



Allow the generic clock support code to fiddle with the CKEN register
and mark pxa_set_cken() deprecated.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent a88a447d

arch/arm/mach-pxa/generic.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -123,7 +123,7 @@ EXPORT_SYMBOL(pxa_gpio_set_value);
	/*		/*
	* Routine to safely enable or disable a clock in the CKEN		* Routine to safely enable or disable a clock in the CKEN
	*/		*/
	void pxa_set_cken(int clock, int enable)		void __pxa_set_cken(int clock, int enable)
	{		{
	unsigned long flags;		unsigned long flags;
	local_irq_save(flags);		local_irq_save(flags);
	@@ -136,7 +136,7 @@ void pxa_set_cken(int clock, int enable)
	local_irq_restore(flags);		local_irq_restore(flags);
	}		}

	EXPORT_SYMBOL(pxa_set_cken);		EXPORT_SYMBOL(__pxa_set_cken);

	/*		/*
	* Intel PXA2xx internal register mapping.		* Intel PXA2xx internal register mapping.

include/asm-arm/arch-pxa/hardware.h

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -116,7 +116,11 @@ extern void pxa_gpio_set_value(unsigned gpio, int value);
	/*		/*
	* Routine to enable or disable CKEN		* Routine to enable or disable CKEN
	*/		*/
	extern void pxa_set_cken(int clock, int enable);		static inline void __deprecated pxa_set_cken(int clock, int enable)
			{
			extern void __pxa_set_cken(int clock, int enable);
			__pxa_set_cken(clock, enable);
			}

	/*		/*
	* return current memory and LCD clock frequency in units of 10kHz		* return current memory and LCD clock frequency in units of 10kHz