Skip to contentSkip to conversation

s5p-jpeg: Clear JPEG_CODEC_ON bits in sw reset function

PATCH New Tony K Nadackal 2 participants 3 messages Dec 17, 2014 – Feb 23, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s5p-jpeg: Clear JPEG_CODEC_ON bits in sw reset function

Bits EXYNOS4_DEC_MODE and EXYNOS4_ENC_MODE do not get cleared on software reset. These bits need to be cleared explicitly.

---
This patch is created and tested on top of linux-next-20141210. It can be cleanly applied on media-next and kgene/for-next.

 drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c +4 -0
index ab6d6f43..e53f13a 100644
@@ -21,6 +21,10 @@ void exynos4_jpeg_sw_reset(void __iomem *base)
 	unsigned int reg;
 
 	reg = readl(base + EXYNOS4_JPEG_CNTL_REG);
+	writel(reg & ~(EXYNOS4_DEC_MODE | EXYNOS4_ENC_MODE),
+				base + EXYNOS4_JPEG_CNTL_REG);
+
+	reg = readl(base + EXYNOS4_JPEG_CNTL_REG);
 	writel(reg & ~EXYNOS4_SOFT_RESET_HI, base + EXYNOS4_JPEG_CNTL_REG);
 
 	udelay(100);
Signature · 1 line
2.2.0
#1 lore raw

PATCH 1/1 s5p-jpeg: Clear JPEG_CODEC_ON bits in sw reset function

Gentle Reminder.

Thanks
Tony

Quoted 42 lines

-----Original Message-----
From: Tony K Nadackal [mailto:[email protected]]
Sent: Wednesday, December 17, 2014 11:52 AM
To: [email protected]; [email protected]; linux- [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Tony K Nadackal
Subject: [PATCH] [media] s5p-jpeg: Clear JPEG_CODEC_ON bits in sw reset function

Bits EXYNOS4_DEC_MODE and EXYNOS4_ENC_MODE do not get cleared on software reset. These bits need to be cleared explicitly.

---
This patch is created and tested on top of linux-next-20141210. It can be cleanly applied on media-next and kgene/for-next.

 drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c +4 -0
index ab6d6f43..e53f13a 100644
@@ -21,6 +21,10 @@ void exynos4_jpeg_sw_reset(void __iomem *base)
 	unsigned int reg;
 
 	reg = readl(base + EXYNOS4_JPEG_CNTL_REG);
+	writel(reg & ~(EXYNOS4_DEC_MODE | EXYNOS4_ENC_MODE),
+				base + EXYNOS4_JPEG_CNTL_REG);
+
+	reg = readl(base + EXYNOS4_JPEG_CNTL_REG);
 	writel(reg & ~EXYNOS4_SOFT_RESET_HI, base +
 EXYNOS4_JPEG_CNTL_REG);
 

udelay(100);
--
2.2.0

#2 lore raw

PATCH 1/1 s5p-jpeg: Clear JPEG_CODEC_ON bits in sw reset function

In reply to Tony K Nadackal

Hi,

Quoted 17 lines · Tony K Nadackal

Bits EXYNOS4_DEC_MODE and EXYNOS4_ENC_MODE do not get cleared on software reset. These bits need to be cleared explicitly.

---
This patch is created and tested on top of linux-next-20141210. It can be cleanly applied on media-next and kgene/for-next.

 drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c +0 -0
index ab6d6f43..e53f13a 100644

drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c void exynos4_jpeg_sw_reset(void __iomem *base) · line 27

Quoted 7 lines
drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c +4 -0
@@ -21,6 +21,10 @@ void exynos4_jpeg_sw_reset(void __iomem *base)
 	unsigned int reg;
 
 	reg = readl(base + EXYNOS4_JPEG_CNTL_REG);
+	writel(reg & ~(EXYNOS4_DEC_MODE | EXYNOS4_ENC_MODE),
+				base + EXYNOS4_JPEG_CNTL_REG);
+
+	reg = readl(base + EXYNOS4_JPEG_CNTL_REG);

Do we really need the second read? Wouldn't it also work as below ?

  	reg = readl(base + EXYNOS4_JPEG_CNTL_REG);

+ reg &= ~(EXYNOS4_DEC_MODE | EXYNOS4_ENC_MODE);
+ writel(reg, base + EXYNOS4_JPEG_CNTL_REG);

?

drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c void exynos4_jpeg_sw_reset(void __iomem *base) · line 30

Quoted 3 lines
drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c +0 -0
 	writel(reg & ~EXYNOS4_SOFT_RESET_HI, base + EXYNOS4_JPEG_CNTL_REG);
 
 	udelay(100);

--
Thanks,
Sylwester