diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2014-09-18 16:19:04 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2014-10-01 09:00:01 -0400 |
| commit | f68fdbe42539851f1bbf9a4dee5150f467a64c36 (patch) | |
| tree | fead78f1a97d946ae41fcf6ee1291ab9edbd67dd | |
| parent | 7a42e83d36d2d0a68622320900dc4e880b1d920a (diff) | |
| download | kernel_replicant_linux-f68fdbe42539851f1bbf9a4dee5150f467a64c36.tar.gz kernel_replicant_linux-f68fdbe42539851f1bbf9a4dee5150f467a64c36.tar.bz2 kernel_replicant_linux-f68fdbe42539851f1bbf9a4dee5150f467a64c36.zip | |
drm/radeon: fix register name to match internal name
no functional change.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/dce6_afmt.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/sid.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c b/drivers/gpu/drm/radeon/dce6_afmt.c index ab29f953a767..088d19c8f27e 100644 --- a/drivers/gpu/drm/radeon/dce6_afmt.c +++ b/drivers/gpu/drm/radeon/dce6_afmt.c @@ -289,7 +289,7 @@ void dce6_audio_enable(struct radeon_device *rdev, if (!pin) return; - WREG32_ENDPOINT(pin->offset, AZ_F0_CODEC_PIN_CONTROL_HOTPLUG_CONTROL, + WREG32_ENDPOINT(pin->offset, AZ_F0_CODEC_PIN_CONTROL_HOT_PLUG_CONTROL, enable ? AUDIO_ENABLED : 0); } diff --git a/drivers/gpu/drm/radeon/sid.h b/drivers/gpu/drm/radeon/sid.h index fd414d34d885..6635da9ec986 100644 --- a/drivers/gpu/drm/radeon/sid.h +++ b/drivers/gpu/drm/radeon/sid.h @@ -736,7 +736,7 @@ # define DESCRIPTION16(x) (((x) & 0xff) << 0) # define DESCRIPTION17(x) (((x) & 0xff) << 8) -#define AZ_F0_CODEC_PIN_CONTROL_HOTPLUG_CONTROL 0x54 +#define AZ_F0_CODEC_PIN_CONTROL_HOT_PLUG_CONTROL 0x54 # define AUDIO_ENABLED (1 << 31) #define AZ_F0_CODEC_PIN_CONTROL_RESPONSE_CONFIGURATION_DEFAULT 0x56 |