diff options
author | ian <ian@FreeBSD.org> | 2014-07-25 23:36:39 +0000 |
---|---|---|
committer | ian <ian@FreeBSD.org> | 2014-07-25 23:36:39 +0000 |
commit | 3a58a39d5211c822cd9704342d99f51e766455e0 (patch) | |
tree | 771e92da6ea93b1e461ca3fa4384e33259934576 /sys/arm/freescale | |
parent | 67c03a114548247f909c9d105e699826613d2ebe (diff) | |
download | FreeBSD-src-3a58a39d5211c822cd9704342d99f51e766455e0.zip FreeBSD-src-3a58a39d5211c822cd9704342d99f51e766455e0.tar.gz |
MFC r268401, r268495:
Pending interrupt status is cleared by writing to the ISR, not the data reg.
Use named constant rather than '0' to access the reset controller register.
Diffstat (limited to 'sys/arm/freescale')
-rw-r--r-- | sys/arm/freescale/imx/imx51_gpio.c | 2 | ||||
-rw-r--r-- | sys/arm/freescale/imx/imx6_mp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/arm/freescale/imx/imx51_gpio.c b/sys/arm/freescale/imx/imx51_gpio.c index 1c1eed1..8c43527 100644 --- a/sys/arm/freescale/imx/imx51_gpio.c +++ b/sys/arm/freescale/imx/imx51_gpio.c @@ -355,7 +355,7 @@ imx51_gpio_intr(void *arg) sc = arg; input = READ4(sc, IMX_GPIO_ISR_REG); value = input & READ4(sc, IMX_GPIO_IMR_REG); - WRITE4(sc, IMX_GPIO_DR_REG, input); + WRITE4(sc, IMX_GPIO_ISR_REG, input); if (!value) goto intr_done; diff --git a/sys/arm/freescale/imx/imx6_mp.c b/sys/arm/freescale/imx/imx6_mp.c index dfa435b..e6366dd 100644 --- a/sys/arm/freescale/imx/imx6_mp.c +++ b/sys/arm/freescale/imx/imx6_mp.c @@ -162,7 +162,7 @@ platform_mp_start_ap(void) ( 1 << (SRC_CONTROL_C1RST_SHIFT - 1 + i))); } - bus_space_write_4(fdtbus_bs_tag, src, 0, val); + bus_space_write_4(fdtbus_bs_tag, src, SRC_CONTROL_REG, val); armv7_sev(); |