A standard "C" shift will be handled appropriately by the compiler
depending on the endian for the build. So we don't need the
explicit distinction in code
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
static cycle_t arc_read_gfrc(struct clocksource *cs)
{
unsigned long flags;
static cycle_t arc_read_gfrc(struct clocksource *cs)
{
unsigned long flags;
- union {
-#ifdef CONFIG_CPU_BIG_ENDIAN
- struct { u32 h, l; };
-#else
- struct { u32 l, h; };
-#endif
- cycle_t full;
- } stamp;
local_irq_save(flags);
__mcip_cmd(CMD_GFRC_READ_LO, 0);
local_irq_save(flags);
__mcip_cmd(CMD_GFRC_READ_LO, 0);
- stamp.l = read_aux_reg(ARC_REG_MCIP_READBACK);
+ l = read_aux_reg(ARC_REG_MCIP_READBACK);
__mcip_cmd(CMD_GFRC_READ_HI, 0);
__mcip_cmd(CMD_GFRC_READ_HI, 0);
- stamp.h = read_aux_reg(ARC_REG_MCIP_READBACK);
+ h = read_aux_reg(ARC_REG_MCIP_READBACK);
local_irq_restore(flags);
local_irq_restore(flags);
+ return (((cycle_t)h) << 32) | l;
}
static struct clocksource arc_counter_gfrc = {
}
static struct clocksource arc_counter_gfrc = {
static cycle_t arc_read_rtc(struct clocksource *cs)
{
unsigned long status;
static cycle_t arc_read_rtc(struct clocksource *cs)
{
unsigned long status;
- union {
-#ifdef CONFIG_CPU_BIG_ENDIAN
- struct { u32 high, low; };
-#else
- struct { u32 low, high; };
-#endif
- cycle_t full;
- } stamp;
/*
* hardware has an internal state machine which tracks readout of
/*
* hardware has an internal state machine which tracks readout of
* - high increments after low has been read
*/
do {
* - high increments after low has been read
*/
do {
- stamp.low = read_aux_reg(AUX_RTC_LOW);
- stamp.high = read_aux_reg(AUX_RTC_HIGH);
+ l = read_aux_reg(AUX_RTC_LOW);
+ h = read_aux_reg(AUX_RTC_HIGH);
status = read_aux_reg(AUX_RTC_CTRL);
} while (!(status & _BITUL(31)));
status = read_aux_reg(AUX_RTC_CTRL);
} while (!(status & _BITUL(31)));
+ return (((cycle_t)h) << 32) | l;
}
static struct clocksource arc_counter_rtc = {
}
static struct clocksource arc_counter_rtc = {