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

Commit d60c3041 authored by John Stultz's avatar John Stultz Committed by John Stultz
Browse files

ia64: convert to clocksource_register_hz/khz 



This converts the ia64 clocksources to use clocksource_register_hz/khz

CC: Tony Luck <tony.luck@intel.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Tony Luck <tony.luck@intel.com> [clocksource_itc path]
Signed-off-by: default avatarJohn Stultz <johnstul@us.ibm.com>
parent b01cc1b0

arch/ia64/kernel/cyclone.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -31,8 +31,6 @@ static struct clocksource clocksource_cyclone = { 
        .rating         = 300,

        .rating         = 300,

        .read           = read_cyclone,

        .read           = read_cyclone,

        .mask           = (1LL << 40) - 1,

        .mask           = (1LL << 40) - 1,

        .mult           = 0, /*to be caluclated*/

        .shift          = 16,

        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,

        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,

};

};
@@ -118,9 +116,7 @@ int __init init_cyclone_clock(void) 
	/* initialize last tick */

	/* initialize last tick */

	cyclone_mc = cyclone_timer;

	cyclone_mc = cyclone_timer;

	clocksource_cyclone.fsys_mmio = cyclone_timer;

	clocksource_cyclone.fsys_mmio = cyclone_timer;

	clocksource_cyclone.mult = clocksource_hz2mult(CYCLONE_TIMER_FREQ,

	clocksource_register_hz(&clocksource_cyclone, CYCLONE_TIMER_FREQ);

						clocksource_cyclone.shift);

	clocksource_register(&clocksource_cyclone);





	return 0;

	return 0;

}

}

arch/ia64/kernel/time.c

+2 −7
Original line number Original line Diff line number Diff line
@@ -73,8 +73,6 @@ static struct clocksource clocksource_itc = { 
	.rating         = 350,

	.rating         = 350,

	.read           = itc_get_cycles,

	.read           = itc_get_cycles,

	.mask           = CLOCKSOURCE_MASK(64),

	.mask           = CLOCKSOURCE_MASK(64),

	.mult           = 0, /*to be calculated*/

	.shift          = 16,

	.flags          = CLOCK_SOURCE_IS_CONTINUOUS,

	.flags          = CLOCK_SOURCE_IS_CONTINUOUS,

#ifdef CONFIG_PARAVIRT

#ifdef CONFIG_PARAVIRT

	.resume		= paravirt_clocksource_resume,

	.resume		= paravirt_clocksource_resume,
@@ -374,11 +372,8 @@ ia64_init_itm (void) 
	ia64_cpu_local_tick();

	ia64_cpu_local_tick();





	if (!itc_clocksource) {

	if (!itc_clocksource) {

		/* Sort out mult/shift values: */

		clocksource_register_hz(&clocksource_itc,

		clocksource_itc.mult =

						local_cpu_data->itc_freq);

			clocksource_hz2mult(local_cpu_data->itc_freq,

						clocksource_itc.shift);

		clocksource_register(&clocksource_itc);

		itc_clocksource = &clocksource_itc;

		itc_clocksource = &clocksource_itc;

	}

	}

}

}

arch/ia64/sn/kernel/sn2/timer.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -33,8 +33,6 @@ static struct clocksource clocksource_sn2 = { 
        .rating         = 450,

        .rating         = 450,

        .read           = read_sn2,

        .read           = read_sn2,

        .mask           = (1LL << 55) - 1,

        .mask           = (1LL << 55) - 1,

        .mult           = 0,

        .shift          = 10,

        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,

        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,

};

};
@@ -57,9 +55,7 @@ ia64_sn_udelay (unsigned long usecs) 
void __init sn_timer_init(void)

void __init sn_timer_init(void)

{

{

	clocksource_sn2.fsys_mmio = RTC_COUNTER_ADDR;

	clocksource_sn2.fsys_mmio = RTC_COUNTER_ADDR;

	clocksource_sn2.mult = clocksource_hz2mult(sn_rtc_cycles_per_second,

	clocksource_register_hz(&clocksource_sn2, sn_rtc_cycles_per_second);

							clocksource_sn2.shift);

	clocksource_register(&clocksource_sn2);





	ia64_udelay = &ia64_sn_udelay;

	ia64_udelay = &ia64_sn_udelay;

}
 
}

drivers/char/hpet.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -84,8 +84,6 @@ static struct clocksource clocksource_hpet = { 
	.rating		= 250,

	.rating		= 250,

	.read		= read_hpet,

	.read		= read_hpet,

	.mask		= CLOCKSOURCE_MASK(64),

	.mask		= CLOCKSOURCE_MASK(64),

	.mult		= 0,		/* to be calculated */

	.shift		= 10,

	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,

	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,

};

};

static struct clocksource *hpet_clocksource;

static struct clocksource *hpet_clocksource;
@@ -934,9 +932,7 @@ int hpet_alloc(struct hpet_data *hdp) 
	if (!hpet_clocksource) {

	if (!hpet_clocksource) {

		hpet_mctr = (void __iomem *)&hpetp->hp_hpet->hpet_mc;

		hpet_mctr = (void __iomem *)&hpetp->hp_hpet->hpet_mc;

		CLKSRC_FSYS_MMIO_SET(clocksource_hpet.fsys_mmio, hpet_mctr);

		CLKSRC_FSYS_MMIO_SET(clocksource_hpet.fsys_mmio, hpet_mctr);

		clocksource_hpet.mult = clocksource_hz2mult(hpetp->hp_tick_freq,

		clocksource_register_hz(&clocksource_hpet, hpetp->hp_tick_freq);

						clocksource_hpet.shift);

		clocksource_register(&clocksource_hpet);

		hpetp->hp_clocksource = &clocksource_hpet;

		hpetp->hp_clocksource = &clocksource_hpet;

		hpet_clocksource = &clocksource_hpet;

		hpet_clocksource = &clocksource_hpet;

	}

	}