From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Jones Subject: Re: [PATCH] mfd: qcom-pm8xxx: Clean up PM8XXX namespace Date: Wed, 9 Nov 2016 15:47:27 +0000 Message-ID: <20161109154727.GG13127@dell> References: <1477487453-15801-1-git-send-email-linus.walleij@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <1477487453-15801-1-git-send-email-linus.walleij@linaro.org> 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: Linus Walleij Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, Abhijeet Dharmapurikar , Stephen Boyd , linux-kernel@vger.kernel.org, Bjorn Andersson , arm@kernel.org, Andy Gross , Jacek Anaszewski , linux-arm-kernel@lists.infradead.org List-Id: linux-arm-msm@vger.kernel.org T24gV2VkLCAyNiBPY3QgMjAxNiwgTGludXMgV2FsbGVpaiB3cm90ZToKCj4gVGhlIEtjb25maWcg YW5kIGZpbGUgbmFtaW5nIGZvciB0aGUgUE04eHh4IGRyaXZlciBpcyB0b3RhbGx5Cj4gY29uZnVz aW5nOgo+IAo+IC0gS2NvbmZpZyBvcHRpb25zIE1GRF9QTThYWFggYW5kIE1GRF9QTTg5MjFfQ09S RSwgc29tZSBpbi1rZXJuZWwKPiAgIHVzZXJzIGRlcGVuZGluZyBvbiBvciBzZWxlY3RpbmcgZWl0 aGVyIGF0IHJhbmRvbS4KPiAtIEEgZHJpdmVyIGZpbGUgbmFtZWQgcG04OTIxLWNvcmUuYyBldmVu IGlmIGl0IGlzIGluZGVlZAo+ICAgdXNlZCBieSB0aGUgd2hvbGUgUE04eHh4IGZhbWlseSBvZiBj aGlwcy4KPiAtIEFuIGlycWNoaXAgbmFtZWQgcG04eHh4IHNpbmNlIGl0IHdhcyAoSSBndWVzcykg cmVhbGl6ZWQgdGhhdAo+ICAgdGhlIGRyaXZlciB3YXMgZ2VuZXJpYyBmb3IgYWxsIHBtOHh4eCBQ TUlDcy4KPiAKPiBBcyBJIG1heSB3YW50IHRvIGFkZCBzdXBwb3J0IGZvciBQTTg5MDEgdGhpcyBp cyBzdGFydGluZyB0byBnZXQKPiByZWFsbHkgbWVzc3kuIEZpeCB0aGlzIHNpdHVhdGlvbiBieToK PiAKPiAtIFJlbW92ZSB0aGUgTUZEX1BNODkyMV9DT1JFIHN5bWJvbCBhbmQgcmVseSBzb2xlbHkg b24gTUZEX1BNOFhYWAo+ICAgYW5kIGNvbnZlcnQgYWxsIHVzZXJzLCBpbmNsdWRpbmcgTEVEcyBL Y29uZmlnIGFuZCBBUk0gZGVmY29uZmlncwo+ICAgZm9yIHFjb20gYW5kIG11bHRpX3Y3IHRvIHVz ZSB0aGF0IHNpbmdsZSBzeW1ib2wuCj4gLSBSZW5hbWluZyB0aGUgZHJpdmVyIHRvIHFjb20tcG04 eHh4LmMgdG8gZml0IGFsb25nIHRoZSB0d28KPiAgIG90aGVyIHFjb20qIHByZWZpeGVkIGRyaXZl cnMuCj4gLSBSZW5hbWUgZnVuY3Rpb25zIHdpdGhpbmcgdGhlIGRyaXZlciBmcm9tIDg5MjEgdG8g OHh4eCB0bwo+ICAgaW5kaWNhdGUgaXQgaXMgZ2VuZXJpYy4KPiAtIEp1c3QgZHJvcCB0aGUgPW0g Y29uZmlnIGZyb20gdGhlIHB4YV9kZWZjb25maWcsIEkgaGF2ZSBubyBjbHVlCj4gICB3aHkgaXQg aXMgZXZlbiB0aGVyZSwgaXQgaXMgbm90IGEgUXVhbGNvbW0gcGxhdGZvcm0uIChQb3NzaWJseQo+ ICAgb2xkZXIgS2NvbmZpZyBub2lzZSBmcm9tIHNhdmVjb25maWcuKQo+IAo+IENjOiBTdGVwaGVu IEJveWQgPHNib3lkQGNvZGVhdXJvcmEub3JnPgo+IENjOiBCam9ybiBBbmRlcnNzb24gPGJqb3Ju LmFuZGVyc3NvbkBsaW5hcm8ub3JnPgo+IENjOiBOZWlsIEFybXN0cm9uZyA8bmFybXN0cm9uZ0Bi YXlsaWJyZS5jb20+Cj4gQ2M6IEFiaGlqZWV0IERoYXJtYXB1cmlrYXIgPGFkaGFybWFwQGNvZGVh dXJvcmEub3JnPgo+IFNpZ25lZC1vZmYtYnk6IExpbnVzIFdhbGxlaWogPGxpbnVzLndhbGxlaWpA bGluYXJvLm9yZz4KPiAtLS0KPiBJIGRvIE5PVCB0aGluayBpdCBpcyBhIGdvb2QgaWRlYSB0byB0 cnkgdG8gc3BsaXQgdGhpcyBjb21taXQgdXAsCj4gSSByYXRoZXIgcHJlZmVyIHRoYXQgTGVlIHNp bXBseSBtZXJnZSBpdCBpbnRvIE1GRC4KPiAKPiBUaGUgcmVhc29uIGlzIHRoYXQgZmlsZXMgbGlr ZSBxY29tX2RlZmNvbmZpZyBhbHJlYWR5IGNvbnRhaW4gYm90aAo+IHRoZSByaWdodCBzeW1ib2xz LCBidXQgdGhlIE1GRF9QTTg5MjFfQ09SRSBzeW1ib2wgY2Fubm90IGJlIHJlbW92ZWQKPiB1bnRp bCB0aGlzIHJlbmFtZSBoYXMgaGFwcGVuZWQsIHdoZXJlYXMgbXVsdGlfdjdfZGVmY29uZmlnIG5l ZWRzCj4gaXQgYWRkZWQgZXRjLCBhbmQgdGhpcyBpcyBqdXN0IGEgY2xlYW4gbmljZSBjdXQuCj4g Cj4gSmFjZWssIEFSTSBTb0MgcGVyc29uOiBwbGVhc2UgQUNLIHRoaXMgcGF0Y2ggdG8gZ2V0IG1l cmdlZCBpbnRvCj4gTUZELgo+IC0tLQo+ICBhcmNoL2FybS9jb25maWdzL211bHRpX3Y3X2RlZmNv bmZpZyAgICAgICAgICB8ICAyICstCj4gIGFyY2gvYXJtL2NvbmZpZ3MvcHhhX2RlZmNvbmZpZyAg ICAgICAgICAgICAgIHwgIDEgLQo+ICBhcmNoL2FybS9jb25maWdzL3Fjb21fZGVmY29uZmlnICAg ICAgICAgICAgICB8ICAxIC0KPiAgZHJpdmVycy9sZWRzL0tjb25maWcgICAgICAgICAgICAgICAg ICAgICAgICAgfCAgMiArLQo+ICBkcml2ZXJzL21mZC9LY29uZmlnICAgICAgICAgICAgICAgICAg ICAgICAgICB8IDE0ICsrKystLS0tLS0KPiAgZHJpdmVycy9tZmQvTWFrZWZpbGUgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgMiArLQo+ICBkcml2ZXJzL21mZC97cG04OTIxLWNvcmUuYyA9PiBx Y29tLXBtOHh4eC5jfSB8IDQyICsrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0KCkZvciBteSBv d24gcmVmZXJlbmNlOgogIEFja2VkLWZvci1NRkQtYnk6IExlZSBKb25lcyA8bGVlLmpvbmVzQGxp bmFyby5vcmc+Cgo+ICA3IGZpbGVzIGNoYW5nZWQsIDI5IGluc2VydGlvbnMoKyksIDM1IGRlbGV0 aW9ucygtKQo+ICByZW5hbWUgZHJpdmVycy9tZmQve3BtODkyMS1jb3JlLmMgPT4gcWNvbS1wbTh4 eHguY30gKDkyJSkKCkhvdyBtYW55IG1vcmUgQWNrcyBkbyB3ZSBuZWVkPwoKWy4uLl0KCi0tIApM ZWUgSm9uZXMKTGluYXJvIFNUTWljcm9lbGVjdHJvbmljcyBMYW5kaW5nIFRlYW0gTGVhZApMaW5h cm8ub3JnIOKUgiBPcGVuIHNvdXJjZSBzb2Z0d2FyZSBmb3IgQVJNIFNvQ3MKRm9sbG93IExpbmFy bzogRmFjZWJvb2sgfCBUd2l0dGVyIHwgQmxvZwoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgt YXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3Jn L21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: lee.jones@linaro.org (Lee Jones) Date: Wed, 9 Nov 2016 15:47:27 +0000 Subject: [PATCH] mfd: qcom-pm8xxx: Clean up PM8XXX namespace In-Reply-To: <1477487453-15801-1-git-send-email-linus.walleij@linaro.org> References: <1477487453-15801-1-git-send-email-linus.walleij@linaro.org> Message-ID: <20161109154727.GG13127@dell> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed, 26 Oct 2016, Linus Walleij wrote: > The Kconfig and file naming for the PM8xxx driver is totally > confusing: > > - Kconfig options MFD_PM8XXX and MFD_PM8921_CORE, some in-kernel > users depending on or selecting either at random. > - A driver file named pm8921-core.c even if it is indeed > used by the whole PM8xxx family of chips. > - An irqchip named pm8xxx since it was (I guess) realized that > the driver was generic for all pm8xxx PMICs. > > As I may want to add support for PM8901 this is starting to get > really messy. Fix this situation by: > > - Remove the MFD_PM8921_CORE symbol and rely solely on MFD_PM8XXX > and convert all users, including LEDs Kconfig and ARM defconfigs > for qcom and multi_v7 to use that single symbol. > - Renaming the driver to qcom-pm8xxx.c to fit along the two > other qcom* prefixed drivers. > - Rename functions withing the driver from 8921 to 8xxx to > indicate it is generic. > - Just drop the =m config from the pxa_defconfig, I have no clue > why it is even there, it is not a Qualcomm platform. (Possibly > older Kconfig noise from saveconfig.) > > Cc: Stephen Boyd > Cc: Bjorn Andersson > Cc: Neil Armstrong > Cc: Abhijeet Dharmapurikar > Signed-off-by: Linus Walleij > --- > I do NOT think it is a good idea to try to split this commit up, > I rather prefer that Lee simply merge it into MFD. > > The reason is that files like qcom_defconfig already contain both > the right symbols, but the MFD_PM8921_CORE symbol cannot be removed > until this rename has happened, whereas multi_v7_defconfig needs > it added etc, and this is just a clean nice cut. > > Jacek, ARM SoC person: please ACK this patch to get merged into > MFD. > --- > arch/arm/configs/multi_v7_defconfig | 2 +- > arch/arm/configs/pxa_defconfig | 1 - > arch/arm/configs/qcom_defconfig | 1 - > drivers/leds/Kconfig | 2 +- > drivers/mfd/Kconfig | 14 ++++------ > drivers/mfd/Makefile | 2 +- > drivers/mfd/{pm8921-core.c => qcom-pm8xxx.c} | 42 ++++++++++++++-------------- For my own reference: Acked-for-MFD-by: Lee Jones > 7 files changed, 29 insertions(+), 35 deletions(-) > rename drivers/mfd/{pm8921-core.c => qcom-pm8xxx.c} (92%) How many more Acks do we need? [...] -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog