diff options
author | Bin Meng <bmeng.cn@gmail.com> | 2019-02-26 01:52:19 -0800 |
---|---|---|
committer | Bin Meng <bmeng.cn@gmail.com> | 2019-03-11 22:55:01 +0800 |
commit | 7d0a53a40cee6e40c173b782f26f5a2317cf39b5 (patch) | |
tree | 4bf997affe156ab4757df57f031ad500a0278b47 | |
parent | d9b59fc9ae198785c1adce1462bd73ee56465d4e (diff) |
x86: Make sure i8254 is setup correctly before generating beeps
The i8254 timer control IO port (0x43) should be setup correctly
by using PIT counter 2 to generate beeps, however in U-Boot other
codes like TSC driver utilizes PIT for TSC frequency calibration
and configures the counter 2 to a different mode that does not
beep. Fix this by always ensuring the PIT counter 2 is correctly
initialized so that the i8254 beeper driver works as expected.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r-- | arch/x86/lib/i8254.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/lib/i8254.c b/arch/x86/lib/i8254.c index d0227954b1..0f97538910 100644 --- a/arch/x86/lib/i8254.c +++ b/arch/x86/lib/i8254.c @@ -51,6 +51,10 @@ int i8254_enable_beep(uint frequency_hz) if (!frequency_hz) return -EINVAL; + /* make sure i8254 is setup correctly before generating beeps */ + outb(PIT_CMD_CTR2 | PIT_CMD_BOTH | PIT_CMD_MODE3, + PIT_BASE + PIT_COMMAND); + i8254_set_beep_freq(frequency_hz); setio_8(SYSCTL_PORTB, PORTB_BEEP_ENABLE); |