From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754652AbdC3JJ1 (ORCPT ); Thu, 30 Mar 2017 05:09:27 -0400 Received: from mail-wr0-f170.google.com ([209.85.128.170]:36617 "EHLO mail-wr0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754017AbdC3JEq (ORCPT ); Thu, 30 Mar 2017 05:04:46 -0400 From: Neil Armstrong To: dri-devel@lists.freedesktop.org, laurent.pinchart+renesas@ideasonboard.com, architt@codeaurora.org Cc: Jose.Abreu@synopsys.com, kieran.bingham@ideasonboard.com, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Neil Armstrong Subject: [PATCH v5 1/6] drm: bridge: dw-hdmi: Extract PHY interrupt setup to a function Date: Thu, 30 Mar 2017 11:04:30 +0200 Message-Id: <1490864675-17336-2-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1490864675-17336-1-git-send-email-narmstrong@baylibre.com> References: <1490864675-17336-1-git-send-email-narmstrong@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Laurent Pinchart In preparation for adding PHY operations to handle RX SENSE and HPD, group all the PHY interrupt setup code in a single location and extract it to a separate function. Signed-off-by: Laurent Pinchart Reviewed-by: Jose Abreu [narmstrong: renamed dw_hdmi_fb_registered to dw_hdmi_setup_i2c] Signed-off-by: Neil Armstrong --- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 51 ++++++++++++++----------------- 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index 32f02e9..ff1fae3 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -1558,8 +1558,7 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode) return 0; } -/* Wait until we are registered to enable interrupts */ -static int dw_hdmi_fb_registered(struct dw_hdmi *hdmi) +static void dw_hdmi_setup_i2c(struct dw_hdmi *hdmi) { hdmi_writeb(hdmi, HDMI_PHY_I2CM_INT_ADDR_DONE_POL, HDMI_PHY_I2CM_INT_ADDR); @@ -1567,15 +1566,6 @@ static int dw_hdmi_fb_registered(struct dw_hdmi *hdmi) hdmi_writeb(hdmi, HDMI_PHY_I2CM_CTLINT_ADDR_NAC_POL | HDMI_PHY_I2CM_CTLINT_ADDR_ARBITRATION_POL, HDMI_PHY_I2CM_CTLINT_ADDR); - - /* enable cable hot plug irq */ - hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); - - /* Clear Hotplug interrupts */ - hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, - HDMI_IH_PHY_STAT0); - - return 0; } static void initialize_hdmi_ih_mutes(struct dw_hdmi *hdmi) @@ -1693,6 +1683,26 @@ static void dw_hdmi_update_phy_mask(struct dw_hdmi *hdmi) hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); } +static void dw_hdmi_phy_setup_hpd(struct dw_hdmi *hdmi) +{ + /* + * Configure the PHY RX SENSE and HPD interrupts polarities and clear + * any pending interrupt. + */ + hdmi_writeb(hdmi, HDMI_PHY_HPD | HDMI_PHY_RX_SENSE, HDMI_PHY_POL0); + hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, + HDMI_IH_PHY_STAT0); + + /* Enable cable hot plug irq. */ + hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); + + /* Clear and unmute interrupts. */ + hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, + HDMI_IH_PHY_STAT0); + hdmi_writeb(hdmi, ~(HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE), + HDMI_IH_MUTE_PHY_STAT0); +} + static enum drm_connector_status dw_hdmi_connector_detect(struct drm_connector *connector, bool force) { @@ -2204,29 +2214,14 @@ static int dw_hdmi_detect_phy(struct dw_hdmi *hdmi) hdmi->ddc = NULL; } - /* - * Configure registers related to HDMI interrupt - * generation before registering IRQ. - */ - hdmi_writeb(hdmi, HDMI_PHY_HPD | HDMI_PHY_RX_SENSE, HDMI_PHY_POL0); - - /* Clear Hotplug interrupts */ - hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, - HDMI_IH_PHY_STAT0); - hdmi->bridge.driver_private = hdmi; hdmi->bridge.funcs = &dw_hdmi_bridge_funcs; #ifdef CONFIG_OF hdmi->bridge.of_node = pdev->dev.of_node; #endif - ret = dw_hdmi_fb_registered(hdmi); - if (ret) - goto err_iahb; - - /* Unmute interrupts */ - hdmi_writeb(hdmi, ~(HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE), - HDMI_IH_MUTE_PHY_STAT0); + dw_hdmi_setup_i2c(hdmi); + dw_hdmi_phy_setup_hpd(hdmi); memset(&pdevinfo, 0, sizeof(pdevinfo)); pdevinfo.parent = dev; -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Neil Armstrong Subject: [PATCH v5 1/6] drm: bridge: dw-hdmi: Extract PHY interrupt setup to a function Date: Thu, 30 Mar 2017 11:04:30 +0200 Message-ID: <1490864675-17336-2-git-send-email-narmstrong@baylibre.com> References: <1490864675-17336-1-git-send-email-narmstrong@baylibre.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wr0-x22a.google.com (mail-wr0-x22a.google.com [IPv6:2a00:1450:400c:c0c::22a]) by gabe.freedesktop.org (Postfix) with ESMTPS id A1A566E032 for ; Thu, 30 Mar 2017 09:04:45 +0000 (UTC) Received: by mail-wr0-x22a.google.com with SMTP id l43so51881330wre.1 for ; Thu, 30 Mar 2017 02:04:45 -0700 (PDT) In-Reply-To: <1490864675-17336-1-git-send-email-narmstrong@baylibre.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org, laurent.pinchart+renesas@ideasonboard.com, architt@codeaurora.org Cc: Jose.Abreu@synopsys.com, Neil Armstrong , kieran.bingham@ideasonboard.com, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-media@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogTGF1cmVudCBQaW5jaGFydCA8bGF1cmVudC5waW5jaGFydCtyZW5lc2FzQGlkZWFzb25i b2FyZC5jb20+CgpJbiBwcmVwYXJhdGlvbiBmb3IgYWRkaW5nIFBIWSBvcGVyYXRpb25zIHRvIGhh bmRsZSBSWCBTRU5TRSBhbmQgSFBELApncm91cCBhbGwgdGhlIFBIWSBpbnRlcnJ1cHQgc2V0dXAg Y29kZSBpbiBhIHNpbmdsZSBsb2NhdGlvbiBhbmQgZXh0cmFjdAppdCB0byBhIHNlcGFyYXRlIGZ1 bmN0aW9uLgoKU2lnbmVkLW9mZi1ieTogTGF1cmVudCBQaW5jaGFydCA8bGF1cmVudC5waW5jaGFy dCtyZW5lc2FzQGlkZWFzb25ib2FyZC5jb20+ClJldmlld2VkLWJ5OiBKb3NlIEFicmV1IDxqb2Fi cmV1QHN5bm9wc3lzLmNvbT4KW25hcm1zdHJvbmc6IHJlbmFtZWQgZHdfaGRtaV9mYl9yZWdpc3Rl cmVkIHRvIGR3X2hkbWlfc2V0dXBfaTJjXQoKU2lnbmVkLW9mZi1ieTogTmVpbCBBcm1zdHJvbmcg PG5hcm1zdHJvbmdAYmF5bGlicmUuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9icmlkZ2Uvc3lu b3BzeXMvZHctaGRtaS5jIHwgNTEgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQogMSBm aWxlIGNoYW5nZWQsIDIzIGluc2VydGlvbnMoKyksIDI4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9icmlkZ2Uvc3lub3BzeXMvZHctaGRtaS5jIGIvZHJpdmVycy9n cHUvZHJtL2JyaWRnZS9zeW5vcHN5cy9kdy1oZG1pLmMKaW5kZXggMzJmMDJlOS4uZmYxZmFlMyAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9zeW5vcHN5cy9kdy1oZG1pLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9zeW5vcHN5cy9kdy1oZG1pLmMKQEAgLTE1NTgsOCAr MTU1OCw3IEBAIHN0YXRpYyBpbnQgZHdfaGRtaV9zZXR1cChzdHJ1Y3QgZHdfaGRtaSAqaGRtaSwg c3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUpCiAJcmV0dXJuIDA7CiB9CiAKLS8qIFdhaXQg dW50aWwgd2UgYXJlIHJlZ2lzdGVyZWQgdG8gZW5hYmxlIGludGVycnVwdHMgKi8KLXN0YXRpYyBp bnQgZHdfaGRtaV9mYl9yZWdpc3RlcmVkKHN0cnVjdCBkd19oZG1pICpoZG1pKQorc3RhdGljIHZv aWQgZHdfaGRtaV9zZXR1cF9pMmMoc3RydWN0IGR3X2hkbWkgKmhkbWkpCiB7CiAJaGRtaV93cml0 ZWIoaGRtaSwgSERNSV9QSFlfSTJDTV9JTlRfQUREUl9ET05FX1BPTCwKIAkJICAgIEhETUlfUEhZ X0kyQ01fSU5UX0FERFIpOwpAQCAtMTU2NywxNSArMTU2Niw2IEBAIHN0YXRpYyBpbnQgZHdfaGRt aV9mYl9yZWdpc3RlcmVkKHN0cnVjdCBkd19oZG1pICpoZG1pKQogCWhkbWlfd3JpdGViKGhkbWks IEhETUlfUEhZX0kyQ01fQ1RMSU5UX0FERFJfTkFDX1BPTCB8CiAJCSAgICBIRE1JX1BIWV9JMkNN X0NUTElOVF9BRERSX0FSQklUUkFUSU9OX1BPTCwKIAkJICAgIEhETUlfUEhZX0kyQ01fQ1RMSU5U X0FERFIpOwotCi0JLyogZW5hYmxlIGNhYmxlIGhvdCBwbHVnIGlycSAqLwotCWhkbWlfd3JpdGVi KGhkbWksIGhkbWktPnBoeV9tYXNrLCBIRE1JX1BIWV9NQVNLMCk7Ci0KLQkvKiBDbGVhciBIb3Rw bHVnIGludGVycnVwdHMgKi8KLQloZG1pX3dyaXRlYihoZG1pLCBIRE1JX0lIX1BIWV9TVEFUMF9I UEQgfCBIRE1JX0lIX1BIWV9TVEFUMF9SWF9TRU5TRSwKLQkJICAgIEhETUlfSUhfUEhZX1NUQVQw KTsKLQotCXJldHVybiAwOwogfQogCiBzdGF0aWMgdm9pZCBpbml0aWFsaXplX2hkbWlfaWhfbXV0 ZXMoc3RydWN0IGR3X2hkbWkgKmhkbWkpCkBAIC0xNjkzLDYgKzE2ODMsMjYgQEAgc3RhdGljIHZv aWQgZHdfaGRtaV91cGRhdGVfcGh5X21hc2soc3RydWN0IGR3X2hkbWkgKmhkbWkpCiAJCWhkbWlf d3JpdGViKGhkbWksIGhkbWktPnBoeV9tYXNrLCBIRE1JX1BIWV9NQVNLMCk7CiB9CiAKK3N0YXRp YyB2b2lkIGR3X2hkbWlfcGh5X3NldHVwX2hwZChzdHJ1Y3QgZHdfaGRtaSAqaGRtaSkKK3sKKwkv KgorCSAqIENvbmZpZ3VyZSB0aGUgUEhZIFJYIFNFTlNFIGFuZCBIUEQgaW50ZXJydXB0cyBwb2xh cml0aWVzIGFuZCBjbGVhcgorCSAqIGFueSBwZW5kaW5nIGludGVycnVwdC4KKwkgKi8KKwloZG1p X3dyaXRlYihoZG1pLCBIRE1JX1BIWV9IUEQgfCBIRE1JX1BIWV9SWF9TRU5TRSwgSERNSV9QSFlf UE9MMCk7CisJaGRtaV93cml0ZWIoaGRtaSwgSERNSV9JSF9QSFlfU1RBVDBfSFBEIHwgSERNSV9J SF9QSFlfU1RBVDBfUlhfU0VOU0UsCisJCSAgICBIRE1JX0lIX1BIWV9TVEFUMCk7CisKKwkvKiBF bmFibGUgY2FibGUgaG90IHBsdWcgaXJxLiAqLworCWhkbWlfd3JpdGViKGhkbWksIGhkbWktPnBo eV9tYXNrLCBIRE1JX1BIWV9NQVNLMCk7CisKKwkvKiBDbGVhciBhbmQgdW5tdXRlIGludGVycnVw dHMuICovCisJaGRtaV93cml0ZWIoaGRtaSwgSERNSV9JSF9QSFlfU1RBVDBfSFBEIHwgSERNSV9J SF9QSFlfU1RBVDBfUlhfU0VOU0UsCisJCSAgICBIRE1JX0lIX1BIWV9TVEFUMCk7CisJaGRtaV93 cml0ZWIoaGRtaSwgfihIRE1JX0lIX1BIWV9TVEFUMF9IUEQgfCBIRE1JX0lIX1BIWV9TVEFUMF9S WF9TRU5TRSksCisJCSAgICBIRE1JX0lIX01VVEVfUEhZX1NUQVQwKTsKK30KKwogc3RhdGljIGVu dW0gZHJtX2Nvbm5lY3Rvcl9zdGF0dXMKIGR3X2hkbWlfY29ubmVjdG9yX2RldGVjdChzdHJ1Y3Qg ZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLCBib29sIGZvcmNlKQogewpAQCAtMjIwNCwyOSArMjIx NCwxNCBAQCBzdGF0aWMgaW50IGR3X2hkbWlfZGV0ZWN0X3BoeShzdHJ1Y3QgZHdfaGRtaSAqaGRt aSkKIAkJCWhkbWktPmRkYyA9IE5VTEw7CiAJfQogCi0JLyoKLQkgKiBDb25maWd1cmUgcmVnaXN0 ZXJzIHJlbGF0ZWQgdG8gSERNSSBpbnRlcnJ1cHQKLQkgKiBnZW5lcmF0aW9uIGJlZm9yZSByZWdp c3RlcmluZyBJUlEuCi0JICovCi0JaGRtaV93cml0ZWIoaGRtaSwgSERNSV9QSFlfSFBEIHwgSERN SV9QSFlfUlhfU0VOU0UsIEhETUlfUEhZX1BPTDApOwotCi0JLyogQ2xlYXIgSG90cGx1ZyBpbnRl cnJ1cHRzICovCi0JaGRtaV93cml0ZWIoaGRtaSwgSERNSV9JSF9QSFlfU1RBVDBfSFBEIHwgSERN SV9JSF9QSFlfU1RBVDBfUlhfU0VOU0UsCi0JCSAgICBIRE1JX0lIX1BIWV9TVEFUMCk7Ci0KIAlo ZG1pLT5icmlkZ2UuZHJpdmVyX3ByaXZhdGUgPSBoZG1pOwogCWhkbWktPmJyaWRnZS5mdW5jcyA9 ICZkd19oZG1pX2JyaWRnZV9mdW5jczsKICNpZmRlZiBDT05GSUdfT0YKIAloZG1pLT5icmlkZ2Uu b2Zfbm9kZSA9IHBkZXYtPmRldi5vZl9ub2RlOwogI2VuZGlmCiAKLQlyZXQgPSBkd19oZG1pX2Zi X3JlZ2lzdGVyZWQoaGRtaSk7Ci0JaWYgKHJldCkKLQkJZ290byBlcnJfaWFoYjsKLQotCS8qIFVu bXV0ZSBpbnRlcnJ1cHRzICovCi0JaGRtaV93cml0ZWIoaGRtaSwgfihIRE1JX0lIX1BIWV9TVEFU MF9IUEQgfCBIRE1JX0lIX1BIWV9TVEFUMF9SWF9TRU5TRSksCi0JCSAgICBIRE1JX0lIX01VVEVf UEhZX1NUQVQwKTsKKwlkd19oZG1pX3NldHVwX2kyYyhoZG1pKTsKKwlkd19oZG1pX3BoeV9zZXR1 cF9ocGQoaGRtaSk7CiAKIAltZW1zZXQoJnBkZXZpbmZvLCAwLCBzaXplb2YocGRldmluZm8pKTsK IAlwZGV2aW5mby5wYXJlbnQgPSBkZXY7Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2 ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: narmstrong@baylibre.com (Neil Armstrong) Date: Thu, 30 Mar 2017 11:04:30 +0200 Subject: [PATCH v5 1/6] drm: bridge: dw-hdmi: Extract PHY interrupt setup to a function In-Reply-To: <1490864675-17336-1-git-send-email-narmstrong@baylibre.com> References: <1490864675-17336-1-git-send-email-narmstrong@baylibre.com> Message-ID: <1490864675-17336-2-git-send-email-narmstrong@baylibre.com> To: linus-amlogic@lists.infradead.org List-Id: linus-amlogic.lists.infradead.org From: Laurent Pinchart In preparation for adding PHY operations to handle RX SENSE and HPD, group all the PHY interrupt setup code in a single location and extract it to a separate function. Signed-off-by: Laurent Pinchart Reviewed-by: Jose Abreu [narmstrong: renamed dw_hdmi_fb_registered to dw_hdmi_setup_i2c] Signed-off-by: Neil Armstrong --- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 51 ++++++++++++++----------------- 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index 32f02e9..ff1fae3 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -1558,8 +1558,7 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode) return 0; } -/* Wait until we are registered to enable interrupts */ -static int dw_hdmi_fb_registered(struct dw_hdmi *hdmi) +static void dw_hdmi_setup_i2c(struct dw_hdmi *hdmi) { hdmi_writeb(hdmi, HDMI_PHY_I2CM_INT_ADDR_DONE_POL, HDMI_PHY_I2CM_INT_ADDR); @@ -1567,15 +1566,6 @@ static int dw_hdmi_fb_registered(struct dw_hdmi *hdmi) hdmi_writeb(hdmi, HDMI_PHY_I2CM_CTLINT_ADDR_NAC_POL | HDMI_PHY_I2CM_CTLINT_ADDR_ARBITRATION_POL, HDMI_PHY_I2CM_CTLINT_ADDR); - - /* enable cable hot plug irq */ - hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); - - /* Clear Hotplug interrupts */ - hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, - HDMI_IH_PHY_STAT0); - - return 0; } static void initialize_hdmi_ih_mutes(struct dw_hdmi *hdmi) @@ -1693,6 +1683,26 @@ static void dw_hdmi_update_phy_mask(struct dw_hdmi *hdmi) hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); } +static void dw_hdmi_phy_setup_hpd(struct dw_hdmi *hdmi) +{ + /* + * Configure the PHY RX SENSE and HPD interrupts polarities and clear + * any pending interrupt. + */ + hdmi_writeb(hdmi, HDMI_PHY_HPD | HDMI_PHY_RX_SENSE, HDMI_PHY_POL0); + hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, + HDMI_IH_PHY_STAT0); + + /* Enable cable hot plug irq. */ + hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); + + /* Clear and unmute interrupts. */ + hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, + HDMI_IH_PHY_STAT0); + hdmi_writeb(hdmi, ~(HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE), + HDMI_IH_MUTE_PHY_STAT0); +} + static enum drm_connector_status dw_hdmi_connector_detect(struct drm_connector *connector, bool force) { @@ -2204,29 +2214,14 @@ static int dw_hdmi_detect_phy(struct dw_hdmi *hdmi) hdmi->ddc = NULL; } - /* - * Configure registers related to HDMI interrupt - * generation before registering IRQ. - */ - hdmi_writeb(hdmi, HDMI_PHY_HPD | HDMI_PHY_RX_SENSE, HDMI_PHY_POL0); - - /* Clear Hotplug interrupts */ - hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, - HDMI_IH_PHY_STAT0); - hdmi->bridge.driver_private = hdmi; hdmi->bridge.funcs = &dw_hdmi_bridge_funcs; #ifdef CONFIG_OF hdmi->bridge.of_node = pdev->dev.of_node; #endif - ret = dw_hdmi_fb_registered(hdmi); - if (ret) - goto err_iahb; - - /* Unmute interrupts */ - hdmi_writeb(hdmi, ~(HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE), - HDMI_IH_MUTE_PHY_STAT0); + dw_hdmi_setup_i2c(hdmi); + dw_hdmi_phy_setup_hpd(hdmi); memset(&pdevinfo, 0, sizeof(pdevinfo)); pdevinfo.parent = dev; -- 1.9.1