diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2022-06-29 09:01:05 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-06-29 09:01:05 +0200 |
| commit | cc9b06f0c8f11c56fc706614ff96d237eecefd45 (patch) | |
| tree | 2d7505353c924ff2e526f311582b4eaabaa5d840 /drivers/clocksource | |
| parent | 97afea15a9f2f09c3009ad6e94ca9b40cc95b33a (diff) | |
| parent | 6f4f30b9c1fbd20ebf1b05843cf344fa2bb35f65 (diff) | |
| download | barebox-cc9b06f0c8f11c56fc706614ff96d237eecefd45.tar.gz barebox-cc9b06f0c8f11c56fc706614ff96d237eecefd45.tar.xz | |
Merge branch 'for-next/rpi4'
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/bcm2835.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clocksource/bcm2835.c b/drivers/clocksource/bcm2835.c index d84341fc40..d5d3e3477d 100644 --- a/drivers/clocksource/bcm2835.c +++ b/drivers/clocksource/bcm2835.c @@ -28,7 +28,8 @@ static uint64_t stc_read_cycles(void) static struct clocksource bcm2835_stc = { .read = stc_read_cycles, .mask = CLOCKSOURCE_MASK(32), - .priority = 80, + /* Give the architected timer precedence on AArch64 */ + .priority = IS_ENABLED(CONFIG_CPU_V8) ? 60 : 80, }; static int bcm2835_cs_probe(struct device_d *dev) |