Merge "fix(nxp-sfp): shift gpio register offsets by 2" into integration

This commit is contained in:
Manish Pandey 2024-08-06 16:04:22 +02:00 committed by TrustedFirmware Code Review
commit 0cd2056c78

View file

@ -28,8 +28,8 @@ int set_gpio_bit(uint32_t *gpio_base_addr,
ERROR("GPIO is not initialized.\n"); ERROR("GPIO is not initialized.\n");
return GPIO_FAILURE; return GPIO_FAILURE;
} }
/* Divide by 4 since we're operating on 32-bit pointer addresses. */
gpdir = gpio_base_addr + GPDIR_REG_OFFSET; gpdir = gpio_base_addr + (GPDIR_REG_OFFSET >> 2);
gpdat = gpio_base_addr + (GPDAT_REG_OFFSET >> 2); gpdat = gpio_base_addr + (GPDAT_REG_OFFSET >> 2);
/* /*
@ -67,8 +67,9 @@ int clr_gpio_bit(uint32_t *gpio_base_addr, uint32_t bit_num)
return GPIO_FAILURE; return GPIO_FAILURE;
} }
gpdir = gpio_base_addr + GPDIR_REG_OFFSET; /* Divide by 4 since we're operating on 32-bit pointer addresses. */
gpdat = gpio_base_addr + GPDAT_REG_OFFSET; gpdir = gpio_base_addr + (GPDIR_REG_OFFSET >> 2);
gpdat = gpio_base_addr + (GPDAT_REG_OFFSET >> 2);
/* /*
* Reset the corresponding bit in direction and data register * Reset the corresponding bit in direction and data register