mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-18 10:35:55 +00:00
For each of the voltages that a card might support, make sure that the
socket also supports the voltage. Some XV cards have appeared on the scene (or cards that report they support XV), and in older machines that have sockets that do not support XV, we were bogusly trying to power them at XV rather than at 3.3V. Now, power up the card at the lowest voltage supported by both the card and the socket. MFC After: 3 days
This commit is contained in:
parent
e40dc9a60d
commit
1ab7d4c93d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=157092
@ -715,13 +715,13 @@ cbb_detect_voltage(device_t brdev)
|
||||
|
||||
psr = cbb_get(sc, CBB_SOCKET_STATE);
|
||||
|
||||
if (psr & CBB_STATE_5VCARD)
|
||||
if (psr & CBB_STATE_5VCARD && psr & CBB_STATE_5VSOCK)
|
||||
vol |= CARD_5V_CARD;
|
||||
if (psr & CBB_STATE_3VCARD)
|
||||
if (psr & CBB_STATE_3VCARD && psr & CBB_STATE_3VSOCK)
|
||||
vol |= CARD_3V_CARD;
|
||||
if (psr & CBB_STATE_XVCARD)
|
||||
if (psr & CBB_STATE_XVCARD && psr & CBB_STATE_XVSOCK)
|
||||
vol |= CARD_XV_CARD;
|
||||
if (psr & CBB_STATE_YVCARD)
|
||||
if (psr & CBB_STATE_YVCARD && psr & CBB_STATE_YVSOCK)
|
||||
vol |= CARD_YV_CARD;
|
||||
|
||||
return (vol);
|
||||
|
Loading…
Reference in New Issue
Block a user