aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Thoelke <andrew.thoelke@arm.com>2014-05-16 12:02:12 +0100
committerAndrew Thoelke <andrew.thoelke@arm.com>2014-05-16 12:25:21 +0100
commit19ea62d398f9dcb4d25f0856b3f44fb4bd0c4b83 (patch)
tree8ddb6888db886165f8b132a01c71920dd2cf5b08
parentaf0a9618c9cd651059fd79959538b21ee3b85eea (diff)
parent42a52d89e78a0df5be1f64a3b2e394289413e498 (diff)
downloadarm-trusted-firmware-19ea62d398f9dcb4d25f0856b3f44fb4bd0c4b83.tar.gz
Merge pull request #68 from jcastillo-arm/jc/tf-issues/137
Change-Id: If8744c38c2d5c50caa7454b055e2ba418cf1e8bf
-rw-r--r--drivers/arm/gic/gic_v2.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/arm/gic/gic_v2.c b/drivers/arm/gic/gic_v2.c
index b011900..00464cb 100644
--- a/drivers/arm/gic/gic_v2.c
+++ b/drivers/arm/gic/gic_v2.c
@@ -214,49 +214,43 @@ void gicd_clr_igroupr(unsigned int base, unsigned int id)
void gicd_set_isenabler(unsigned int base, unsigned int id)
{
unsigned bit_num = id & ((1 << ISENABLER_SHIFT) - 1);
- unsigned int reg_val = gicd_read_isenabler(base, id);
- gicd_write_isenabler(base, id, reg_val | (1 << bit_num));
+ gicd_write_isenabler(base, id, (1 << bit_num));
}
void gicd_set_icenabler(unsigned int base, unsigned int id)
{
unsigned bit_num = id & ((1 << ICENABLER_SHIFT) - 1);
- unsigned int reg_val = gicd_read_icenabler(base, id);
- gicd_write_icenabler(base, id, reg_val & ~(1 << bit_num));
+ gicd_write_icenabler(base, id, (1 << bit_num));
}
void gicd_set_ispendr(unsigned int base, unsigned int id)
{
unsigned bit_num = id & ((1 << ISPENDR_SHIFT) - 1);
- unsigned int reg_val = gicd_read_ispendr(base, id);
- gicd_write_ispendr(base, id, reg_val | (1 << bit_num));
+ gicd_write_ispendr(base, id, (1 << bit_num));
}
void gicd_set_icpendr(unsigned int base, unsigned int id)
{
unsigned bit_num = id & ((1 << ICPENDR_SHIFT) - 1);
- unsigned int reg_val = gicd_read_icpendr(base, id);
- gicd_write_icpendr(base, id, reg_val & ~(1 << bit_num));
+ gicd_write_icpendr(base, id, (1 << bit_num));
}
void gicd_set_isactiver(unsigned int base, unsigned int id)
{
unsigned bit_num = id & ((1 << ISACTIVER_SHIFT) - 1);
- unsigned int reg_val = gicd_read_isactiver(base, id);
- gicd_write_isactiver(base, id, reg_val | (1 << bit_num));
+ gicd_write_isactiver(base, id, (1 << bit_num));
}
void gicd_set_icactiver(unsigned int base, unsigned int id)
{
unsigned bit_num = id & ((1 << ICACTIVER_SHIFT) - 1);
- unsigned int reg_val = gicd_read_icactiver(base, id);
- gicd_write_icactiver(base, id, reg_val & ~(1 << bit_num));
+ gicd_write_icactiver(base, id, (1 << bit_num));
}
/*