mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-15 17:28:15 +00:00
d0a9b82b75
When fixing sandbox test for regmap_read_poll_timeout(), the
sandbox_timer_add_offset was introduced but only defined in sandbox code
thus generating warnings when used out of sandbox :
include/regmap.h:289:2: note: in expansion of macro 'regmap_read_poll_timeout_test'
regmap_read_poll_timeout_test(map, addr, val, cond, sleep_us, \
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/spi/meson_spifc.c:169:8: note: in expansion of macro 'regmap_read_poll_timeout'
ret = regmap_read_poll_timeout(spifc->regmap, REG_SLAVE, data,
^~~~~~~~~~~~~~~~~~~~~~~~
drivers/spi/meson_spifc.c: In function 'meson_spifc_txrx':
include/regmap.h:277:4: warning: implicit declaration of function 'sandbox_timer_add_offset' [-Wimplicit-function-declaration]
This fix adds a timer_test_add_offset() only defined in sandbox, and
renames the previous sandbox_timer_add_offset() to it.
Cc: Simon Glass <sjg@chromium.org>
Reported-by: Tom Rini <trini@konsulko.com>
Fixes: df9cf1cc08 ("test: dm: regmap: Fix the long test delay")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
70 lines
1.4 KiB
C
70 lines
1.4 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (C) 2015 Thomas Chou <thomas@wytron.com.tw>
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <dm.h>
|
|
#include <errno.h>
|
|
#include <timer.h>
|
|
#include <os.h>
|
|
|
|
#define SANDBOX_TIMER_RATE 1000000
|
|
|
|
/* system timer offset in ms */
|
|
static unsigned long sandbox_timer_offset;
|
|
|
|
void timer_test_add_offset(unsigned long offset)
|
|
{
|
|
sandbox_timer_offset += offset;
|
|
}
|
|
|
|
u64 notrace timer_early_get_count(void)
|
|
{
|
|
return os_get_nsec() / 1000 + sandbox_timer_offset * 1000;
|
|
}
|
|
|
|
unsigned long notrace timer_early_get_rate(void)
|
|
{
|
|
return SANDBOX_TIMER_RATE;
|
|
}
|
|
|
|
static notrace int sandbox_timer_get_count(struct udevice *dev, u64 *count)
|
|
{
|
|
*count = timer_early_get_count();
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int sandbox_timer_probe(struct udevice *dev)
|
|
{
|
|
struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
|
|
|
|
if (!uc_priv->clock_rate)
|
|
uc_priv->clock_rate = SANDBOX_TIMER_RATE;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct timer_ops sandbox_timer_ops = {
|
|
.get_count = sandbox_timer_get_count,
|
|
};
|
|
|
|
static const struct udevice_id sandbox_timer_ids[] = {
|
|
{ .compatible = "sandbox,timer" },
|
|
{ }
|
|
};
|
|
|
|
U_BOOT_DRIVER(sandbox_timer) = {
|
|
.name = "sandbox_timer",
|
|
.id = UCLASS_TIMER,
|
|
.of_match = sandbox_timer_ids,
|
|
.probe = sandbox_timer_probe,
|
|
.ops = &sandbox_timer_ops,
|
|
.flags = DM_FLAG_PRE_RELOC,
|
|
};
|
|
|
|
/* This is here in case we don't have a device tree */
|
|
U_BOOT_DEVICE(sandbox_timer_non_fdt) = {
|
|
.name = "sandbox_timer",
|
|
};
|