From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754199AbdDDMcJ (ORCPT ); Tue, 4 Apr 2017 08:32:09 -0400 Received: from mail-wr0-f177.google.com ([209.85.128.177]:34887 "EHLO mail-wr0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752518AbdDDMcG (ORCPT ); Tue, 4 Apr 2017 08:32:06 -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 v6.1 1/4] drm: bridge: dw-hdmi: Extract PHY interrupt setup to a function Date: Tue, 4 Apr 2017 14:31:56 +0200 Message-Id: <1491309119-24220-2-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1491309119-24220-1-git-send-email-narmstrong@baylibre.com> References: <1491309119-24220-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] Reviewed-by: Archit Taneja 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 v6.1 1/4] drm: bridge: dw-hdmi: Extract PHY interrupt setup to a function Date: Tue, 4 Apr 2017 14:31:56 +0200 Message-ID: <1491309119-24220-2-git-send-email-narmstrong@baylibre.com> References: <1491309119-24220-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-x22f.google.com (mail-wr0-x22f.google.com [IPv6:2a00:1450:400c:c0c::22f]) by gabe.freedesktop.org (Postfix) with ESMTPS id 544466E09C for ; Tue, 4 Apr 2017 12:32:06 +0000 (UTC) Received: by mail-wr0-x22f.google.com with SMTP id w11so211122705wrc.3 for ; Tue, 04 Apr 2017 05:32:06 -0700 (PDT) In-Reply-To: <1491309119-24220-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 cmVkIHRvIGR3X2hkbWlfc2V0dXBfaTJjXQpSZXZpZXdlZC1ieTogQXJjaGl0IFRhbmVqYSA8YXJj aGl0dEBjb2RlYXVyb3JhLm9yZz4KU2lnbmVkLW9mZi1ieTogTmVpbCBBcm1zdHJvbmcgPG5hcm1z dHJvbmdAYmF5bGlicmUuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9icmlkZ2Uvc3lub3BzeXMv ZHctaGRtaS5jIHwgNTEgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDIzIGluc2VydGlvbnMoKyksIDI4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9icmlkZ2Uvc3lub3BzeXMvZHctaGRtaS5jIGIvZHJpdmVycy9ncHUvZHJt L2JyaWRnZS9zeW5vcHN5cy9kdy1oZG1pLmMKaW5kZXggMzJmMDJlOS4uZmYxZmFlMyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9zeW5vcHN5cy9kdy1oZG1pLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2JyaWRnZS9zeW5vcHN5cy9kdy1oZG1pLmMKQEAgLTE1NTgsOCArMTU1OCw3 IEBAIHN0YXRpYyBpbnQgZHdfaGRtaV9zZXR1cChzdHJ1Y3QgZHdfaGRtaSAqaGRtaSwgc3RydWN0 IGRybV9kaXNwbGF5X21vZGUgKm1vZGUpCiAJcmV0dXJuIDA7CiB9CiAKLS8qIFdhaXQgdW50aWwg d2UgYXJlIHJlZ2lzdGVyZWQgdG8gZW5hYmxlIGludGVycnVwdHMgKi8KLXN0YXRpYyBpbnQgZHdf aGRtaV9mYl9yZWdpc3RlcmVkKHN0cnVjdCBkd19oZG1pICpoZG1pKQorc3RhdGljIHZvaWQgZHdf aGRtaV9zZXR1cF9pMmMoc3RydWN0IGR3X2hkbWkgKmhkbWkpCiB7CiAJaGRtaV93cml0ZWIoaGRt aSwgSERNSV9QSFlfSTJDTV9JTlRfQUREUl9ET05FX1BPTCwKIAkJICAgIEhETUlfUEhZX0kyQ01f SU5UX0FERFIpOwpAQCAtMTU2NywxNSArMTU2Niw2IEBAIHN0YXRpYyBpbnQgZHdfaGRtaV9mYl9y ZWdpc3RlcmVkKHN0cnVjdCBkd19oZG1pICpoZG1pKQogCWhkbWlfd3JpdGViKGhkbWksIEhETUlf UEhZX0kyQ01fQ1RMSU5UX0FERFJfTkFDX1BPTCB8CiAJCSAgICBIRE1JX1BIWV9JMkNNX0NUTElO VF9BRERSX0FSQklUUkFUSU9OX1BPTCwKIAkJICAgIEhETUlfUEhZX0kyQ01fQ1RMSU5UX0FERFIp OwotCi0JLyogZW5hYmxlIGNhYmxlIGhvdCBwbHVnIGlycSAqLwotCWhkbWlfd3JpdGViKGhkbWks IGhkbWktPnBoeV9tYXNrLCBIRE1JX1BIWV9NQVNLMCk7Ci0KLQkvKiBDbGVhciBIb3RwbHVnIGlu dGVycnVwdHMgKi8KLQloZG1pX3dyaXRlYihoZG1pLCBIRE1JX0lIX1BIWV9TVEFUMF9IUEQgfCBI RE1JX0lIX1BIWV9TVEFUMF9SWF9TRU5TRSwKLQkJICAgIEhETUlfSUhfUEhZX1NUQVQwKTsKLQot CXJldHVybiAwOwogfQogCiBzdGF0aWMgdm9pZCBpbml0aWFsaXplX2hkbWlfaWhfbXV0ZXMoc3Ry dWN0IGR3X2hkbWkgKmhkbWkpCkBAIC0xNjkzLDYgKzE2ODMsMjYgQEAgc3RhdGljIHZvaWQgZHdf aGRtaV91cGRhdGVfcGh5X21hc2soc3RydWN0IGR3X2hkbWkgKmhkbWkpCiAJCWhkbWlfd3JpdGVi KGhkbWksIGhkbWktPnBoeV9tYXNrLCBIRE1JX1BIWV9NQVNLMCk7CiB9CiAKK3N0YXRpYyB2b2lk IGR3X2hkbWlfcGh5X3NldHVwX2hwZChzdHJ1Y3QgZHdfaGRtaSAqaGRtaSkKK3sKKwkvKgorCSAq IENvbmZpZ3VyZSB0aGUgUEhZIFJYIFNFTlNFIGFuZCBIUEQgaW50ZXJydXB0cyBwb2xhcml0aWVz IGFuZCBjbGVhcgorCSAqIGFueSBwZW5kaW5nIGludGVycnVwdC4KKwkgKi8KKwloZG1pX3dyaXRl YihoZG1pLCBIRE1JX1BIWV9IUEQgfCBIRE1JX1BIWV9SWF9TRU5TRSwgSERNSV9QSFlfUE9MMCk7 CisJaGRtaV93cml0ZWIoaGRtaSwgSERNSV9JSF9QSFlfU1RBVDBfSFBEIHwgSERNSV9JSF9QSFlf U1RBVDBfUlhfU0VOU0UsCisJCSAgICBIRE1JX0lIX1BIWV9TVEFUMCk7CisKKwkvKiBFbmFibGUg Y2FibGUgaG90IHBsdWcgaXJxLiAqLworCWhkbWlfd3JpdGViKGhkbWksIGhkbWktPnBoeV9tYXNr LCBIRE1JX1BIWV9NQVNLMCk7CisKKwkvKiBDbGVhciBhbmQgdW5tdXRlIGludGVycnVwdHMuICov CisJaGRtaV93cml0ZWIoaGRtaSwgSERNSV9JSF9QSFlfU1RBVDBfSFBEIHwgSERNSV9JSF9QSFlf U1RBVDBfUlhfU0VOU0UsCisJCSAgICBIRE1JX0lIX1BIWV9TVEFUMCk7CisJaGRtaV93cml0ZWIo aGRtaSwgfihIRE1JX0lIX1BIWV9TVEFUMF9IUEQgfCBIRE1JX0lIX1BIWV9TVEFUMF9SWF9TRU5T RSksCisJCSAgICBIRE1JX0lIX01VVEVfUEhZX1NUQVQwKTsKK30KKwogc3RhdGljIGVudW0gZHJt X2Nvbm5lY3Rvcl9zdGF0dXMKIGR3X2hkbWlfY29ubmVjdG9yX2RldGVjdChzdHJ1Y3QgZHJtX2Nv bm5lY3RvciAqY29ubmVjdG9yLCBib29sIGZvcmNlKQogewpAQCAtMjIwNCwyOSArMjIxNCwxNCBA QCBzdGF0aWMgaW50IGR3X2hkbWlfZGV0ZWN0X3BoeShzdHJ1Y3QgZHdfaGRtaSAqaGRtaSkKIAkJ CWhkbWktPmRkYyA9IE5VTEw7CiAJfQogCi0JLyoKLQkgKiBDb25maWd1cmUgcmVnaXN0ZXJzIHJl bGF0ZWQgdG8gSERNSSBpbnRlcnJ1cHQKLQkgKiBnZW5lcmF0aW9uIGJlZm9yZSByZWdpc3Rlcmlu ZyBJUlEuCi0JICovCi0JaGRtaV93cml0ZWIoaGRtaSwgSERNSV9QSFlfSFBEIHwgSERNSV9QSFlf UlhfU0VOU0UsIEhETUlfUEhZX1BPTDApOwotCi0JLyogQ2xlYXIgSG90cGx1ZyBpbnRlcnJ1cHRz ICovCi0JaGRtaV93cml0ZWIoaGRtaSwgSERNSV9JSF9QSFlfU1RBVDBfSFBEIHwgSERNSV9JSF9Q SFlfU1RBVDBfUlhfU0VOU0UsCi0JCSAgICBIRE1JX0lIX1BIWV9TVEFUMCk7Ci0KIAloZG1pLT5i cmlkZ2UuZHJpdmVyX3ByaXZhdGUgPSBoZG1pOwogCWhkbWktPmJyaWRnZS5mdW5jcyA9ICZkd19o ZG1pX2JyaWRnZV9mdW5jczsKICNpZmRlZiBDT05GSUdfT0YKIAloZG1pLT5icmlkZ2Uub2Zfbm9k ZSA9IHBkZXYtPmRldi5vZl9ub2RlOwogI2VuZGlmCiAKLQlyZXQgPSBkd19oZG1pX2ZiX3JlZ2lz dGVyZWQoaGRtaSk7Ci0JaWYgKHJldCkKLQkJZ290byBlcnJfaWFoYjsKLQotCS8qIFVubXV0ZSBp bnRlcnJ1cHRzICovCi0JaGRtaV93cml0ZWIoaGRtaSwgfihIRE1JX0lIX1BIWV9TVEFUMF9IUEQg fCBIRE1JX0lIX1BIWV9TVEFUMF9SWF9TRU5TRSksCi0JCSAgICBIRE1JX0lIX01VVEVfUEhZX1NU QVQwKTsKKwlkd19oZG1pX3NldHVwX2kyYyhoZG1pKTsKKwlkd19oZG1pX3BoeV9zZXR1cF9ocGQo aGRtaSk7CiAKIAltZW1zZXQoJnBkZXZpbmZvLCAwLCBzaXplb2YocGRldmluZm8pKTsKIAlwZGV2 aW5mby5wYXJlbnQgPSBkZXY7Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: narmstrong@baylibre.com (Neil Armstrong) Date: Tue, 4 Apr 2017 14:31:56 +0200 Subject: [PATCH v6.1 1/4] drm: bridge: dw-hdmi: Extract PHY interrupt setup to a function In-Reply-To: <1491309119-24220-1-git-send-email-narmstrong@baylibre.com> References: <1491309119-24220-1-git-send-email-narmstrong@baylibre.com> Message-ID: <1491309119-24220-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] Reviewed-by: Archit Taneja 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