From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Jones Subject: Re: [RESEND v2 05/10] mfd: stmpe: use generic bit mask name Date: Wed, 10 Aug 2016 09:29:33 +0100 Message-ID: <20160810082933.GK1581@dell> References: <1470814755-19447-1-git-send-email-patrice.chotard@st.com> <1470814755-19447-6-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-6-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+IEluIG9yZGVy IHRvIHByZXBhcmUgdGhlIGdyb3VuZCB0byBTVE1QRTE2MDAsCj4gYXMgU1RNUEUxNjAwJ3MgU1lT X0NUUkwgcmVnaXN0ZXIgaGFzIHRoZSBzYW1lIGxheW91dCBhcwo+IFNUTVBFODAxIHZhcmlhbnQs IHVuaWZ5IFNUTVBFeHh4X1JFR19TWVNfQ1RSTF9SRVNFVC9JTlRfRU4vSU5UX0hJCj4gYml0IG1h c2tzIHRvIG1vcmUgZ2VuZXJpYyBTVE1QRV9TWVNfQ1RSTF9SRVNFVC9JTlRfRU4vSU5UX0hJCj4g Cj4gU2lnbmVkLW9mZi1ieTogUGF0cmljZSBDaG90YXJkIDxwYXRyaWNlLmNob3RhcmRAc3QuY29t Pgo+IEFja2VkLWJ5OiBMZWUgSm9uZXMgPGxlZS5qb25lc0BsaW5hcm8ub3JnPgo+IC0tLQo+ICBk cml2ZXJzL21mZC9zdG1wZS5jIHwgNCArKy0tCj4gIGRyaXZlcnMvbWZkL3N0bXBlLmggfCA2ICsr LS0tLQo+ICAyIGZpbGVzIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkK CkFwcGxpZWQsIHRoYW5rcy4KCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbWZkL3N0bXBlLmMgYi9k cml2ZXJzL21mZC9zdG1wZS5jCj4gaW5kZXggYWY2ODJkMC4uMjU1NjQ2MyAxMDA2NDQKPiAtLS0g YS9kcml2ZXJzL21mZC9zdG1wZS5jCj4gKysrIGIvZHJpdmVycy9tZmQvc3RtcGUuYwo+IEBAIC0x MDg5LDcgKzEwODksNyBAQCBzdGF0aWMgaW50IHN0bXBlX2NoaXBfaW5pdChzdHJ1Y3Qgc3RtcGUg KnN0bXBlKQo+ICAKPiAgCWlmIChzdG1wZS0+aXJxID49IDApIHsKPiAgCQlpZiAoaWQgPT0gU1RN UEU4MDFfSUQpCj4gLQkJCWljciA9IFNUTVBFODAxX1JFR19TWVNfQ1RSTF9JTlRfRU47Cj4gKwkJ CWljciA9IFNUTVBFX1NZU19DVFJMX0lOVF9FTjsKPiAgCQllbHNlCj4gIAkJCWljciA9IFNUTVBF X0lDUl9MU0JfR0lNOwo+ICAKPiBAQCAtMTEwMyw3ICsxMTAzLDcgQEAgc3RhdGljIGludCBzdG1w ZV9jaGlwX2luaXQoc3RydWN0IHN0bXBlICpzdG1wZSkKPiAgCQlpZiAoaXJxX3RyaWdnZXIgPT0g SVJRRl9UUklHR0VSX1JJU0lORyB8fAo+ICAJCQkJaXJxX3RyaWdnZXIgPT0gSVJRRl9UUklHR0VS X0hJR0gpIHsKPiAgCQkJaWYgKGlkID09IFNUTVBFODAxX0lEKQo+IC0JCQkJaWNyIHw9IFNUTVBF ODAxX1JFR19TWVNfQ1RSTF9JTlRfSEk7Cj4gKwkJCQlpY3IgfD0gU1RNUEVfU1lTX0NUUkxfSU5U X0hJOwo+ICAJCQllbHNlCj4gIAkJCQlpY3IgfD0gU1RNUEVfSUNSX0xTQl9ISUdIOwo+ICAJCX0K PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9tZmQvc3RtcGUuaCBiL2RyaXZlcnMvbWZkL3N0bXBlLmgK PiBpbmRleCA0YWUzNDNkLi40YmExMTIzIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvbWZkL3N0bXBl LmgKPiArKysgYi9kcml2ZXJzL21mZC9zdG1wZS5oCj4gQEAgLTEwNSw2ICsxMDUsOCBAQCBpbnQg c3RtcGVfcmVtb3ZlKHN0cnVjdCBzdG1wZSAqc3RtcGUpOwo+ICAjZGVmaW5lIFNUTVBFX0lDUl9M U0JfR0lNCSgxIDw8IDApCj4gIAo+ICAjZGVmaW5lIFNUTVBFX1NZU19DVFJMX1JFU0VUCSgxIDw8 IDcpCj4gKyNkZWZpbmUgU1RNUEVfU1lTX0NUUkxfSU5UX0VOCSgxIDw8IDIpCj4gKyNkZWZpbmUg U1RNUEVfU1lTX0NUUkxfSU5UX0hJCSgxIDw8IDApCj4gIAo+ICAvKgo+ICAgKiBTVE1QRTgwMQo+ IEBAIC0xMjEsMTAgKzEyMyw2IEBAIGludCBzdG1wZV9yZW1vdmUoc3RydWN0IHN0bXBlICpzdG1w ZSk7Cj4gICNkZWZpbmUgU1RNUEU4MDFfUkVHX0dQSU9fU0VUX1BJTgkweDExCj4gICNkZWZpbmUg U1RNUEU4MDFfUkVHX0dQSU9fRElSCQkweDEyCj4gIAo+IC0jZGVmaW5lIFNUTVBFODAxX1JFR19T WVNfQ1RSTF9SRVNFVAkoMSA8PCA3KQo+IC0jZGVmaW5lIFNUTVBFODAxX1JFR19TWVNfQ1RSTF9J TlRfRU4JKDEgPDwgMikKPiAtI2RlZmluZSBTVE1QRTgwMV9SRUdfU1lTX0NUUkxfSU5UX0hJCSgx IDw8IDApCj4gLQo+ICAvKgo+ICAgKiBTVE1QRTgxMQo+ICAgKi8KCi0tIApMZWUgSm9uZXMKTGlu YXJvIFNUTWljcm9lbGVjdHJvbmljcyBMYW5kaW5nIFRlYW0gTGVhZApMaW5hcm8ub3JnIOKUgiBP cGVuIHNvdXJjZSBzb2Z0d2FyZSBmb3IgQVJNIFNvQ3MKRm9sbG93IExpbmFybzogRmFjZWJvb2sg fCBUd2l0dGVyIHwgQmxvZwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBs aXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlz dGluZm8vbGludXgtYXJtLWtlcm5lbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: lee.jones@linaro.org (Lee Jones) Date: Wed, 10 Aug 2016 09:29:33 +0100 Subject: [RESEND v2 05/10] mfd: stmpe: use generic bit mask name In-Reply-To: <1470814755-19447-6-git-send-email-patrice.chotard@st.com> References: <1470814755-19447-1-git-send-email-patrice.chotard@st.com> <1470814755-19447-6-git-send-email-patrice.chotard@st.com> Message-ID: <20160810082933.GK1581@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 > > In order to prepare the ground to STMPE1600, > as STMPE1600's SYS_CTRL register has the same layout as > STMPE801 variant, unify STMPExxx_REG_SYS_CTRL_RESET/INT_EN/INT_HI > bit masks to more generic STMPE_SYS_CTRL_RESET/INT_EN/INT_HI > > Signed-off-by: Patrice Chotard > Acked-by: Lee Jones > --- > drivers/mfd/stmpe.c | 4 ++-- > drivers/mfd/stmpe.h | 6 ++---- > 2 files changed, 4 insertions(+), 6 deletions(-) Applied, thanks. > diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c > index af682d0..2556463 100644 > --- a/drivers/mfd/stmpe.c > +++ b/drivers/mfd/stmpe.c > @@ -1089,7 +1089,7 @@ static int stmpe_chip_init(struct stmpe *stmpe) > > if (stmpe->irq >= 0) { > if (id == STMPE801_ID) > - icr = STMPE801_REG_SYS_CTRL_INT_EN; > + icr = STMPE_SYS_CTRL_INT_EN; > else > icr = STMPE_ICR_LSB_GIM; > > @@ -1103,7 +1103,7 @@ static int stmpe_chip_init(struct stmpe *stmpe) > if (irq_trigger == IRQF_TRIGGER_RISING || > irq_trigger == IRQF_TRIGGER_HIGH) { > if (id == STMPE801_ID) > - icr |= STMPE801_REG_SYS_CTRL_INT_HI; > + icr |= STMPE_SYS_CTRL_INT_HI; > else > icr |= STMPE_ICR_LSB_HIGH; > } > diff --git a/drivers/mfd/stmpe.h b/drivers/mfd/stmpe.h > index 4ae343d..4ba1123 100644 > --- a/drivers/mfd/stmpe.h > +++ b/drivers/mfd/stmpe.h > @@ -105,6 +105,8 @@ int stmpe_remove(struct stmpe *stmpe); > #define STMPE_ICR_LSB_GIM (1 << 0) > > #define STMPE_SYS_CTRL_RESET (1 << 7) > +#define STMPE_SYS_CTRL_INT_EN (1 << 2) > +#define STMPE_SYS_CTRL_INT_HI (1 << 0) > > /* > * STMPE801 > @@ -121,10 +123,6 @@ int stmpe_remove(struct stmpe *stmpe); > #define STMPE801_REG_GPIO_SET_PIN 0x11 > #define STMPE801_REG_GPIO_DIR 0x12 > > -#define STMPE801_REG_SYS_CTRL_RESET (1 << 7) > -#define STMPE801_REG_SYS_CTRL_INT_EN (1 << 2) > -#define STMPE801_REG_SYS_CTRL_INT_HI (1 << 0) > - > /* > * STMPE811 > */ -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog