diff options
| author | Haojian Zhuang <haojian.zhuang@linaro.org> | 2017-02-13 15:52:59 +0800 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2017-02-16 11:26:46 +0000 |
| commit | d164a0e31bf8aa5bc8f9a184a02648585ff4f0d7 (patch) | |
| tree | 9b5543748d8e392811274b644c52e21a9f9dda6c /ArmPlatformPkg | |
| parent | 31d7be0135b8e8b95508daa6484bebba6280af15 (diff) | |
| download | edk2-d164a0e31bf8aa5bc8f9a184a02648585ff4f0d7.tar.gz edk2-d164a0e31bf8aa5bc8f9a184a02648585ff4f0d7.tar.bz2 edk2-d164a0e31bf8aa5bc8f9a184a02648585ff4f0d7.zip | |
ArmPlatformPkg/PL061: remove duplicated PL061_GPIO_DATA_REG
PL061_GPIO_DATA_REG offset is referenced in PL061EffectiveAddress ()
already. So remove the duplicated reference when invoke PL061GetPins ()
or PL061SetPins ().
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Diffstat (limited to 'ArmPlatformPkg')
| -rw-r--r-- | ArmPlatformPkg/Drivers/PL061GpioDxe/PL061Gpio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ArmPlatformPkg/Drivers/PL061GpioDxe/PL061Gpio.c b/ArmPlatformPkg/Drivers/PL061GpioDxe/PL061Gpio.c index 0e2ea61ce8..ff8bb3be85 100644 --- a/ArmPlatformPkg/Drivers/PL061GpioDxe/PL061Gpio.c +++ b/ArmPlatformPkg/Drivers/PL061GpioDxe/PL061Gpio.c @@ -186,7 +186,7 @@ Get ( return EFI_INVALID_PARAMETER;
}
- if (PL061GetPins (RegisterBase + PL061_GPIO_DATA_REG, Offset)) {
+ if (PL061GetPins (RegisterBase, Offset)) {
*Value = 1;
} else {
*Value = 0;
@@ -239,14 +239,14 @@ Set ( // Set the corresponding direction bit to HIGH for output
MmioOr8 (RegisterBase + PL061_GPIO_DIR_REG, GPIO_PIN_MASK(Offset));
// Set the corresponding data bit to LOW for 0
- PL061SetPins (RegisterBase + PL061_GPIO_DATA_REG, GPIO_PIN_MASK(Offset), 0);
+ PL061SetPins (RegisterBase, GPIO_PIN_MASK(Offset), 0);
break;
case GPIO_MODE_OUTPUT_1:
// Set the corresponding direction bit to HIGH for output
MmioOr8 (RegisterBase + PL061_GPIO_DIR_REG, GPIO_PIN_MASK(Offset));
// Set the corresponding data bit to HIGH for 1
- PL061SetPins (RegisterBase + PL061_GPIO_DATA_REG, GPIO_PIN_MASK(Offset), 0xff);
+ PL061SetPins (RegisterBase, GPIO_PIN_MASK(Offset), 0xff);
break;
default:
@@ -297,7 +297,7 @@ GetMode ( // Check if it is input or output
if (MmioRead8 (RegisterBase + PL061_GPIO_DIR_REG) & GPIO_PIN_MASK(Offset)) {
// Pin set to output
- if (PL061GetPins (RegisterBase + PL061_GPIO_DATA_REG, GPIO_PIN_MASK(Offset))) {
+ if (PL061GetPins (RegisterBase, GPIO_PIN_MASK(Offset))) {
*Mode = GPIO_MODE_OUTPUT_1;
} else {
*Mode = GPIO_MODE_OUTPUT_0;
|