| From f198c768f1e44c6e644ab6be3a6d8e88b7846868 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Tue, 17 Jan 2017 10:29:08 +0200 |
| Subject: [PATCH 253/255] drm: bridge: dw-hdmi: Fix the name of the PHY reset |
| macros |
| |
| The PHY reset signal is controlled by bit PHYRSTZ in the MC_PHYRSTZ |
| register. The signal is active low on Gen1 PHYs and active high on Gen2 |
| PHYs. The driver toggles the signal high then low, which is correct for |
| all currently supported platforms, but the register values macros are |
| incorrectly named. Replace them with a single macro named after the bit, |
| and add a comment to the source code to explain the behaviour. |
| |
| The driver's behaviour isn't changed by this rename, the code will still |
| need to be fixed to support Gen1 PHYs. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Reviewed-by: Jose Abreu <joabreu@synopsys.com> |
| Signed-off-by: Archit Taneja <architt@codeaurora.org> |
| Link: http://patchwork.freedesktop.org/patch/msgid/20170117082910.27023-19-laurent.pinchart+renesas@ideasonboard.com |
| (cherry picked from commit 54d72737b098f3597c57693e1aa96699a21b11fe) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/gpu/drm/bridge/dw-hdmi.c | 6 +++--- |
| drivers/gpu/drm/bridge/dw-hdmi.h | 3 +-- |
| 2 files changed, 4 insertions(+), 5 deletions(-) |
| |
| --- a/drivers/gpu/drm/bridge/dw-hdmi.c |
| +++ b/drivers/gpu/drm/bridge/dw-hdmi.c |
| @@ -986,9 +986,9 @@ static int hdmi_phy_configure(struct dw_ |
| /* gen2 pddq */ |
| dw_hdmi_phy_gen2_pddq(hdmi, 1); |
| |
| - /* PHY reset */ |
| - hdmi_writeb(hdmi, HDMI_MC_PHYRSTZ_DEASSERT, HDMI_MC_PHYRSTZ); |
| - hdmi_writeb(hdmi, HDMI_MC_PHYRSTZ_ASSERT, HDMI_MC_PHYRSTZ); |
| + /* PHY reset. The reset signal is active high on Gen2 PHYs. */ |
| + hdmi_writeb(hdmi, HDMI_MC_PHYRSTZ_PHYRSTZ, HDMI_MC_PHYRSTZ); |
| + hdmi_writeb(hdmi, 0, HDMI_MC_PHYRSTZ); |
| |
| hdmi_writeb(hdmi, HDMI_MC_HEACPHY_RST_ASSERT, HDMI_MC_HEACPHY_RST); |
| |
| --- a/drivers/gpu/drm/bridge/dw-hdmi.h |
| +++ b/drivers/gpu/drm/bridge/dw-hdmi.h |
| @@ -989,8 +989,7 @@ enum { |
| HDMI_MC_FLOWCTRL_FEED_THROUGH_OFF_CSC_BYPASS = 0x0, |
| |
| /* MC_PHYRSTZ field values */ |
| - HDMI_MC_PHYRSTZ_ASSERT = 0x0, |
| - HDMI_MC_PHYRSTZ_DEASSERT = 0x1, |
| + HDMI_MC_PHYRSTZ_PHYRSTZ = 0x01, |
| |
| /* MC_HEACPHY_RST field values */ |
| HDMI_MC_HEACPHY_RST_ASSERT = 0x1, |
