From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Jones Subject: Re: [RESEND v2 03/10] gpio: stmpe: fix edge and rising/falling edge detection Date: Wed, 10 Aug 2016 09:29:10 +0100 Message-ID: <20160810082910.GI1581@dell> References: <1470814755-19447-1-git-send-email-patrice.chotard@st.com> <1470814755-19447-4-git-send-email-patrice.chotard@st.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <1470814755-19447-4-git-send-email-patrice.chotard@st.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: patrice.chotard@st.com Cc: gnurou@gmail.com, amelie.delaunay@st.com, vireshk@kernel.org, linus.walleij@linaro.org, linux-gpio@vger.kernel.org, thierry.reding@gmail.com, kernel@pengutronix.de, dinguyen@opensource.altera.com, shawnguo@kernel.org, shiraz.linux.kernel@gmail.com, linux-arm-kernel@lists.infradead.org List-Id: linux-gpio@vger.kernel.org T24gV2VkLCAxMCBBdWcgMjAxNiwgcGF0cmljZS5jaG90YXJkQHN0LmNvbSB3cm90ZToKCj4gRnJv bTogUGF0cmljZSBDaG90YXJkIDxwYXRyaWNlLmNob3RhcmRAc3QuY29tPgo+IAo+IEJ5IGNyb3Nz LWNoZWNraW5nIFNUTVBFIDYxMC84MDEvODExLzE2MDEvMjQwMS8yNDAzIGRhdGFzaGVldHMsCj4g aXQgYXBwZWFycyB0aGF0IGVkZ2UgZGV0ZWN0aW9uIGFuZCByaXNpbmcvZmFsbGluZyBlZGdlIGRl dGVjdGlvbgo+IGlzIG5vdCBzdXBwb3J0ZWQgYnkgYWxsIFNUTVBFIHZhcmlhbnQ6Cj4gCj4gICAg ICAgICAgICBHUElPICAgICAgICAgICAgICBHUElPCj4gICAgICAgRWRnZSBkZXRlY3Rpb24gICAg IHJpc2luZy9mYWxsaW5nCj4gICAgICAgICAgICAgICAgICAgICAgICAgIGVkZ2UgZGV0ZWN0aW9u Cj4gIDYxMCB8ICAgICAgWCAgICAgICAgfCAgICAgICAgIFggICAgICAgfAo+ICA4MDEgfCAgICAg ICAgICAgICAgIHwgICAgICAgICAgICAgICAgIHwKPiAgODExIHwgICAgICBYICAgICAgICB8ICAg ICAgICAgWCAgICAgICB8Cj4gMTYwMCB8ICAgICAgICAgICAgICAgfCAgICAgICAgICAgICAgICAg fAo+IDE2MDEgfCAgICAgIFggICAgICAgIHwgICAgICAgICBYICAgICAgIHwKPiAxODAxIHwgICAg ICAgICAgICAgICB8ICAgICAgICAgWCAgICAgICB8Cj4gMjQwMSB8ICAgICAgWCAgICAgICAgfCAg ICAgICAgIFggICAgICAgfAo+IDI0MDMgfCAgICAgIFggICAgICAgIHwgICAgICAgICBYICAgICAg IHwKPiAKPiBSZXdvcmsgc3RtcGVfZGJnX3Nob3dfb25lKCkgYW5kIHN0bXBlX2dwaW9faXJxIHRv IGNvcnJlY3RseQo+IHRha2UgdGhlc2UgY2FzZXMgaW50byBhY2NvdW50Lgo+IAo+IFNpZ25lZC1v ZmYtYnk6IFBhdHJpY2UgQ2hvdGFyZCA8cGF0cmljZS5jaG90YXJkQHN0LmNvbT4KPiBSZXZpZXdl ZC1ieTogTGludXMgV2FsbGVpaiA8bGludXMud2FsbGVpakBsaW5hcm8ub3JnPgo+IC0tLQo+ICBk cml2ZXJzL2dwaW8vZ3Bpby1zdG1wZS5jIHwgODUgKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDYwIGluc2VydGlvbnMoKyks IDI1IGRlbGV0aW9ucygtKQoKQXBwbGllZCwgdGhhbmtzLgoKPiBkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncGlvL2dwaW8tc3RtcGUuYyBiL2RyaXZlcnMvZ3Bpby9ncGlvLXN0bXBlLmMKPiBpbmRleCA1 MTk3ZWRmLi5iZmM5MThjIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3Bpby9ncGlvLXN0bXBlLmMK PiArKysgYi9kcml2ZXJzL2dwaW8vZ3Bpby1zdG1wZS5jCj4gQEAgLTIzMSwzOSArMjMxLDc0IEBA IHN0YXRpYyB2b2lkIHN0bXBlX2RiZ19zaG93X29uZShzdHJ1Y3Qgc2VxX2ZpbGUgKnMsCj4gIAkJ CSAgIGdwaW8sIGxhYmVsID86ICIobm9uZSkiLAo+ICAJCQkgICB2YWwgPyAiaGkiIDogImxvIik7 Cj4gIAl9IGVsc2Ugewo+IC0JCXU4IGVkZ2VfZGV0X3JlZyA9IHN0bXBlLT5yZWdzW1NUTVBFX0lE WF9HUEVEUl9NU0JdICsgbnVtX2JhbmtzIC0gMSAtIChvZmZzZXQgLyA4KTsKPiAtCQl1OCByaXNl X3JlZyA9IHN0bXBlLT5yZWdzW1NUTVBFX0lEWF9HUFJFUl9MU0JdIC0gKG9mZnNldCAvIDgpOwo+ IC0JCXU4IGZhbGxfcmVnID0gc3RtcGUtPnJlZ3NbU1RNUEVfSURYX0dQRkVSX0xTQl0gLSAob2Zm c2V0IC8gOCk7Cj4gLQkJdTggaXJxZW5fcmVnID0gc3RtcGUtPnJlZ3NbU1RNUEVfSURYX0lFR1BJ T1JfTFNCXSAtIChvZmZzZXQgLyA4KTsKPiAtCQlib29sIGVkZ2VfZGV0Owo+IC0JCWJvb2wgcmlz ZTsKPiAtCQlib29sIGZhbGw7Cj4gKwkJdTggZWRnZV9kZXRfcmVnOwo+ICsJCXU4IHJpc2VfcmVn Owo+ICsJCXU4IGZhbGxfcmVnOwo+ICsJCXU4IGlycWVuX3JlZzsKPiArCj4gKwkJY2hhciAqZWRn ZV9kZXRfdmFsdWVzW10gPSB7ImVkZ2UtaW5hY3RpdmUiLAo+ICsJCQkJCSAgICJlZGdlLWFzc2Vy dGVkIiwKPiArCQkJCQkgICAibm90LXN1cHBvcnRlZCJ9Owo+ICsJCWNoYXIgKnJpc2VfdmFsdWVz W10gPSB7Im5vLXJpc2luZy1lZGdlLWRldGVjdGlvbiIsCj4gKwkJCQkgICAgICAgInJpc2luZy1l ZGdlLWRldGVjdGlvbiIsCj4gKwkJCQkgICAgICAgIm5vdC1zdXBwb3J0ZWQifTsKPiArCQljaGFy ICpmYWxsX3ZhbHVlc1tdID0geyJuby1mYWxsaW5nLWVkZ2UtZGV0ZWN0aW9uIiwKPiArCQkJCSAg ICAgICAiZmFsbGluZy1lZGdlLWRldGVjdGlvbiIsCj4gKwkJCQkgICAgICAgIm5vdC1zdXBwb3J0 ZWQifTsKPiArCQkjZGVmaW5lIE5PVF9TVVBQT1JURURfSURYIDIKPiArCQl1OCBlZGdlX2RldCA9 IE5PVF9TVVBQT1JURURfSURYOwo+ICsJCXU4IHJpc2UgPSBOT1RfU1VQUE9SVEVEX0lEWDsKPiAr CQl1OCBmYWxsID0gTk9UX1NVUFBPUlRFRF9JRFg7Cj4gIAkJYm9vbCBpcnFlbjsKPiAgCj4gLQkJ cmV0ID0gc3RtcGVfcmVnX3JlYWQoc3RtcGUsIGVkZ2VfZGV0X3JlZyk7Cj4gLQkJaWYgKHJldCA8 IDApCj4gLQkJCXJldHVybjsKPiAtCQllZGdlX2RldCA9ICEhKHJldCAmIG1hc2spOwo+IC0JCXJl dCA9IHN0bXBlX3JlZ19yZWFkKHN0bXBlLCByaXNlX3JlZyk7Cj4gLQkJaWYgKHJldCA8IDApCj4g KwkJc3dpdGNoIChzdG1wZS0+cGFydG51bSkgewo+ICsJCWNhc2UgU1RNUEU2MTA6Cj4gKwkJY2Fz ZSBTVE1QRTgxMToKPiArCQljYXNlIFNUTVBFMTYwMToKPiArCQljYXNlIFNUTVBFMjQwMToKPiAr CQljYXNlIFNUTVBFMjQwMzoKPiArCQkJZWRnZV9kZXRfcmVnID0gc3RtcGUtPnJlZ3NbU1RNUEVf SURYX0dQRURSX01TQl0gKwo+ICsJCQkJICAgICAgIG51bV9iYW5rcyAtIDEgLSAob2Zmc2V0IC8g OCk7Cj4gKwkJCXJldCA9IHN0bXBlX3JlZ19yZWFkKHN0bXBlLCBlZGdlX2RldF9yZWcpOwo+ICsJ CQlpZiAocmV0IDwgMCkKPiArCQkJCXJldHVybjsKPiArCQkJZWRnZV9kZXQgPSAhIShyZXQgJiBt YXNrKTsKPiArCj4gKwkJY2FzZSBTVE1QRTE4MDE6Cj4gKwkJCXJpc2VfcmVnID0gc3RtcGUtPnJl Z3NbU1RNUEVfSURYX0dQUkVSX0xTQl0gLQo+ICsJCQkJICAgKG9mZnNldCAvIDgpOwo+ICsJCQlm YWxsX3JlZyA9IHN0bXBlLT5yZWdzW1NUTVBFX0lEWF9HUEZFUl9MU0JdIC0KPiArCQkJCSAgIChv ZmZzZXQgLyA4KTsKPiArCQkJcmV0ID0gc3RtcGVfcmVnX3JlYWQoc3RtcGUsIHJpc2VfcmVnKTsK PiArCQkJaWYgKHJldCA8IDApCj4gKwkJCQlyZXR1cm47Cj4gKwkJCXJpc2UgPSAhIShyZXQgJiBt YXNrKTsKPiArCQkJcmV0ID0gc3RtcGVfcmVnX3JlYWQoc3RtcGUsIGZhbGxfcmVnKTsKPiArCQkJ aWYgKHJldCA8IDApCj4gKwkJCQlyZXR1cm47Cj4gKwkJCWZhbGwgPSAhIShyZXQgJiBtYXNrKTsK PiArCj4gKwkJY2FzZSBTVE1QRTgwMToKPiArCQkJaXJxZW5fcmVnID0gc3RtcGUtPnJlZ3NbU1RN UEVfSURYX0lFR1BJT1JfTFNCXSAtCj4gKwkJCQkgICAgKG9mZnNldCAvIDgpOwo+ICsJCQlicmVh azsKPiArCj4gKwkJZGVmYXVsdDoKPiAgCQkJcmV0dXJuOwo+IC0JCXJpc2UgPSAhIShyZXQgJiBt YXNrKTsKPiAtCQlyZXQgPSBzdG1wZV9yZWdfcmVhZChzdG1wZSwgZmFsbF9yZWcpOwo+IC0JCWlm IChyZXQgPCAwKQo+IC0JCQlyZXR1cm47Cj4gLQkJZmFsbCA9ICEhKHJldCAmIG1hc2spOwo+ICsJ CX0KPiArCj4gIAkJcmV0ID0gc3RtcGVfcmVnX3JlYWQoc3RtcGUsIGlycWVuX3JlZyk7Cj4gIAkJ aWYgKHJldCA8IDApCj4gIAkJCXJldHVybjsKPiAgCQlpcnFlbiA9ICEhKHJldCAmIG1hc2spOwo+ ICAKPiAtCQlzZXFfcHJpbnRmKHMsICIgZ3Bpby0lLTNkICglLTIwLjIwcykgaW4gICVzICVzICVz JXMlcyIsCj4gKwkJc2VxX3ByaW50ZihzLCAiIGdwaW8tJS0zZCAoJS0yMC4yMHMpIGluICAlcyAl MTNzICUxM3MgJTI1cyAlMjVzIiwKPiAgCQkJICAgZ3BpbywgbGFiZWwgPzogIihub25lKSIsCj4g IAkJCSAgIHZhbCA/ICJoaSIgOiAibG8iLAo+IC0JCQkgICBlZGdlX2RldCA/ICJlZGdlLWFzc2Vy dGVkIiA6ICJlZGdlLWluYWN0aXZlIiwKPiAtCQkJICAgaXJxZW4gPyAiSVJRLWVuYWJsZWQiIDog IiIsCj4gLQkJCSAgIHJpc2UgPyAiIHJpc2luZy1lZGdlLWRldGVjdGlvbiIgOiAiIiwKPiAtCQkJ ICAgZmFsbCA/ICIgZmFsbGluZy1lZGdlLWRldGVjdGlvbiIgOiAiIik7Cj4gKwkJCSAgIGVkZ2Vf ZGV0X3ZhbHVlc1tlZGdlX2RldF0sCj4gKwkJCSAgIGlycWVuID8gIklSUS1lbmFibGVkIiA6ICJJ UlEtZGlzYWJsZWQiLAo+ICsJCQkgICByaXNlX3ZhbHVlc1tyaXNlXSwKPiArCQkJICAgZmFsbF92 YWx1ZXNbZmFsbF0pOwo+ICAJfQo+ICB9Cj4gIAo+IEBAIC0zMjIsOCArMzU3LDggQEAgc3RhdGlj IGlycXJldHVybl90IHN0bXBlX2dwaW9faXJxKGludCBpcnEsIHZvaWQgKmRldikKPiAgCj4gIAkJ c3RtcGVfcmVnX3dyaXRlKHN0bXBlLCBzdGF0bXNicmVnICsgaSwgc3RhdHVzW2ldKTsKPiAgCj4g LQkJLyogRWRnZSBkZXRlY3QgcmVnaXN0ZXIgaXMgbm90IHByZXNlbnQgb24gODAxICovCj4gLQkJ aWYgKHN0bXBlLT5wYXJ0bnVtICE9IFNUTVBFODAxKQo+ICsJCS8qIEVkZ2UgZGV0ZWN0IHJlZ2lz dGVyIGlzIG5vdCBwcmVzZW50IG9uIDgwMSBhbmQgMTgwMSAqLwo+ICsJCWlmIChzdG1wZS0+cGFy dG51bSAhPSBTVE1QRTgwMSB8fCBzdG1wZS0+cGFydG51bSAhPSBTVE1QRTE4MDEpCj4gIAkJCXN0 bXBlX3JlZ193cml0ZShzdG1wZSwgc3RtcGUtPnJlZ3NbU1RNUEVfSURYX0dQRURSX01TQl0KPiAg CQkJCQkrIGksIHN0YXR1c1tpXSk7Cj4gIAl9CgotLSAKTGVlIEpvbmVzCkxpbmFybyBTVE1pY3Jv ZWxlY3Ryb25pY3MgTGFuZGluZyBUZWFtIExlYWQKTGluYXJvLm9yZyDilIIgT3BlbiBzb3VyY2Ug c29mdHdhcmUgZm9yIEFSTSBTb0NzCkZvbGxvdyBMaW5hcm86IEZhY2Vib29rIHwgVHdpdHRlciB8 IEJsb2cKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxp bnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFk ZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4 LWFybS1rZXJuZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: lee.jones@linaro.org (Lee Jones) Date: Wed, 10 Aug 2016 09:29:10 +0100 Subject: [RESEND v2 03/10] gpio: stmpe: fix edge and rising/falling edge detection In-Reply-To: <1470814755-19447-4-git-send-email-patrice.chotard@st.com> References: <1470814755-19447-1-git-send-email-patrice.chotard@st.com> <1470814755-19447-4-git-send-email-patrice.chotard@st.com> Message-ID: <20160810082910.GI1581@dell> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed, 10 Aug 2016, patrice.chotard at st.com wrote: > From: Patrice Chotard > > By cross-checking STMPE 610/801/811/1601/2401/2403 datasheets, > it appears that edge detection and rising/falling edge detection > is not supported by all STMPE variant: > > GPIO GPIO > Edge detection rising/falling > edge detection > 610 | X | X | > 801 | | | > 811 | X | X | > 1600 | | | > 1601 | X | X | > 1801 | | X | > 2401 | X | X | > 2403 | X | X | > > Rework stmpe_dbg_show_one() and stmpe_gpio_irq to correctly > take these cases into account. > > Signed-off-by: Patrice Chotard > Reviewed-by: Linus Walleij > --- > drivers/gpio/gpio-stmpe.c | 85 +++++++++++++++++++++++++++++++++-------------- > 1 file changed, 60 insertions(+), 25 deletions(-) Applied, thanks. > diff --git a/drivers/gpio/gpio-stmpe.c b/drivers/gpio/gpio-stmpe.c > index 5197edf..bfc918c 100644 > --- a/drivers/gpio/gpio-stmpe.c > +++ b/drivers/gpio/gpio-stmpe.c > @@ -231,39 +231,74 @@ static void stmpe_dbg_show_one(struct seq_file *s, > gpio, label ?: "(none)", > val ? "hi" : "lo"); > } else { > - u8 edge_det_reg = stmpe->regs[STMPE_IDX_GPEDR_MSB] + num_banks - 1 - (offset / 8); > - u8 rise_reg = stmpe->regs[STMPE_IDX_GPRER_LSB] - (offset / 8); > - u8 fall_reg = stmpe->regs[STMPE_IDX_GPFER_LSB] - (offset / 8); > - u8 irqen_reg = stmpe->regs[STMPE_IDX_IEGPIOR_LSB] - (offset / 8); > - bool edge_det; > - bool rise; > - bool fall; > + u8 edge_det_reg; > + u8 rise_reg; > + u8 fall_reg; > + u8 irqen_reg; > + > + char *edge_det_values[] = {"edge-inactive", > + "edge-asserted", > + "not-supported"}; > + char *rise_values[] = {"no-rising-edge-detection", > + "rising-edge-detection", > + "not-supported"}; > + char *fall_values[] = {"no-falling-edge-detection", > + "falling-edge-detection", > + "not-supported"}; > + #define NOT_SUPPORTED_IDX 2 > + u8 edge_det = NOT_SUPPORTED_IDX; > + u8 rise = NOT_SUPPORTED_IDX; > + u8 fall = NOT_SUPPORTED_IDX; > bool irqen; > > - ret = stmpe_reg_read(stmpe, edge_det_reg); > - if (ret < 0) > - return; > - edge_det = !!(ret & mask); > - ret = stmpe_reg_read(stmpe, rise_reg); > - if (ret < 0) > + switch (stmpe->partnum) { > + case STMPE610: > + case STMPE811: > + case STMPE1601: > + case STMPE2401: > + case STMPE2403: > + edge_det_reg = stmpe->regs[STMPE_IDX_GPEDR_MSB] + > + num_banks - 1 - (offset / 8); > + ret = stmpe_reg_read(stmpe, edge_det_reg); > + if (ret < 0) > + return; > + edge_det = !!(ret & mask); > + > + case STMPE1801: > + rise_reg = stmpe->regs[STMPE_IDX_GPRER_LSB] - > + (offset / 8); > + fall_reg = stmpe->regs[STMPE_IDX_GPFER_LSB] - > + (offset / 8); > + ret = stmpe_reg_read(stmpe, rise_reg); > + if (ret < 0) > + return; > + rise = !!(ret & mask); > + ret = stmpe_reg_read(stmpe, fall_reg); > + if (ret < 0) > + return; > + fall = !!(ret & mask); > + > + case STMPE801: > + irqen_reg = stmpe->regs[STMPE_IDX_IEGPIOR_LSB] - > + (offset / 8); > + break; > + > + default: > return; > - rise = !!(ret & mask); > - ret = stmpe_reg_read(stmpe, fall_reg); > - if (ret < 0) > - return; > - fall = !!(ret & mask); > + } > + > ret = stmpe_reg_read(stmpe, irqen_reg); > if (ret < 0) > return; > irqen = !!(ret & mask); > > - seq_printf(s, " gpio-%-3d (%-20.20s) in %s %s %s%s%s", > + seq_printf(s, " gpio-%-3d (%-20.20s) in %s %13s %13s %25s %25s", > gpio, label ?: "(none)", > val ? "hi" : "lo", > - edge_det ? "edge-asserted" : "edge-inactive", > - irqen ? "IRQ-enabled" : "", > - rise ? " rising-edge-detection" : "", > - fall ? " falling-edge-detection" : ""); > + edge_det_values[edge_det], > + irqen ? "IRQ-enabled" : "IRQ-disabled", > + rise_values[rise], > + fall_values[fall]); > } > } > > @@ -322,8 +357,8 @@ static irqreturn_t stmpe_gpio_irq(int irq, void *dev) > > stmpe_reg_write(stmpe, statmsbreg + i, status[i]); > > - /* Edge detect register is not present on 801 */ > - if (stmpe->partnum != STMPE801) > + /* Edge detect register is not present on 801 and 1801 */ > + if (stmpe->partnum != STMPE801 || stmpe->partnum != STMPE1801) > stmpe_reg_write(stmpe, stmpe->regs[STMPE_IDX_GPEDR_MSB] > + i, status[i]); > } -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog