Skip to contentSkip to conversation

rockchip: video: fix taking the VOP device out of standby

PATCH New Philipp Tomsich 3 participants 6 messages Jun 9, 2017 – Jun 12, 2017

Subsystems (2)
Framebuffer layer Arm Rockchip
lore
Share & tools
lore

Philipp Tomsich

author
#0 lore raw

PATCH 1/1 rockchip: video: fix taking the VOP device out of standby

The VOP uses regular registers, so use setbits_le32/clrbits_le32 instead of rk_setbits/rk_clrbits.

Signed-off-by Philipp Tomsich <[email protected]>

---

 drivers/video/rockchip/rk3288_vop.c | 2 +-
 drivers/video/rockchip/rk_vop.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/video/rockchip/rk3288_vop.c +1 -1
index 758ebaf..3a5740a 100644
@@ -75,7 +75,7 @@ static int rk_vop_remove(struct udevice *dev)
 	struct rk_vop_priv *priv = dev_get_priv(dev);
         struct rk3288_vop *regs = priv->regs;
 
-	rk_setreg(&regs->sys_ctrl, V_STANDBY_EN(1));
+	setbits_le32(&regs->sys_ctrl, V_STANDBY_EN(1));
 
 	/* wait frame complete (60Hz) to enter standby */
 	mdelay(17);
drivers/video/rockchip/rk_vop.c +1 -1
index bac4def..c979049 100644
@@ -106,7 +106,7 @@ static void rkvop_enable_output(struct udevice *dev, enum vop_modes mode)
 	struct rk3288_vop *regs = priv->regs;
 
 	/* remove from standby */
-	rk_clrreg(&regs->sys_ctrl, V_STANDBY_EN(1));
+	clrbits_le32(&regs->sys_ctrl, V_STANDBY_EN(1));
 
 	switch (mode) {
 	case VOP_MODE_HDMI:
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 rockchip: video: fix taking the VOP device out of standby

Hi Philipp,

On Fri, 9 Jun 2017 18:24:37 +0200
Philipp Tomsich philipp.tomsich at theobroma-systems.com wrote:
...

drivers/video/rockchip/rk3288_vop.c static int rk_vop_remove(struct udevice *dev) · line 78

Quoted 8 lines
drivers/video/rockchip/rk3288_vop.c +1 -1
@@ -75,7 +75,7 @@ static int rk_vop_remove(struct udevice *dev)
 	struct rk_vop_priv *priv = dev_get_priv(dev);
         struct rk3288_vop *regs = priv->regs;
 
-	rk_setreg(&regs->sys_ctrl, V_STANDBY_EN(1));
+	setbits_le32(&regs->sys_ctrl, V_STANDBY_EN(1));

this patch doesn't apply on current master. Do you have more local patches applied?

--
Anatolij

author
#2 lore raw

PATCH 1/1 rockchip: video: fix taking the VOP device out of standby

Anatolij,

This is against u-boot-dm/master and a fix-up for the errors that Tom reported in response to Simon’s pull-request (for u-boot-dm).

I haven’t bothered to find out what tree the underlying patch came in through…

Philipp.

Quoted 21 lines · Anatolij Gustschin

Hi Philipp,

On Fri, 9 Jun 2017 18:24:37 +0200
Philipp Tomsich philipp.tomsich at theobroma-systems.com wrote:
...

drivers/video/rockchip/rk3288_vop.c static int rk_vop_remove(struct udevice *dev) · line 78

Quoted 8 lines
drivers/video/rockchip/rk3288_vop.c +1 -1
@@ -75,7 +75,7 @@ static int rk_vop_remove(struct udevice *dev)
 	struct rk_vop_priv *priv = dev_get_priv(dev);
        struct rk3288_vop *regs = priv->regs;
 
-	rk_setreg(&regs->sys_ctrl, V_STANDBY_EN(1));
+	setbits_le32(&regs->sys_ctrl, V_STANDBY_EN(1));

this patch doesn't apply on current master. Do you have more local patches applied?

--
Anatolij

#3 lore raw

PATCH 1/1 rockchip: video: fix taking the VOP device out of standby

Quoted 7 lines · On Fri, 9 Jun 2017 18:48:53 +0200 Dr. Philipp Tomsich philipp.tomsich at…

Anatolij,

This is against u-boot-dm/master and a fix-up for the errors that Tom reported in response to Simon’s pull-request (for u-boot-dm).

I haven’t bothered to find out what tree the underlying patch came in through…

Ah, okay, no problem. It should go through dm tree then.

--
Anatolij

#4 lore raw

PATCH 1/1 rockchip: video: fix taking the VOP device out of standby

In reply to Philipp Tomsich

Hi Simon,

Quoted 2 lines · On Fri, 9 Jun 2017 18:24:37 +0200 Philipp Tomsich philipp.tomsich at…

The VOP uses regular registers, so use setbits_le32/clrbits_le32 instead of rk_setbits/rk_clrbits.

these could be changed when applying, to match with the code:

s/rk_setbits/rk_setreg/
s/rk_clrbits/rk_clrreg/

no need to resubmit I think.

Quoted 1 line
Signed-off-by Philipp Tomsich <[email protected]>
Acked-by Anatolij Gustschin <[email protected]>

Thanks,
Anatolij

#5 lore raw

PATCH 1/1 rockchip: video: fix taking the VOP device out of standby

Hi,

Quoted 10 lines · Anatolij Gustschin

Hi Simon,

Quoted 2 lines · On Fri, 9 Jun 2017 18:24:37 +0200 Philipp Tomsich philipp.tomsich at…

The VOP uses regular registers, so use setbits_le32/clrbits_le32 instead of rk_setbits/rk_clrbits.

these could be changed when applying, to match with the code:

Quoted 8 lines

s/rk_setbits/rk_setreg/
s/rk_clrbits/rk_clrreg/

no need to resubmit I think.

Quoted 1 line
Signed-off-by Philipp Tomsich <[email protected]>
Acked-by Anatolij Gustschin <[email protected]>

Thank you both. I squashed this into the offending patch, in these two commits:

6b5a09aa38 rockchip: video: Take the vop device out of standby f418676e9a rockchip: video: Add remove() methods

Regards,
Simon