From mboxrd@z Thu Jan 1 00:00:00 1970 From: lee.jones@linaro.org (Lee Jones) Date: Fri, 20 Dec 2013 14:25:30 +0000 Subject: [PATCH 1/3] mfd: always assign of_node in mfd_add_device() In-Reply-To: <52B32C05.5010204@wwwdotorg.org> References: <1386626809-6251-1-git-send-email-swarren@wwwdotorg.org> <20131211092435.GC16780@lee--X1> <52B32C05.5010204@wwwdotorg.org> Message-ID: <20131220142530.GK3709@lee--X1> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Stephen, Please let me know if this is suitable and I can keep your Ack. ---- mfd: Revert "mfd: Always assign of_node in mfd_add_device()" This reverts commit 68044bee13770918e0b28dd44aa98c889ec7558f. We've had confirmed reports of this patch causing unforeseen issues with existing MFD users. It has been agreed by the original author and myself that reversion is the best solution. Acked-by: Stephen Warren Signed-off-by: Lee Jones diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c index 32e8d47..2676492 100644 --- a/drivers/mfd/mfd-core.c +++ b/drivers/mfd/mfd-core.c @@ -117,8 +117,6 @@ static int mfd_add_device(struct device *parent, int id, } } } - if (!pdev->dev.of_node) - pdev->dev.of_node = parent->of_node; if (cell->pdata_size) { ret = platform_device_add_data(pdev, -- 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 From: Lee Jones Subject: Re: [PATCH 1/3] mfd: always assign of_node in mfd_add_device() Date: Fri, 20 Dec 2013 14:25:30 +0000 Message-ID: <20131220142530.GK3709@lee--X1> References: <1386626809-6251-1-git-send-email-swarren@wwwdotorg.org> <20131211092435.GC16780@lee--X1> <52B32C05.5010204@wwwdotorg.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <52B32C05.5010204@wwwdotorg.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: Stephen Warren Cc: Mark Rutland , Alessandro Zummo , Stephen Warren , Samuel Ortiz , Pawel Moll , Ian Campbell , Rob Herring , devicetree@vger.kernel.org, rtc-linux@googlegroups.com, Andrew Morton , linux-arm-kernel@lists.infradead.org List-Id: devicetree@vger.kernel.org SGkgU3RlcGhlbiwKClBsZWFzZSBsZXQgbWUga25vdyBpZiB0aGlzIGlzIHN1aXRhYmxlIGFuZCBJ IGNhbiBrZWVwIHlvdXIgQWNrLgoKLS0tLQoKbWZkOiBSZXZlcnQgIm1mZDogQWx3YXlzIGFzc2ln biBvZl9ub2RlIGluIG1mZF9hZGRfZGV2aWNlKCkiCgpUaGlzIHJldmVydHMgY29tbWl0IDY4MDQ0 YmVlMTM3NzA5MThlMGIyOGRkNDRhYTk4Yzg4OWVjNzU1OGYuCgpXZSd2ZSBoYWQgY29uZmlybWVk IHJlcG9ydHMgb2YgdGhpcyBwYXRjaCBjYXVzaW5nIHVuZm9yZXNlZW4gaXNzdWVzCndpdGggZXhp c3RpbmcgTUZEIHVzZXJzLiBJdCBoYXMgYmVlbiBhZ3JlZWQgYnkgdGhlIG9yaWdpbmFsIGF1dGhv cgphbmQgbXlzZWxmIHRoYXQgcmV2ZXJzaW9uIGlzIHRoZSBiZXN0IHNvbHV0aW9uLgoKQWNrZWQt Ynk6IFN0ZXBoZW4gV2FycmVuIDxzd2FycmVuQG52aWRpYS5jb20+ClNpZ25lZC1vZmYtYnk6IExl ZSBKb25lcyA8bGVlLmpvbmVzQGxpbmFyby5vcmc+CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9tZmQv bWZkLWNvcmUuYyBiL2RyaXZlcnMvbWZkL21mZC1jb3JlLmMKaW5kZXggMzJlOGQ0Ny4uMjY3NjQ5 MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9tZmQvbWZkLWNvcmUuYworKysgYi9kcml2ZXJzL21mZC9t ZmQtY29yZS5jCkBAIC0xMTcsOCArMTE3LDYgQEAgc3RhdGljIGludCBtZmRfYWRkX2RldmljZShz dHJ1Y3QgZGV2aWNlICpwYXJlbnQsIGludCBpZCwKIAkJCX0KIAkJfQogCX0KLQlpZiAoIXBkZXYt PmRldi5vZl9ub2RlKQotCQlwZGV2LT5kZXYub2Zfbm9kZSA9IHBhcmVudC0+b2Zfbm9kZTsKIAog CWlmIChjZWxsLT5wZGF0YV9zaXplKSB7CiAJCXJldCA9IHBsYXRmb3JtX2RldmljZV9hZGRfZGF0 YShwZGV2LAoKLS0gCkxlZSBKb25lcwpMaW5hcm8gU1RNaWNyb2VsZWN0cm9uaWNzIExhbmRpbmcg VGVhbSBMZWFkCkxpbmFyby5vcmcg4pSCIE9wZW4gc291cmNlIHNvZnR3YXJlIGZvciBBUk0gU29D cwpGb2xsb3cgTGluYXJvOiBGYWNlYm9vayB8IFR3aXR0ZXIgfCBCbG9nCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxp bmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3Rz LmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==