From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Date: Mon, 04 Jan 2016 14:38:35 +0000 Subject: Re: [PATCH RESEND 3/3] drm: adv7511: it's HPD, not HDP Message-Id: <3387173.Dbm3fEH4di@avalon> List-Id: References: <1451874827-2531-1-git-send-email-wsa@the-dreams.de> <1451874827-2531-3-git-send-email-wsa@the-dreams.de> In-Reply-To: <1451874827-2531-3-git-send-email-wsa@the-dreams.de> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Wolfram Sang Cc: linux-sh@vger.kernel.org, Daniel Vetter , Magnus Damm , dri-devel@lists.freedesktop.org, Simon Horman , Geert Uytterhoeven , Kuninori Morimoto Hi Wolfram, Thank you for the patch. On Monday 04 January 2016 03:33:47 Wolfram Sang wrote: > From: Wolfram Sang > > Fix this typo, consequently used over both files :) > > Signed-off-by: Wolfram Sang Reviewed-by: Laurent Pinchart > --- > drivers/gpu/drm/i2c/adv7511.c | 22 +++++++++++----------- > drivers/gpu/drm/i2c/adv7511.h | 12 ++++++------ > 2 files changed, 17 insertions(+), 17 deletions(-) > > diff --git a/drivers/gpu/drm/i2c/adv7511.c b/drivers/gpu/drm/i2c/adv7511.c > index 50a861b12346c4..c03c1ea53fd042 100644 > --- a/drivers/gpu/drm/i2c/adv7511.c > +++ b/drivers/gpu/drm/i2c/adv7511.c > @@ -378,16 +378,16 @@ static void adv7511_power_on(struct adv7511 *adv7511) > } > > /* > - * Per spec it is allowed to pulse the HDP signal to indicate that the > + * Per spec it is allowed to pulse the HPD signal to indicate that the > * EDID information has changed. Some monitors do this when they wakeup > - * from standby or are enabled. When the HDP goes low the adv7511 is > + * from standby or are enabled. When the HPD goes low the adv7511 is > * reset and the outputs are disabled which might cause the monitor to > - * go to standby again. To avoid this we ignore the HDP pin for the > + * go to standby again. To avoid this we ignore the HPD pin for the > * first few seconds after enabling the output. > */ > regmap_update_bits(adv7511->regmap, ADV7511_REG_POWER2, > - ADV7511_REG_POWER2_HDP_SRC_MASK, > - ADV7511_REG_POWER2_HDP_SRC_NONE); > + ADV7511_REG_POWER2_HPD_SRC_MASK, > + ADV7511_REG_POWER2_HPD_SRC_NONE); > > /* > * Most of the registers are reset during power down or when HPD is low. > @@ -421,9 +421,9 @@ static bool adv7511_hpd(struct adv7511 *adv7511) > if (ret < 0) > return false; > > - if (irq0 & ADV7511_INT0_HDP) { > + if (irq0 & ADV7511_INT0_HPD) { > regmap_write(adv7511->regmap, ADV7511_REG_INT(0), > - ADV7511_INT0_HDP); > + ADV7511_INT0_HPD); > return true; > } > > @@ -446,7 +446,7 @@ static int adv7511_irq_process(struct adv7511 *adv7511) > regmap_write(adv7511->regmap, ADV7511_REG_INT(0), irq0); > regmap_write(adv7511->regmap, ADV7511_REG_INT(1), irq1); > > - if (irq0 & ADV7511_INT0_HDP && adv7511->encoder) > + if (irq0 & ADV7511_INT0_HPD && adv7511->encoder) > drm_helper_hpd_irq_event(adv7511->encoder->dev); > > if (irq0 & ADV7511_INT0_EDID_READY || irq1 & ADV7511_INT1_DDC_ERROR) { > @@ -648,10 +648,10 @@ adv7511_encoder_detect(struct drm_encoder *encoder, > if (adv7511->status = connector_status_connected) > status = connector_status_disconnected; > } else { > - /* Renable HDP sensing */ > + /* Renable HPD sensing */ > regmap_update_bits(adv7511->regmap, ADV7511_REG_POWER2, > - ADV7511_REG_POWER2_HDP_SRC_MASK, > - ADV7511_REG_POWER2_HDP_SRC_BOTH); > + ADV7511_REG_POWER2_HPD_SRC_MASK, > + ADV7511_REG_POWER2_HPD_SRC_BOTH); > } > > adv7511->status = status; > diff --git a/drivers/gpu/drm/i2c/adv7511.h b/drivers/gpu/drm/i2c/adv7511.h > index 6599ed538426d6..38515b30cedfc8 100644 > --- a/drivers/gpu/drm/i2c/adv7511.h > +++ b/drivers/gpu/drm/i2c/adv7511.h > @@ -90,7 +90,7 @@ > #define ADV7511_CSC_ENABLE BIT(7) > #define ADV7511_CSC_UPDATE_MODE BIT(5) > > -#define ADV7511_INT0_HDP BIT(7) > +#define ADV7511_INT0_HPD BIT(7) > #define ADV7511_INT0_VSYNC BIT(5) > #define ADV7511_INT0_AUDIO_FIFO_FULL BIT(4) > #define ADV7511_INT0_EDID_READY BIT(2) > @@ -157,11 +157,11 @@ > #define ADV7511_PACKET_ENABLE_SPARE2 BIT(1) > #define ADV7511_PACKET_ENABLE_SPARE1 BIT(0) > > -#define ADV7511_REG_POWER2_HDP_SRC_MASK 0xc0 > -#define ADV7511_REG_POWER2_HDP_SRC_BOTH 0x00 > -#define ADV7511_REG_POWER2_HDP_SRC_HDP 0x40 > -#define ADV7511_REG_POWER2_HDP_SRC_CEC 0x80 > -#define ADV7511_REG_POWER2_HDP_SRC_NONE 0xc0 > +#define ADV7511_REG_POWER2_HPD_SRC_MASK 0xc0 > +#define ADV7511_REG_POWER2_HPD_SRC_BOTH 0x00 > +#define ADV7511_REG_POWER2_HPD_SRC_HPD 0x40 > +#define ADV7511_REG_POWER2_HPD_SRC_CEC 0x80 > +#define ADV7511_REG_POWER2_HPD_SRC_NONE 0xc0 > #define ADV7511_REG_POWER2_TDMS_ENABLE BIT(4) > #define ADV7511_REG_POWER2_GATE_INPUT_CLK BIT(0) -- Regards, Laurent Pinchart From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: Re: [PATCH RESEND 3/3] drm: adv7511: it's HPD, not HDP Date: Mon, 04 Jan 2016 16:38:35 +0200 Message-ID: <3387173.Dbm3fEH4di@avalon> References: <1451874827-2531-1-git-send-email-wsa@the-dreams.de> <1451874827-2531-3-git-send-email-wsa@the-dreams.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from galahad.ideasonboard.com (galahad.ideasonboard.com [185.26.127.97]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8B5026E453 for ; Mon, 4 Jan 2016 06:39:07 -0800 (PST) In-Reply-To: <1451874827-2531-3-git-send-email-wsa@the-dreams.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Wolfram Sang Cc: linux-sh@vger.kernel.org, Daniel Vetter , Magnus Damm , dri-devel@lists.freedesktop.org, Simon Horman , Geert Uytterhoeven , Kuninori Morimoto List-Id: dri-devel@lists.freedesktop.org SGkgV29sZnJhbSwKClRoYW5rIHlvdSBmb3IgdGhlIHBhdGNoLgoKT24gTW9uZGF5IDA0IEphbnVh cnkgMjAxNiAwMzozMzo0NyBXb2xmcmFtIFNhbmcgd3JvdGU6Cj4gRnJvbTogV29sZnJhbSBTYW5n IDx3c2ErcmVuZXNhc0BzYW5nLWVuZ2luZWVyaW5nLmNvbT4KPiAKPiBGaXggdGhpcyB0eXBvLCBj b25zZXF1ZW50bHkgdXNlZCBvdmVyIGJvdGggZmlsZXMgOikKPiAKPiBTaWduZWQtb2ZmLWJ5OiBX b2xmcmFtIFNhbmcgPHdzYStyZW5lc2FzQHNhbmctZW5naW5lZXJpbmcuY29tPgoKUmV2aWV3ZWQt Ynk6IExhdXJlbnQgUGluY2hhcnQgPGxhdXJlbnQucGluY2hhcnRAaWRlYXNvbmJvYXJkLmNvbT4K Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pMmMvYWR2NzUxMS5jIHwgMjIgKysrKysrKysrKyst LS0tLS0tLS0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTJjL2Fkdjc1MTEuaCB8IDEyICsrKysrKy0t LS0tLQo+ICAyIGZpbGVzIGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDE3IGRlbGV0aW9ucygt KQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTJjL2Fkdjc1MTEuYyBiL2RyaXZl cnMvZ3B1L2RybS9pMmMvYWR2NzUxMS5jCj4gaW5kZXggNTBhODYxYjEyMzQ2YzQuLmMwM2MxZWE1 M2ZkMDQyIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pMmMvYWR2NzUxMS5jCj4gKysr IGIvZHJpdmVycy9ncHUvZHJtL2kyYy9hZHY3NTExLmMKPiBAQCAtMzc4LDE2ICszNzgsMTYgQEAg c3RhdGljIHZvaWQgYWR2NzUxMV9wb3dlcl9vbihzdHJ1Y3QgYWR2NzUxMSAqYWR2NzUxMSkKPiAg CX0KPiAKPiAgCS8qCj4gLQkgKiBQZXIgc3BlYyBpdCBpcyBhbGxvd2VkIHRvIHB1bHNlIHRoZSBI RFAgc2lnbmFsIHRvIGluZGljYXRlIHRoYXQgdGhlCj4gKwkgKiBQZXIgc3BlYyBpdCBpcyBhbGxv d2VkIHRvIHB1bHNlIHRoZSBIUEQgc2lnbmFsIHRvIGluZGljYXRlIHRoYXQgdGhlCj4gIAkgKiBF RElEIGluZm9ybWF0aW9uIGhhcyBjaGFuZ2VkLiBTb21lIG1vbml0b3JzIGRvIHRoaXMgd2hlbiB0 aGV5IHdha2V1cAo+IC0JICogZnJvbSBzdGFuZGJ5IG9yIGFyZSBlbmFibGVkLiBXaGVuIHRoZSBI RFAgZ29lcyBsb3cgdGhlIGFkdjc1MTEgaXMKPiArCSAqIGZyb20gc3RhbmRieSBvciBhcmUgZW5h YmxlZC4gV2hlbiB0aGUgSFBEIGdvZXMgbG93IHRoZSBhZHY3NTExIGlzCj4gIAkgKiByZXNldCBh bmQgdGhlIG91dHB1dHMgYXJlIGRpc2FibGVkIHdoaWNoIG1pZ2h0IGNhdXNlIHRoZSBtb25pdG9y IHRvCj4gLQkgKiBnbyB0byBzdGFuZGJ5IGFnYWluLiBUbyBhdm9pZCB0aGlzIHdlIGlnbm9yZSB0 aGUgSERQIHBpbiBmb3IgdGhlCj4gKwkgKiBnbyB0byBzdGFuZGJ5IGFnYWluLiBUbyBhdm9pZCB0 aGlzIHdlIGlnbm9yZSB0aGUgSFBEIHBpbiBmb3IgdGhlCj4gIAkgKiBmaXJzdCBmZXcgc2Vjb25k cyBhZnRlciBlbmFibGluZyB0aGUgb3V0cHV0Lgo+ICAJICovCj4gIAlyZWdtYXBfdXBkYXRlX2Jp dHMoYWR2NzUxMS0+cmVnbWFwLCBBRFY3NTExX1JFR19QT1dFUjIsCj4gLQkJCSAgIEFEVjc1MTFf UkVHX1BPV0VSMl9IRFBfU1JDX01BU0ssCj4gLQkJCSAgIEFEVjc1MTFfUkVHX1BPV0VSMl9IRFBf U1JDX05PTkUpOwo+ICsJCQkgICBBRFY3NTExX1JFR19QT1dFUjJfSFBEX1NSQ19NQVNLLAo+ICsJ CQkgICBBRFY3NTExX1JFR19QT1dFUjJfSFBEX1NSQ19OT05FKTsKPiAKPiAgCS8qCj4gIAkgKiBN b3N0IG9mIHRoZSByZWdpc3RlcnMgYXJlIHJlc2V0IGR1cmluZyBwb3dlciBkb3duIG9yIHdoZW4g SFBEIGlzIGxvdy4KPiBAQCAtNDIxLDkgKzQyMSw5IEBAIHN0YXRpYyBib29sIGFkdjc1MTFfaHBk KHN0cnVjdCBhZHY3NTExICphZHY3NTExKQo+ICAJaWYgKHJldCA8IDApCj4gIAkJcmV0dXJuIGZh bHNlOwo+IAo+IC0JaWYgKGlycTAgJiBBRFY3NTExX0lOVDBfSERQKSB7Cj4gKwlpZiAoaXJxMCAm IEFEVjc1MTFfSU5UMF9IUEQpIHsKPiAgCQlyZWdtYXBfd3JpdGUoYWR2NzUxMS0+cmVnbWFwLCBB RFY3NTExX1JFR19JTlQoMCksCj4gLQkJCSAgICAgQURWNzUxMV9JTlQwX0hEUCk7Cj4gKwkJCSAg ICAgQURWNzUxMV9JTlQwX0hQRCk7Cj4gIAkJcmV0dXJuIHRydWU7Cj4gIAl9Cj4gCj4gQEAgLTQ0 Niw3ICs0NDYsNyBAQCBzdGF0aWMgaW50IGFkdjc1MTFfaXJxX3Byb2Nlc3Moc3RydWN0IGFkdjc1 MTEgKmFkdjc1MTEpCj4gIAlyZWdtYXBfd3JpdGUoYWR2NzUxMS0+cmVnbWFwLCBBRFY3NTExX1JF R19JTlQoMCksIGlycTApOwo+ICAJcmVnbWFwX3dyaXRlKGFkdjc1MTEtPnJlZ21hcCwgQURWNzUx MV9SRUdfSU5UKDEpLCBpcnExKTsKPiAKPiAtCWlmIChpcnEwICYgQURWNzUxMV9JTlQwX0hEUCAm JiBhZHY3NTExLT5lbmNvZGVyKQo+ICsJaWYgKGlycTAgJiBBRFY3NTExX0lOVDBfSFBEICYmIGFk djc1MTEtPmVuY29kZXIpCj4gIAkJZHJtX2hlbHBlcl9ocGRfaXJxX2V2ZW50KGFkdjc1MTEtPmVu Y29kZXItPmRldik7Cj4gCj4gIAlpZiAoaXJxMCAmIEFEVjc1MTFfSU5UMF9FRElEX1JFQURZIHx8 IGlycTEgJiBBRFY3NTExX0lOVDFfRERDX0VSUk9SKSB7Cj4gQEAgLTY0OCwxMCArNjQ4LDEwIEBA IGFkdjc1MTFfZW5jb2Rlcl9kZXRlY3Qoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyLAo+ICAJ CWlmIChhZHY3NTExLT5zdGF0dXMgPT0gY29ubmVjdG9yX3N0YXR1c19jb25uZWN0ZWQpCj4gIAkJ CXN0YXR1cyA9IGNvbm5lY3Rvcl9zdGF0dXNfZGlzY29ubmVjdGVkOwo+ICAJfSBlbHNlIHsKPiAt CQkvKiBSZW5hYmxlIEhEUCBzZW5zaW5nICovCj4gKwkJLyogUmVuYWJsZSBIUEQgc2Vuc2luZyAq Lwo+ICAJCXJlZ21hcF91cGRhdGVfYml0cyhhZHY3NTExLT5yZWdtYXAsIEFEVjc1MTFfUkVHX1BP V0VSMiwKPiAtCQkJCSAgIEFEVjc1MTFfUkVHX1BPV0VSMl9IRFBfU1JDX01BU0ssCj4gLQkJCQkg ICBBRFY3NTExX1JFR19QT1dFUjJfSERQX1NSQ19CT1RIKTsKPiArCQkJCSAgIEFEVjc1MTFfUkVH X1BPV0VSMl9IUERfU1JDX01BU0ssCj4gKwkJCQkgICBBRFY3NTExX1JFR19QT1dFUjJfSFBEX1NS Q19CT1RIKTsKPiAgCX0KPiAKPiAgCWFkdjc1MTEtPnN0YXR1cyA9IHN0YXR1czsKPiBkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2kyYy9hZHY3NTExLmggYi9kcml2ZXJzL2dwdS9kcm0vaTJj L2Fkdjc1MTEuaAo+IGluZGV4IDY1OTllZDUzODQyNmQ2Li4zODUxNWIzMGNlZGZjOCAxMDA2NDQK PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTJjL2Fkdjc1MTEuaAo+ICsrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pMmMvYWR2NzUxMS5oCj4gQEAgLTkwLDcgKzkwLDcgQEAKPiAgI2RlZmluZSBBRFY3NTEx X0NTQ19FTkFCTEUJCQlCSVQoNykKPiAgI2RlZmluZSBBRFY3NTExX0NTQ19VUERBVEVfTU9ERQkJ CUJJVCg1KQo+IAo+IC0jZGVmaW5lIEFEVjc1MTFfSU5UMF9IRFAJCQlCSVQoNykKPiArI2RlZmlu ZSBBRFY3NTExX0lOVDBfSFBECQkJQklUKDcpCj4gICNkZWZpbmUgQURWNzUxMV9JTlQwX1ZTWU5D CQkJQklUKDUpCj4gICNkZWZpbmUgQURWNzUxMV9JTlQwX0FVRElPX0ZJRk9fRlVMTAkJQklUKDQp Cj4gICNkZWZpbmUgQURWNzUxMV9JTlQwX0VESURfUkVBRFkJCQlCSVQoMikKPiBAQCAtMTU3LDEx ICsxNTcsMTEgQEAKPiAgI2RlZmluZSBBRFY3NTExX1BBQ0tFVF9FTkFCTEVfU1BBUkUyCQlCSVQo MSkKPiAgI2RlZmluZSBBRFY3NTExX1BBQ0tFVF9FTkFCTEVfU1BBUkUxCQlCSVQoMCkKPiAKPiAt I2RlZmluZSBBRFY3NTExX1JFR19QT1dFUjJfSERQX1NSQ19NQVNLCQkweGMwCj4gLSNkZWZpbmUg QURWNzUxMV9SRUdfUE9XRVIyX0hEUF9TUkNfQk9USAkJMHgwMAo+IC0jZGVmaW5lIEFEVjc1MTFf UkVHX1BPV0VSMl9IRFBfU1JDX0hEUAkJMHg0MAo+IC0jZGVmaW5lIEFEVjc1MTFfUkVHX1BPV0VS Ml9IRFBfU1JDX0NFQwkJMHg4MAo+IC0jZGVmaW5lIEFEVjc1MTFfUkVHX1BPV0VSMl9IRFBfU1JD X05PTkUJCTB4YzAKPiArI2RlZmluZSBBRFY3NTExX1JFR19QT1dFUjJfSFBEX1NSQ19NQVNLCQkw eGMwCj4gKyNkZWZpbmUgQURWNzUxMV9SRUdfUE9XRVIyX0hQRF9TUkNfQk9USAkJMHgwMAo+ICsj ZGVmaW5lIEFEVjc1MTFfUkVHX1BPV0VSMl9IUERfU1JDX0hQRAkJMHg0MAo+ICsjZGVmaW5lIEFE Vjc1MTFfUkVHX1BPV0VSMl9IUERfU1JDX0NFQwkJMHg4MAo+ICsjZGVmaW5lIEFEVjc1MTFfUkVH X1BPV0VSMl9IUERfU1JDX05PTkUJCTB4YzAKPiAgI2RlZmluZSBBRFY3NTExX1JFR19QT1dFUjJf VERNU19FTkFCTEUJCUJJVCg0KQo+ICAjZGVmaW5lIEFEVjc1MTFfUkVHX1BPV0VSMl9HQVRFX0lO UFVUX0NMSwlCSVQoMCkKCi0tIApSZWdhcmRzLAoKTGF1cmVudCBQaW5jaGFydAoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcg bGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK