diff options
| author | Angel Pons <th3fanbus@gmail.com> | 2020-12-05 19:02:14 +0100 |
|---|---|---|
| committer | Hung-Te Lin <hungte@chromium.org> | 2020-12-17 13:55:23 +0000 |
| commit | 7f839f66ea552ad939a8a8de6d3afec2934f3868 (patch) | |
| tree | 180ed2a91b7719b7350172ef3345ecaef4e0485f /src | |
| parent | 4919028e6207e011f93488732ebaaf70b8377cd5 (diff) | |
| download | coreboot-7f839f66ea552ad939a8a8de6d3afec2934f3868.tar.xz | |
azalia: Use `azalia_exit_reset` function
Change-Id: I346040eb6531dac6c066a96cd73033aa17f026d0
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48356
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Diffstat (limited to 'src')
| -rw-r--r-- | src/device/azalia_device.c | 6 | ||||
| -rw-r--r-- | src/soc/intel/common/hda_verb.c | 4 | ||||
| -rw-r--r-- | src/southbridge/intel/bd82x6x/azalia.c | 3 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801gx/azalia.c | 3 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801ix/azalia.c | 3 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801jx/azalia.c | 3 | ||||
| -rw-r--r-- | src/southbridge/intel/ibexpeak/azalia.c | 3 | ||||
| -rw-r--r-- | src/southbridge/intel/lynxpoint/hda_verb.c | 2 |
8 files changed, 10 insertions, 17 deletions
diff --git a/src/device/azalia_device.c b/src/device/azalia_device.c index 9306e2ac37..5e9c6c9466 100644 --- a/src/device/azalia_device.c +++ b/src/device/azalia_device.c @@ -51,8 +51,7 @@ static int codec_detect(u8 *base) u32 reg32; int count; - /* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */ - if (azalia_set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) < 0) + if (azalia_exit_reset(base) < 0) goto no_codec; /* clear STATESTS bits (BAR + 0xe)[2:0] */ @@ -77,8 +76,7 @@ static int codec_detect(u8 *base) if (azalia_set_bits(base + HDA_GCTL_REG, 1, 0) < 0) goto no_codec; - /* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */ - if (azalia_set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) < 0) + if (azalia_exit_reset(base) < 0) goto no_codec; /* Read in Codec location (BAR + 0xe)[2..0] */ diff --git a/src/soc/intel/common/hda_verb.c b/src/soc/intel/common/hda_verb.c index e812ec5152..ecf5a5167d 100644 --- a/src/soc/intel/common/hda_verb.c +++ b/src/soc/intel/common/hda_verb.c @@ -12,7 +12,7 @@ int hda_codec_detect(u8 *base) u8 reg8; /* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */ - if (azalia_set_bits(base + HDA_GCTL_REG, HDA_GCTL_CRST, HDA_GCTL_CRST) < 0) + if (azalia_exit_reset(base) < 0) goto no_codec; /* Write back the value once reset bit is set. */ @@ -28,7 +28,7 @@ int hda_codec_detect(u8 *base) goto no_codec; /* Turn on the link and poll RESET# bit until it reads back as 1 */ - if (azalia_set_bits(base + HDA_GCTL_REG, HDA_GCTL_CRST, HDA_GCTL_CRST) < 0) + if (azalia_exit_reset(base) < 0) goto no_codec; /* Read in Codec location (BAR + 0xe)[2..0]*/ diff --git a/src/southbridge/intel/bd82x6x/azalia.c b/src/southbridge/intel/bd82x6x/azalia.c index fd0852828b..eab8e792a3 100644 --- a/src/southbridge/intel/bd82x6x/azalia.c +++ b/src/southbridge/intel/bd82x6x/azalia.c @@ -18,8 +18,7 @@ static int codec_detect(u8 *base) { u8 reg8; - /* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */ - if (azalia_set_bits(base + HDA_GCTL_REG, HDA_GCTL_CRST, HDA_GCTL_CRST) < 0) + if (azalia_exit_reset(base) < 0) goto no_codec; /* Write back the value once reset bit is set. */ diff --git a/src/southbridge/intel/i82801gx/azalia.c b/src/southbridge/intel/i82801gx/azalia.c index 31ff159d64..d1d373147e 100644 --- a/src/southbridge/intel/i82801gx/azalia.c +++ b/src/southbridge/intel/i82801gx/azalia.c @@ -19,8 +19,7 @@ static int codec_detect(u8 *base) if (azalia_set_bits(base + HDA_GCTL_REG, HDA_GCTL_CRST, 0) < 0) goto no_codec; - /* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */ - if (azalia_set_bits(base + HDA_GCTL_REG, HDA_GCTL_CRST, HDA_GCTL_CRST) < 0) + if (azalia_exit_reset(base) < 0) goto no_codec; /* Read in Codec location (BAR + 0xe)[2..0] */ diff --git a/src/southbridge/intel/i82801ix/azalia.c b/src/southbridge/intel/i82801ix/azalia.c index 2d8e6d4cba..558f9cda9c 100644 --- a/src/southbridge/intel/i82801ix/azalia.c +++ b/src/southbridge/intel/i82801ix/azalia.c @@ -19,8 +19,7 @@ static int codec_detect(u8 *base) if (azalia_set_bits(base + HDA_GCTL_REG, HDA_GCTL_CRST, 0) < 0) goto no_codec; - /* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */ - if (azalia_set_bits(base + HDA_GCTL_REG, HDA_GCTL_CRST, HDA_GCTL_CRST) < 0) + if (azalia_exit_reset(base) < 0) goto no_codec; /* Read in Codec location (BAR + 0xe)[2..0] */ diff --git a/src/southbridge/intel/i82801jx/azalia.c b/src/southbridge/intel/i82801jx/azalia.c index 3ac0a4a470..bea2e9000b 100644 --- a/src/southbridge/intel/i82801jx/azalia.c +++ b/src/southbridge/intel/i82801jx/azalia.c @@ -19,8 +19,7 @@ static int codec_detect(u8 *base) if (azalia_set_bits(base + HDA_GCTL_REG, HDA_GCTL_CRST, 0) < 0) goto no_codec; - /* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */ - if (azalia_set_bits(base + HDA_GCTL_REG, HDA_GCTL_CRST, HDA_GCTL_CRST) < 0) + if (azalia_exit_reset(base) < 0) goto no_codec; /* Read in Codec location (BAR + 0xe)[2..0] */ diff --git a/src/southbridge/intel/ibexpeak/azalia.c b/src/southbridge/intel/ibexpeak/azalia.c index 2510996bf8..1224792505 100644 --- a/src/southbridge/intel/ibexpeak/azalia.c +++ b/src/southbridge/intel/ibexpeak/azalia.c @@ -14,8 +14,7 @@ static int codec_detect(u8 *base) { u8 reg8; - /* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */ - if (azalia_set_bits(base + HDA_GCTL_REG, HDA_GCTL_CRST, HDA_GCTL_CRST) < 0) + if (azalia_exit_reset(base) < 0) goto no_codec; /* Write back the value once reset bit is set. */ diff --git a/src/southbridge/intel/lynxpoint/hda_verb.c b/src/southbridge/intel/lynxpoint/hda_verb.c index 9caffedbc8..f7eddf4e8e 100644 --- a/src/southbridge/intel/lynxpoint/hda_verb.c +++ b/src/southbridge/intel/lynxpoint/hda_verb.c @@ -13,7 +13,7 @@ int hda_codec_detect(u8 *base) u8 reg8; /* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */ - if (azalia_set_bits(base + HDA_GCTL_REG, HDA_GCTL_CRST, HDA_GCTL_CRST) < 0) + if (azalia_exit_reset(base) < 0) goto no_codec; /* Write back the value once reset bit is set. */ |