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

Commit e66a022a authored by Ben Hutchings's avatar Ben Hutchings Committed by Krzysztof Hałasa
Browse files

arm/ixp4xx: Rename FREQ macro to avoid collisions 



FREQ is a ridiculously short name for a platform-specific macro in a
generic header, and it now conflicts with an enumeration in the
gspca/ov519 driver.

Also delete conditional reference to ixp4xx_get_board_tick_rate()
which is not defined anywhere.

Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarKrzysztof Hałasa <khc@pm.waw.pl>
parent 3c3a3b4c

arch/arm/mach-ixp4xx/common.c

+2 −2
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ static struct clocksource clocksource_ixp4xx = { 
	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,

};



unsigned long ixp4xx_timer_freq = FREQ;

unsigned long ixp4xx_timer_freq = IXP4XX_TIMER_FREQ;

EXPORT_SYMBOL(ixp4xx_timer_freq);

static void __init ixp4xx_clocksource_init(void)

{
@@ -496,7 +496,7 @@ static struct clock_event_device clockevent_ixp4xx = { 


static void __init ixp4xx_clockevent_init(void)

{

	clockevent_ixp4xx.mult = div_sc(FREQ, NSEC_PER_SEC,

	clockevent_ixp4xx.mult = div_sc(IXP4XX_TIMER_FREQ, NSEC_PER_SEC,

					clockevent_ixp4xx.shift);

	clockevent_ixp4xx.max_delta_ns =

		clockevent_delta2ns(0xfffffffe, &clockevent_ixp4xx);

arch/arm/mach-ixp4xx/include/mach/timex.h

+3 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 * 66.66... MHz. We do a convulted calculation of CLOCK_TICK_RATE b/c the

 * timer register ignores the bottom 2 bits of the LATCH value.

 */

#define FREQ 66666000

#define CLOCK_TICK_RATE (((FREQ / HZ & ~IXP4XX_OST_RELOAD_MASK) + 1) * HZ)

#define IXP4XX_TIMER_FREQ 66666000

#define CLOCK_TICK_RATE \

	(((IXP4XX_TIMER_FREQ / HZ & ~IXP4XX_OST_RELOAD_MASK) + 1) * HZ)

drivers/input/misc/ixp4xx-beeper.c

+1 −5
Original line number Diff line number Diff line
@@ -69,11 +69,7 @@ static int ixp4xx_spkr_event(struct input_dev *dev, unsigned int type, unsigned 
	}



	if (value > 20 && value < 32767)

#ifndef FREQ

		count = (ixp4xx_get_board_tick_rate() / (value * 4)) - 1;

#else

		count = (FREQ / (value * 4)) - 1;

#endif

		count = (IXP4XX_TIMER_FREQ / (value * 4)) - 1;



	ixp4xx_spkr_control(pin, count);