From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2992614AbbHHQGK (ORCPT ); Sat, 8 Aug 2015 12:06:10 -0400 Received: from pandora.arm.linux.org.uk ([78.32.30.218]:45154 "EHLO pandora.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2992595AbbHHQGI (ORCPT ); Sat, 8 Aug 2015 12:06:08 -0400 In-Reply-To: <20150808160251.GM7557@n2100.arm.linux.org.uk> References: <20150808160251.GM7557@n2100.arm.linux.org.uk> From: Russell King To: linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Philipp Zabel , Andy Yan , Yakir Yang , Fabio Estevam , Sascha Hauer , Jon Nettleton , David Airlie Subject: [PATCH 09/12] drm: bridge/dw_hdmi: rename dw_hdmi_phy_enable_power() MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: Date: Sat, 08 Aug 2015 17:04:05 +0100 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org dw_hdmi_phy_enable_power() is not about enabling and disabling power. It is about allowing or preventing power-down mode being entered - the register is documented as "Power-down enable (active low 0b)." This can be seen as the bit has no effect when the HDMI phy is operational on iMX6 hardware. Rename the function to dw_hdmi_phy_enable_powerdown() to reflect the documentation, make it take a bool for the 'enable' argument, and invert the value to be written. Signed-off-by: Russell King --- drivers/gpu/drm/bridge/dw_hdmi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c index fbac8386552b..7b8a4e942a71 100644 --- a/drivers/gpu/drm/bridge/dw_hdmi.c +++ b/drivers/gpu/drm/bridge/dw_hdmi.c @@ -737,9 +737,9 @@ static int hdmi_phy_i2c_write(struct dw_hdmi *hdmi, unsigned short data, return 0; } -static void dw_hdmi_phy_enable_power(struct dw_hdmi *hdmi, u8 enable) +static void dw_hdmi_phy_enable_powerdown(struct dw_hdmi *hdmi, bool enable) { - hdmi_mask_writeb(hdmi, enable, HDMI_PHY_CONF0, + hdmi_mask_writeb(hdmi, !enable, HDMI_PHY_CONF0, HDMI_PHY_CONF0_PDZ_OFFSET, HDMI_PHY_CONF0_PDZ_MASK); } @@ -879,7 +879,7 @@ static int hdmi_phy_configure(struct dw_hdmi *hdmi, unsigned char prep, /* REMOVE CLK TERM */ hdmi_phy_i2c_write(hdmi, 0x8000, 0x05); /* CKCALCTRL */ - dw_hdmi_phy_enable_power(hdmi, 1); + dw_hdmi_phy_enable_powerdown(hdmi, false); /* toggle TMDS enable */ dw_hdmi_phy_enable_tmds(hdmi, 0); @@ -924,7 +924,7 @@ static int dw_hdmi_phy_init(struct dw_hdmi *hdmi) dw_hdmi_phy_sel_data_en_pol(hdmi, 1); dw_hdmi_phy_sel_interface_control(hdmi, 0); dw_hdmi_phy_enable_tmds(hdmi, 0); - dw_hdmi_phy_enable_power(hdmi, 0); + dw_hdmi_phy_enable_powerdown(hdmi, true); /* Enable CSC */ ret = hdmi_phy_configure(hdmi, 0, 8, cscon); @@ -1155,7 +1155,7 @@ static void dw_hdmi_phy_disable(struct dw_hdmi *hdmi) return; dw_hdmi_phy_enable_tmds(hdmi, 0); - dw_hdmi_phy_enable_power(hdmi, 0); + dw_hdmi_phy_enable_powerdown(hdmi, true); hdmi->phy_enabled = false; } -- 2.1.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Russell King Subject: [PATCH 09/12] drm: bridge/dw_hdmi: rename dw_hdmi_phy_enable_power() Date: Sat, 08 Aug 2015 17:04:05 +0100 Message-ID: References: <20150808160251.GM7557@n2100.arm.linux.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20150808160251.GM7557@n2100.arm.linux.org.uk> Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Fabio Estevam , Yakir Yang , Andy Yan List-Id: linux-rockchip.vger.kernel.org ZHdfaGRtaV9waHlfZW5hYmxlX3Bvd2VyKCkgaXMgbm90IGFib3V0IGVuYWJsaW5nIGFuZCBkaXNh YmxpbmcgcG93ZXIuCkl0IGlzIGFib3V0IGFsbG93aW5nIG9yIHByZXZlbnRpbmcgcG93ZXItZG93 biBtb2RlIGJlaW5nIGVudGVyZWQgLSB0aGUKcmVnaXN0ZXIgaXMgZG9jdW1lbnRlZCBhcyAiUG93 ZXItZG93biBlbmFibGUgKGFjdGl2ZSBsb3cgMGIpLiIKClRoaXMgY2FuIGJlIHNlZW4gYXMgdGhl IGJpdCBoYXMgbm8gZWZmZWN0IHdoZW4gdGhlIEhETUkgcGh5IGlzCm9wZXJhdGlvbmFsIG9uIGlN WDYgaGFyZHdhcmUuCgpSZW5hbWUgdGhlIGZ1bmN0aW9uIHRvIGR3X2hkbWlfcGh5X2VuYWJsZV9w b3dlcmRvd24oKSB0byByZWZsZWN0IHRoZQpkb2N1bWVudGF0aW9uLCBtYWtlIGl0IHRha2UgYSBi b29sIGZvciB0aGUgJ2VuYWJsZScgYXJndW1lbnQsIGFuZCBpbnZlcnQKdGhlIHZhbHVlIHRvIGJl IHdyaXR0ZW4uCgpTaWduZWQtb2ZmLWJ5OiBSdXNzZWxsIEtpbmcgPHJtaytrZXJuZWxAYXJtLmxp bnV4Lm9yZy51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYnJpZGdlL2R3X2hkbWkuYyB8IDEwICsr KysrLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9kd19oZG1pLmMgYi9kcml2ZXJz L2dwdS9kcm0vYnJpZGdlL2R3X2hkbWkuYwppbmRleCBmYmFjODM4NjU1MmIuLjdiOGE0ZTk0MmE3 MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9kd19oZG1pLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2JyaWRnZS9kd19oZG1pLmMKQEAgLTczNyw5ICs3MzcsOSBAQCBzdGF0aWMg aW50IGhkbWlfcGh5X2kyY193cml0ZShzdHJ1Y3QgZHdfaGRtaSAqaGRtaSwgdW5zaWduZWQgc2hv cnQgZGF0YSwKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIHZvaWQgZHdfaGRtaV9waHlfZW5hYmxl X3Bvd2VyKHN0cnVjdCBkd19oZG1pICpoZG1pLCB1OCBlbmFibGUpCitzdGF0aWMgdm9pZCBkd19o ZG1pX3BoeV9lbmFibGVfcG93ZXJkb3duKHN0cnVjdCBkd19oZG1pICpoZG1pLCBib29sIGVuYWJs ZSkKIHsKLQloZG1pX21hc2tfd3JpdGViKGhkbWksIGVuYWJsZSwgSERNSV9QSFlfQ09ORjAsCisJ aGRtaV9tYXNrX3dyaXRlYihoZG1pLCAhZW5hYmxlLCBIRE1JX1BIWV9DT05GMCwKIAkJCSBIRE1J X1BIWV9DT05GMF9QRFpfT0ZGU0VULAogCQkJIEhETUlfUEhZX0NPTkYwX1BEWl9NQVNLKTsKIH0K QEAgLTg3OSw3ICs4NzksNyBAQCBzdGF0aWMgaW50IGhkbWlfcGh5X2NvbmZpZ3VyZShzdHJ1Y3Qg ZHdfaGRtaSAqaGRtaSwgdW5zaWduZWQgY2hhciBwcmVwLAogCS8qIFJFTU9WRSBDTEsgVEVSTSAq LwogCWhkbWlfcGh5X2kyY193cml0ZShoZG1pLCAweDgwMDAsIDB4MDUpOyAgLyogQ0tDQUxDVFJM ICovCiAKLQlkd19oZG1pX3BoeV9lbmFibGVfcG93ZXIoaGRtaSwgMSk7CisJZHdfaGRtaV9waHlf ZW5hYmxlX3Bvd2VyZG93bihoZG1pLCBmYWxzZSk7CiAKIAkvKiB0b2dnbGUgVE1EUyBlbmFibGUg Ki8KIAlkd19oZG1pX3BoeV9lbmFibGVfdG1kcyhoZG1pLCAwKTsKQEAgLTkyNCw3ICs5MjQsNyBA QCBzdGF0aWMgaW50IGR3X2hkbWlfcGh5X2luaXQoc3RydWN0IGR3X2hkbWkgKmhkbWkpCiAJCWR3 X2hkbWlfcGh5X3NlbF9kYXRhX2VuX3BvbChoZG1pLCAxKTsKIAkJZHdfaGRtaV9waHlfc2VsX2lu dGVyZmFjZV9jb250cm9sKGhkbWksIDApOwogCQlkd19oZG1pX3BoeV9lbmFibGVfdG1kcyhoZG1p LCAwKTsKLQkJZHdfaGRtaV9waHlfZW5hYmxlX3Bvd2VyKGhkbWksIDApOworCQlkd19oZG1pX3Bo eV9lbmFibGVfcG93ZXJkb3duKGhkbWksIHRydWUpOwogCiAJCS8qIEVuYWJsZSBDU0MgKi8KIAkJ cmV0ID0gaGRtaV9waHlfY29uZmlndXJlKGhkbWksIDAsIDgsIGNzY29uKTsKQEAgLTExNTUsNyAr MTE1NSw3IEBAIHN0YXRpYyB2b2lkIGR3X2hkbWlfcGh5X2Rpc2FibGUoc3RydWN0IGR3X2hkbWkg KmhkbWkpCiAJCXJldHVybjsKIAogCWR3X2hkbWlfcGh5X2VuYWJsZV90bWRzKGhkbWksIDApOwot CWR3X2hkbWlfcGh5X2VuYWJsZV9wb3dlcihoZG1pLCAwKTsKKwlkd19oZG1pX3BoeV9lbmFibGVf cG93ZXJkb3duKGhkbWksIHRydWUpOwogCiAJaGRtaS0+cGh5X2VuYWJsZWQgPSBmYWxzZTsKIH0K LS0gCjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmk+kernel@arm.linux.org.uk (Russell King) Date: Sat, 08 Aug 2015 17:04:05 +0100 Subject: [PATCH 09/12] drm: bridge/dw_hdmi: rename dw_hdmi_phy_enable_power() In-Reply-To: <20150808160251.GM7557@n2100.arm.linux.org.uk> References: <20150808160251.GM7557@n2100.arm.linux.org.uk> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org dw_hdmi_phy_enable_power() is not about enabling and disabling power. It is about allowing or preventing power-down mode being entered - the register is documented as "Power-down enable (active low 0b)." This can be seen as the bit has no effect when the HDMI phy is operational on iMX6 hardware. Rename the function to dw_hdmi_phy_enable_powerdown() to reflect the documentation, make it take a bool for the 'enable' argument, and invert the value to be written. Signed-off-by: Russell King --- drivers/gpu/drm/bridge/dw_hdmi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c index fbac8386552b..7b8a4e942a71 100644 --- a/drivers/gpu/drm/bridge/dw_hdmi.c +++ b/drivers/gpu/drm/bridge/dw_hdmi.c @@ -737,9 +737,9 @@ static int hdmi_phy_i2c_write(struct dw_hdmi *hdmi, unsigned short data, return 0; } -static void dw_hdmi_phy_enable_power(struct dw_hdmi *hdmi, u8 enable) +static void dw_hdmi_phy_enable_powerdown(struct dw_hdmi *hdmi, bool enable) { - hdmi_mask_writeb(hdmi, enable, HDMI_PHY_CONF0, + hdmi_mask_writeb(hdmi, !enable, HDMI_PHY_CONF0, HDMI_PHY_CONF0_PDZ_OFFSET, HDMI_PHY_CONF0_PDZ_MASK); } @@ -879,7 +879,7 @@ static int hdmi_phy_configure(struct dw_hdmi *hdmi, unsigned char prep, /* REMOVE CLK TERM */ hdmi_phy_i2c_write(hdmi, 0x8000, 0x05); /* CKCALCTRL */ - dw_hdmi_phy_enable_power(hdmi, 1); + dw_hdmi_phy_enable_powerdown(hdmi, false); /* toggle TMDS enable */ dw_hdmi_phy_enable_tmds(hdmi, 0); @@ -924,7 +924,7 @@ static int dw_hdmi_phy_init(struct dw_hdmi *hdmi) dw_hdmi_phy_sel_data_en_pol(hdmi, 1); dw_hdmi_phy_sel_interface_control(hdmi, 0); dw_hdmi_phy_enable_tmds(hdmi, 0); - dw_hdmi_phy_enable_power(hdmi, 0); + dw_hdmi_phy_enable_powerdown(hdmi, true); /* Enable CSC */ ret = hdmi_phy_configure(hdmi, 0, 8, cscon); @@ -1155,7 +1155,7 @@ static void dw_hdmi_phy_disable(struct dw_hdmi *hdmi) return; dw_hdmi_phy_enable_tmds(hdmi, 0); - dw_hdmi_phy_enable_power(hdmi, 0); + dw_hdmi_phy_enable_powerdown(hdmi, true); hdmi->phy_enabled = false; } -- 2.1.0