From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Jones Subject: Re: [PATCH V3 2/4] mfd: mt6397: int_con and int_status may vary in location Date: Wed, 10 Feb 2016 16:59:07 +0000 Message-ID: <20160210165907.GT3782@x1> References: <1453895258-44369-1-git-send-email-blogic@openwrt.org> <1453895258-44369-2-git-send-email-blogic@openwrt.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <1453895258-44369-2-git-send-email-blogic-p3rKhJxN3npAfugRpC6u6w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+glpam-linux-mediatek=m.gmane.org-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org To: John Crispin Cc: Matthias Brugger , linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: linux-mediatek@lists.infradead.org T24gV2VkLCAyNyBKYW4gMjAxNiwgSm9obiBDcmlzcGluIHdyb3RlOgoKPiBNVDYzMjMgaGFzIHRo ZSBJTlRfQ09OIGFuZCBJTlRfU1RBVFVTIGxvY2F0ZWQgYXQgYSBkaWZmZXJlbnQgcG9zaXRpb24u Cj4gTWFrZSB0aGUgcmVnaXN0ZXJzIGxvY2F0aW9ucyBjb25maWd1cmFibGUuCj4gCj4gU2lnbmVk LW9mZi1ieTogSm9obiBDcmlzcGluIDxibG9naWNAb3BlbndydC5vcmc+Cj4gLS0tCj4gIGRyaXZl cnMvbWZkL210NjM5Ny1jb3JlLmMgICAgICAgfCAgIDI3ICsrKysrKysrKysrKysrKysrLS0tLS0t LS0tLQo+ICBpbmNsdWRlL2xpbnV4L21mZC9tdDYzOTcvY29yZS5oIHwgICAgMiArKwo+ICAyIGZp bGVzIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKQXBwbGllZCwg dGhhbmtzLgoKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9tZmQvbXQ2Mzk3LWNvcmUuYyBiL2RyaXZl cnMvbWZkL210NjM5Ny1jb3JlLmMKPiBpbmRleCAxNzQ5YzFjLi43NWFkMGZlIDEwMDY0NAo+IC0t LSBhL2RyaXZlcnMvbWZkL210NjM5Ny1jb3JlLmMKPiArKysgYi9kcml2ZXJzL21mZC9tdDYzOTct Y29yZS5jCj4gQEAgLTY5LDggKzY5LDEwIEBAIHN0YXRpYyB2b2lkIG10NjM5N19pcnFfc3luY191 bmxvY2soc3RydWN0IGlycV9kYXRhICpkYXRhKQo+ICB7Cj4gIAlzdHJ1Y3QgbXQ2Mzk3X2NoaXAg Km10NjM5NyA9IGlycV9kYXRhX2dldF9pcnFfY2hpcF9kYXRhKGRhdGEpOwo+ICAKPiAtCXJlZ21h cF93cml0ZShtdDYzOTctPnJlZ21hcCwgTVQ2Mzk3X0lOVF9DT04wLCBtdDYzOTctPmlycV9tYXNr c19jdXJbMF0pOwo+IC0JcmVnbWFwX3dyaXRlKG10NjM5Ny0+cmVnbWFwLCBNVDYzOTdfSU5UX0NP TjEsIG10NjM5Ny0+aXJxX21hc2tzX2N1clsxXSk7Cj4gKwlyZWdtYXBfd3JpdGUobXQ2Mzk3LT5y ZWdtYXAsIG10NjM5Ny0+aW50X2NvblswXSwKPiArCQkgICAgIG10NjM5Ny0+aXJxX21hc2tzX2N1 clswXSk7Cj4gKwlyZWdtYXBfd3JpdGUobXQ2Mzk3LT5yZWdtYXAsIG10NjM5Ny0+aW50X2Nvblsx XSwKPiArCQkgICAgIG10NjM5Ny0+aXJxX21hc2tzX2N1clsxXSk7Cj4gIAo+ICAJbXV0ZXhfdW5s b2NrKCZtdDYzOTctPmlycWxvY2spOwo+ICB9Cj4gQEAgLTE0Nyw4ICsxNDksOCBAQCBzdGF0aWMg aXJxcmV0dXJuX3QgbXQ2Mzk3X2lycV90aHJlYWQoaW50IGlycSwgdm9pZCAqZGF0YSkKPiAgewo+ ICAJc3RydWN0IG10NjM5N19jaGlwICptdDYzOTcgPSBkYXRhOwo+ICAKPiAtCW10NjM5N19pcnFf aGFuZGxlX3JlZyhtdDYzOTcsIE1UNjM5N19JTlRfU1RBVFVTMCwgMCk7Cj4gLQltdDYzOTdfaXJx X2hhbmRsZV9yZWcobXQ2Mzk3LCBNVDYzOTdfSU5UX1NUQVRVUzEsIDE2KTsKPiArCW10NjM5N19p cnFfaGFuZGxlX3JlZyhtdDYzOTcsIG10NjM5Ny0+aW50X3N0YXR1c1swXSwgMCk7Cj4gKwltdDYz OTdfaXJxX2hhbmRsZV9yZWcobXQ2Mzk3LCBtdDYzOTctPmludF9zdGF0dXNbMV0sIDE2KTsKPiAg Cj4gIAlyZXR1cm4gSVJRX0hBTkRMRUQ7Cj4gIH0KPiBAQCAtMTc3LDggKzE3OSw4IEBAIHN0YXRp YyBpbnQgbXQ2Mzk3X2lycV9pbml0KHN0cnVjdCBtdDYzOTdfY2hpcCAqbXQ2Mzk3KQo+ICAJbXV0 ZXhfaW5pdCgmbXQ2Mzk3LT5pcnFsb2NrKTsKPiAgCj4gIAkvKiBNYXNrIGFsbCBpbnRlcnJ1cHQg c291cmNlcyAqLwo+IC0JcmVnbWFwX3dyaXRlKG10NjM5Ny0+cmVnbWFwLCBNVDYzOTdfSU5UX0NP TjAsIDB4MCk7Cj4gLQlyZWdtYXBfd3JpdGUobXQ2Mzk3LT5yZWdtYXAsIE1UNjM5N19JTlRfQ09O MSwgMHgwKTsKPiArCXJlZ21hcF93cml0ZShtdDYzOTctPnJlZ21hcCwgbXQ2Mzk3LT5pbnRfY29u WzBdLCAweDApOwo+ICsJcmVnbWFwX3dyaXRlKG10NjM5Ny0+cmVnbWFwLCBtdDYzOTctPmludF9j b25bMV0sIDB4MCk7Cj4gIAo+ICAJbXQ2Mzk3LT5pcnFfZG9tYWluID0gaXJxX2RvbWFpbl9hZGRf bGluZWFyKG10NjM5Ny0+ZGV2LT5vZl9ub2RlLAo+ICAJCU1UNjM5N19JUlFfTlIsICZtdDYzOTdf aXJxX2RvbWFpbl9vcHMsIG10NjM5Nyk7Cj4gQEAgLTIwMyw4ICsyMDUsOCBAQCBzdGF0aWMgaW50 IG10NjM5N19pcnFfc3VzcGVuZChzdHJ1Y3QgZGV2aWNlICpkZXYpCj4gIHsKPiAgCXN0cnVjdCBt dDYzOTdfY2hpcCAqY2hpcCA9IGRldl9nZXRfZHJ2ZGF0YShkZXYpOwo+ICAKPiAtCXJlZ21hcF93 cml0ZShjaGlwLT5yZWdtYXAsIE1UNjM5N19JTlRfQ09OMCwgY2hpcC0+d2FrZV9tYXNrWzBdKTsK PiAtCXJlZ21hcF93cml0ZShjaGlwLT5yZWdtYXAsIE1UNjM5N19JTlRfQ09OMSwgY2hpcC0+d2Fr ZV9tYXNrWzFdKTsKPiArCXJlZ21hcF93cml0ZShjaGlwLT5yZWdtYXAsIGNoaXAtPmludF9jb25b MF0sIGNoaXAtPndha2VfbWFza1swXSk7Cj4gKwlyZWdtYXBfd3JpdGUoY2hpcC0+cmVnbWFwLCBj aGlwLT5pbnRfY29uWzFdLCBjaGlwLT53YWtlX21hc2tbMV0pOwo+ICAKPiAgCWVuYWJsZV9pcnFf d2FrZShjaGlwLT5pcnEpOwo+ICAKPiBAQCAtMjE1LDggKzIxNyw4IEBAIHN0YXRpYyBpbnQgbXQ2 Mzk3X2lycV9yZXN1bWUoc3RydWN0IGRldmljZSAqZGV2KQo+ICB7Cj4gIAlzdHJ1Y3QgbXQ2Mzk3 X2NoaXAgKmNoaXAgPSBkZXZfZ2V0X2RydmRhdGEoZGV2KTsKPiAgCj4gLQlyZWdtYXBfd3JpdGUo Y2hpcC0+cmVnbWFwLCBNVDYzOTdfSU5UX0NPTjAsIGNoaXAtPmlycV9tYXNrc19jdXJbMF0pOwo+ IC0JcmVnbWFwX3dyaXRlKGNoaXAtPnJlZ21hcCwgTVQ2Mzk3X0lOVF9DT04xLCBjaGlwLT5pcnFf bWFza3NfY3VyWzFdKTsKPiArCXJlZ21hcF93cml0ZShjaGlwLT5yZWdtYXAsIGNoaXAtPmludF9j b25bMF0sIGNoaXAtPmlycV9tYXNrc19jdXJbMF0pOwo+ICsJcmVnbWFwX3dyaXRlKGNoaXAtPnJl Z21hcCwgY2hpcC0+aW50X2NvblsxXSwgY2hpcC0+aXJxX21hc2tzX2N1clsxXSk7Cj4gIAo+ICAJ ZGlzYWJsZV9pcnFfd2FrZShjaGlwLT5pcnEpOwo+ICAKPiBAQCAtMjM3LDYgKzIzOSwxMSBAQCBz dGF0aWMgaW50IG10NjM5N19wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQo+ICAJ CXJldHVybiAtRU5PTUVNOwo+ICAKPiAgCW10NjM5Ny0+ZGV2ID0gJnBkZXYtPmRldjsKPiArCW10 NjM5Ny0+aW50X2NvblswXSA9IE1UNjM5N19JTlRfQ09OMDsKPiArCW10NjM5Ny0+aW50X2Nvblsx XSA9IE1UNjM5N19JTlRfQ09OMTsKPiArCW10NjM5Ny0+aW50X3N0YXR1c1swXSA9IE1UNjM5N19J TlRfU1RBVFVTMDsKPiArCW10NjM5Ny0+aW50X3N0YXR1c1sxXSA9IE1UNjM5N19JTlRfU1RBVFVT MTsKPiArCj4gIAkvKgo+ICAJICogbXQ2Mzk3IE1GRCBpcyBjaGlsZCBkZXZpY2Ugb2Ygc29jIHBt aWMgd3JhcHBlci4KPiAgCSAqIFJlZ21hcCBpcyBzZXQgZnJvbSBpdHMgcGFyZW50Lgo+IGRpZmYg LS1naXQgYS9pbmNsdWRlL2xpbnV4L21mZC9tdDYzOTcvY29yZS5oIGIvaW5jbHVkZS9saW51eC9t ZmQvbXQ2Mzk3L2NvcmUuaAo+IGluZGV4IDQ1YjhlOGEuLmQ2NzhmNTIgMTAwNjQ0Cj4gLS0tIGEv aW5jbHVkZS9saW51eC9tZmQvbXQ2Mzk3L2NvcmUuaAo+ICsrKyBiL2luY2x1ZGUvbGludXgvbWZk L210NjM5Ny9jb3JlLmgKPiBAQCAtNjAsNiArNjAsOCBAQCBzdHJ1Y3QgbXQ2Mzk3X2NoaXAgewo+ ICAJdTE2IHdha2VfbWFza1syXTsKPiAgCXUxNiBpcnFfbWFza3NfY3VyWzJdOwo+ICAJdTE2IGly cV9tYXNrc19jYWNoZVsyXTsKPiArCXUxNiBpbnRfY29uWzJdOwo+ICsJdTE2IGludF9zdGF0dXNb Ml07Cj4gIH07Cj4gIAo+ICAjZW5kaWYgLyogX19NRkRfTVQ2Mzk3X0NPUkVfSF9fICovCgotLSAK TGVlIEpvbmVzCkxpbmFybyBTVE1pY3JvZWxlY3Ryb25pY3MgTGFuZGluZyBUZWFtIExlYWQKTGlu YXJvLm9yZyDilIIgT3BlbiBzb3VyY2Ugc29mdHdhcmUgZm9yIEFSTSBTb0NzCkZvbGxvdyBMaW5h cm86IEZhY2Vib29rIHwgVHdpdHRlciB8IEJsb2cKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkxpbnV4LW1lZGlhdGVrIG1haWxpbmcgbGlzdApMaW51eC1t ZWRpYXRla0BsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21h aWxtYW4vbGlzdGluZm8vbGludXgtbWVkaWF0ZWsK From mboxrd@z Thu Jan 1 00:00:00 1970 From: lee.jones@linaro.org (Lee Jones) Date: Wed, 10 Feb 2016 16:59:07 +0000 Subject: [PATCH V3 2/4] mfd: mt6397: int_con and int_status may vary in location In-Reply-To: <1453895258-44369-2-git-send-email-blogic@openwrt.org> References: <1453895258-44369-1-git-send-email-blogic@openwrt.org> <1453895258-44369-2-git-send-email-blogic@openwrt.org> Message-ID: <20160210165907.GT3782@x1> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed, 27 Jan 2016, John Crispin wrote: > MT6323 has the INT_CON and INT_STATUS located at a different position. > Make the registers locations configurable. > > Signed-off-by: John Crispin > --- > drivers/mfd/mt6397-core.c | 27 +++++++++++++++++---------- > include/linux/mfd/mt6397/core.h | 2 ++ > 2 files changed, 19 insertions(+), 10 deletions(-) Applied, thanks. > diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c > index 1749c1c..75ad0fe 100644 > --- a/drivers/mfd/mt6397-core.c > +++ b/drivers/mfd/mt6397-core.c > @@ -69,8 +69,10 @@ static void mt6397_irq_sync_unlock(struct irq_data *data) > { > struct mt6397_chip *mt6397 = irq_data_get_irq_chip_data(data); > > - regmap_write(mt6397->regmap, MT6397_INT_CON0, mt6397->irq_masks_cur[0]); > - regmap_write(mt6397->regmap, MT6397_INT_CON1, mt6397->irq_masks_cur[1]); > + regmap_write(mt6397->regmap, mt6397->int_con[0], > + mt6397->irq_masks_cur[0]); > + regmap_write(mt6397->regmap, mt6397->int_con[1], > + mt6397->irq_masks_cur[1]); > > mutex_unlock(&mt6397->irqlock); > } > @@ -147,8 +149,8 @@ static irqreturn_t mt6397_irq_thread(int irq, void *data) > { > struct mt6397_chip *mt6397 = data; > > - mt6397_irq_handle_reg(mt6397, MT6397_INT_STATUS0, 0); > - mt6397_irq_handle_reg(mt6397, MT6397_INT_STATUS1, 16); > + mt6397_irq_handle_reg(mt6397, mt6397->int_status[0], 0); > + mt6397_irq_handle_reg(mt6397, mt6397->int_status[1], 16); > > return IRQ_HANDLED; > } > @@ -177,8 +179,8 @@ static int mt6397_irq_init(struct mt6397_chip *mt6397) > mutex_init(&mt6397->irqlock); > > /* Mask all interrupt sources */ > - regmap_write(mt6397->regmap, MT6397_INT_CON0, 0x0); > - regmap_write(mt6397->regmap, MT6397_INT_CON1, 0x0); > + regmap_write(mt6397->regmap, mt6397->int_con[0], 0x0); > + regmap_write(mt6397->regmap, mt6397->int_con[1], 0x0); > > mt6397->irq_domain = irq_domain_add_linear(mt6397->dev->of_node, > MT6397_IRQ_NR, &mt6397_irq_domain_ops, mt6397); > @@ -203,8 +205,8 @@ static int mt6397_irq_suspend(struct device *dev) > { > struct mt6397_chip *chip = dev_get_drvdata(dev); > > - regmap_write(chip->regmap, MT6397_INT_CON0, chip->wake_mask[0]); > - regmap_write(chip->regmap, MT6397_INT_CON1, chip->wake_mask[1]); > + regmap_write(chip->regmap, chip->int_con[0], chip->wake_mask[0]); > + regmap_write(chip->regmap, chip->int_con[1], chip->wake_mask[1]); > > enable_irq_wake(chip->irq); > > @@ -215,8 +217,8 @@ static int mt6397_irq_resume(struct device *dev) > { > struct mt6397_chip *chip = dev_get_drvdata(dev); > > - regmap_write(chip->regmap, MT6397_INT_CON0, chip->irq_masks_cur[0]); > - regmap_write(chip->regmap, MT6397_INT_CON1, chip->irq_masks_cur[1]); > + regmap_write(chip->regmap, chip->int_con[0], chip->irq_masks_cur[0]); > + regmap_write(chip->regmap, chip->int_con[1], chip->irq_masks_cur[1]); > > disable_irq_wake(chip->irq); > > @@ -237,6 +239,11 @@ static int mt6397_probe(struct platform_device *pdev) > return -ENOMEM; > > mt6397->dev = &pdev->dev; > + mt6397->int_con[0] = MT6397_INT_CON0; > + mt6397->int_con[1] = MT6397_INT_CON1; > + mt6397->int_status[0] = MT6397_INT_STATUS0; > + mt6397->int_status[1] = MT6397_INT_STATUS1; > + > /* > * mt6397 MFD is child device of soc pmic wrapper. > * Regmap is set from its parent. > diff --git a/include/linux/mfd/mt6397/core.h b/include/linux/mfd/mt6397/core.h > index 45b8e8a..d678f52 100644 > --- a/include/linux/mfd/mt6397/core.h > +++ b/include/linux/mfd/mt6397/core.h > @@ -60,6 +60,8 @@ struct mt6397_chip { > u16 wake_mask[2]; > u16 irq_masks_cur[2]; > u16 irq_masks_cache[2]; > + u16 int_con[2]; > + u16 int_status[2]; > }; > > #endif /* __MFD_MT6397_CORE_H__ */ -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753188AbcBJQ7R (ORCPT ); Wed, 10 Feb 2016 11:59:17 -0500 Received: from mail-wm0-f49.google.com ([74.125.82.49]:34545 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752616AbcBJQ7M (ORCPT ); Wed, 10 Feb 2016 11:59:12 -0500 Date: Wed, 10 Feb 2016 16:59:07 +0000 From: Lee Jones To: John Crispin Cc: Matthias Brugger , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: Re: [PATCH V3 2/4] mfd: mt6397: int_con and int_status may vary in location Message-ID: <20160210165907.GT3782@x1> References: <1453895258-44369-1-git-send-email-blogic@openwrt.org> <1453895258-44369-2-git-send-email-blogic@openwrt.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1453895258-44369-2-git-send-email-blogic@openwrt.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 27 Jan 2016, John Crispin wrote: > MT6323 has the INT_CON and INT_STATUS located at a different position. > Make the registers locations configurable. > > Signed-off-by: John Crispin > --- > drivers/mfd/mt6397-core.c | 27 +++++++++++++++++---------- > include/linux/mfd/mt6397/core.h | 2 ++ > 2 files changed, 19 insertions(+), 10 deletions(-) Applied, thanks. > diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c > index 1749c1c..75ad0fe 100644 > --- a/drivers/mfd/mt6397-core.c > +++ b/drivers/mfd/mt6397-core.c > @@ -69,8 +69,10 @@ static void mt6397_irq_sync_unlock(struct irq_data *data) > { > struct mt6397_chip *mt6397 = irq_data_get_irq_chip_data(data); > > - regmap_write(mt6397->regmap, MT6397_INT_CON0, mt6397->irq_masks_cur[0]); > - regmap_write(mt6397->regmap, MT6397_INT_CON1, mt6397->irq_masks_cur[1]); > + regmap_write(mt6397->regmap, mt6397->int_con[0], > + mt6397->irq_masks_cur[0]); > + regmap_write(mt6397->regmap, mt6397->int_con[1], > + mt6397->irq_masks_cur[1]); > > mutex_unlock(&mt6397->irqlock); > } > @@ -147,8 +149,8 @@ static irqreturn_t mt6397_irq_thread(int irq, void *data) > { > struct mt6397_chip *mt6397 = data; > > - mt6397_irq_handle_reg(mt6397, MT6397_INT_STATUS0, 0); > - mt6397_irq_handle_reg(mt6397, MT6397_INT_STATUS1, 16); > + mt6397_irq_handle_reg(mt6397, mt6397->int_status[0], 0); > + mt6397_irq_handle_reg(mt6397, mt6397->int_status[1], 16); > > return IRQ_HANDLED; > } > @@ -177,8 +179,8 @@ static int mt6397_irq_init(struct mt6397_chip *mt6397) > mutex_init(&mt6397->irqlock); > > /* Mask all interrupt sources */ > - regmap_write(mt6397->regmap, MT6397_INT_CON0, 0x0); > - regmap_write(mt6397->regmap, MT6397_INT_CON1, 0x0); > + regmap_write(mt6397->regmap, mt6397->int_con[0], 0x0); > + regmap_write(mt6397->regmap, mt6397->int_con[1], 0x0); > > mt6397->irq_domain = irq_domain_add_linear(mt6397->dev->of_node, > MT6397_IRQ_NR, &mt6397_irq_domain_ops, mt6397); > @@ -203,8 +205,8 @@ static int mt6397_irq_suspend(struct device *dev) > { > struct mt6397_chip *chip = dev_get_drvdata(dev); > > - regmap_write(chip->regmap, MT6397_INT_CON0, chip->wake_mask[0]); > - regmap_write(chip->regmap, MT6397_INT_CON1, chip->wake_mask[1]); > + regmap_write(chip->regmap, chip->int_con[0], chip->wake_mask[0]); > + regmap_write(chip->regmap, chip->int_con[1], chip->wake_mask[1]); > > enable_irq_wake(chip->irq); > > @@ -215,8 +217,8 @@ static int mt6397_irq_resume(struct device *dev) > { > struct mt6397_chip *chip = dev_get_drvdata(dev); > > - regmap_write(chip->regmap, MT6397_INT_CON0, chip->irq_masks_cur[0]); > - regmap_write(chip->regmap, MT6397_INT_CON1, chip->irq_masks_cur[1]); > + regmap_write(chip->regmap, chip->int_con[0], chip->irq_masks_cur[0]); > + regmap_write(chip->regmap, chip->int_con[1], chip->irq_masks_cur[1]); > > disable_irq_wake(chip->irq); > > @@ -237,6 +239,11 @@ static int mt6397_probe(struct platform_device *pdev) > return -ENOMEM; > > mt6397->dev = &pdev->dev; > + mt6397->int_con[0] = MT6397_INT_CON0; > + mt6397->int_con[1] = MT6397_INT_CON1; > + mt6397->int_status[0] = MT6397_INT_STATUS0; > + mt6397->int_status[1] = MT6397_INT_STATUS1; > + > /* > * mt6397 MFD is child device of soc pmic wrapper. > * Regmap is set from its parent. > diff --git a/include/linux/mfd/mt6397/core.h b/include/linux/mfd/mt6397/core.h > index 45b8e8a..d678f52 100644 > --- a/include/linux/mfd/mt6397/core.h > +++ b/include/linux/mfd/mt6397/core.h > @@ -60,6 +60,8 @@ struct mt6397_chip { > u16 wake_mask[2]; > u16 irq_masks_cur[2]; > u16 irq_masks_cache[2]; > + u16 int_con[2]; > + u16 int_status[2]; > }; > > #endif /* __MFD_MT6397_CORE_H__ */ -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog