diff options
| author | Zhou Peng <eagle.zhou@nxp.com> | 2018-07-23 13:15:27 +0800 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
| commit | 09e322d07bbcd6e76d6b2c01adfaf5c104596b9e (patch) | |
| tree | 484b0eec03ef0ec8d21554350fdb3d6f641e8845 /drivers/mxc/hantro_845_h1 | |
| parent | ed85de28304caca344c1cb53f83b907cd93e55b9 (diff) | |
MLK-19005 - [i.MX8MM/Hantro]: Conformace test failed when decoder and encoder run simultaneously
Add assert operaiton in reset functions, include g1/g2/h1
Signed-off-by: Zhou Peng <eagle.zhou@nxp.com>
Diffstat (limited to 'drivers/mxc/hantro_845_h1')
| -rwxr-xr-x | drivers/mxc/hantro_845_h1/hx280enc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/mxc/hantro_845_h1/hx280enc.c b/drivers/mxc/hantro_845_h1/hx280enc.c index fca529060535..6523d6cfac51 100755 --- a/drivers/mxc/hantro_845_h1/hx280enc.c +++ b/drivers/mxc/hantro_845_h1/hx280enc.c @@ -71,6 +71,8 @@ static struct clk *hantro_clk_h1_bus; #define IRQF_DISABLED 0x0 #endif +#include <linux/delay.h> + /* module description */ MODULE_LICENSE("GPL"); MODULE_AUTHOR("Google Finland Oy"); @@ -188,6 +190,11 @@ static int hantro_h1_ctrlblk_reset(struct device *dev) iobase = (volatile u8 *)ioremap_nocache(BLK_CTL_BASE, 0x10000); val = ioread32(iobase); + val &= (~0x4); + iowrite32(val, iobase); // assert soft reset + udelay(2); + + val = ioread32(iobase); val |= 0x4; iowrite32(val, iobase); // release soft reset |