summaryrefslogtreecommitdiff
path: root/src/soc/nvidia
diff options
context:
space:
mode:
authorJacob Garber <jgarber1@ualberta.ca>2019-07-24 15:15:20 -0600
committerPatrick Georgi <pgeorgi@google.com>2019-07-26 12:58:57 +0000
commit83369fa6f4a25711fcec95cc43a79fa185443a83 (patch)
tree1f7e3c817836c5200309963d851a39295ddad1ee /src/soc/nvidia
parent532f205a05868c46519af1be7ceb083872644e16 (diff)
soc/nvidia/tegra124: Correct bitwise operators
We are treating reg_val like a bit mask, so use bitwise or instead of boolean or, and use |= to enable certain bits instead of overwriting the whole variable. Change-Id: Ia8c0ea5a58e25b3b58ed82caba20f8e49a30fb68 Signed-off-by: Jacob Garber <jgarber1@ualberta.ca> Found-by: Coverity CID 1287070 Reviewed-on: https://review.coreboot.org/c/coreboot/+/34560 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Diffstat (limited to 'src/soc/nvidia')
-rw-r--r--src/soc/nvidia/tegra124/sor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/soc/nvidia/tegra124/sor.c b/src/soc/nvidia/tegra124/sor.c
index 52b909e29d..1c151f50df 100644
--- a/src/soc/nvidia/tegra124/sor.c
+++ b/src/soc/nvidia/tegra124/sor.c
@@ -348,10 +348,10 @@ static void tegra_dc_sor_io_set_dpd(struct tegra_dc_sor_data *sor, int up)
}
reg_val = READL(pmc_base + APBDEV_PMC_IO_DPD2_REQ);
- reg_val &= ~(APBDEV_PMC_IO_DPD2_REQ_LVDS_ON ||
+ reg_val &= ~(APBDEV_PMC_IO_DPD2_REQ_LVDS_ON |
APBDEV_PMC_IO_DPD2_REQ_CODE_DEFAULT_MASK);
- reg_val = up ? APBDEV_PMC_IO_DPD2_REQ_LVDS_ON |
+ reg_val |= up ? APBDEV_PMC_IO_DPD2_REQ_LVDS_ON |
APBDEV_PMC_IO_DPD2_REQ_CODE_DPD_OFF :
APBDEV_PMC_IO_DPD2_REQ_LVDS_OFF |
APBDEV_PMC_IO_DPD2_REQ_CODE_DPD_ON;