From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751606AbbCTTX7 (ORCPT ); Fri, 20 Mar 2015 15:23:59 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:24979 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751503AbbCTTXz (ORCPT ); Fri, 20 Mar 2015 15:23:55 -0400 X-AuditID: cbfee61b-f79d76d0000024d6-28-550c73c9e3f4 From: Bartlomiej Zolnierkiewicz To: Lee Jones , Samuel Ortiz Cc: Johan Hovold , Support Opensource , Milo Kim , patches@opensource.wolfsonmicro.com, Fabio Estevam , Marek Szyprowski , linux-kernel@vger.kernel.org, b.zolnierkie@samsung.com, stable@vger.kernel.org Subject: [PATCH v2 3/5] mfd: lp8788: Fix platform device ids to avoid probe failure Date: Fri, 20 Mar 2015 20:23:21 +0100 Message-id: <1426879403-19265-4-git-send-email-b.zolnierkie@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1426879403-19265-1-git-send-email-b.zolnierkie@samsung.com> References: <1426879403-19265-1-git-send-email-b.zolnierkie@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrMLMWRmVeSWpSXmKPExsVy+t9jQd2TxTyhBhPO6ltsnLGe1WJWl65F 040eVov7X48yWlzeNYfNYu2Ru+wWy3+tY7FY/vY/m8XpblaLBRsfMVrsbb3I7MDtseKTvse/ w/1MHptWdbJ53Lm2h81j3slAj5cTf7N59G1Zxehx/MZ2Jo/Pm+QCOKO4bFJSczLLUov07RK4 Mhad5Cx4J1rx4nM3UwPjdsEuRk4OCQETiQevutghbDGJC/fWs4HYQgLTGSW+/leDsDuZJPYc iQex2QSsJCa2r2LsYuTgEBHwkuj5Kt/FyMXBLHCWSWLijsdsIHFhgVCJWRP5QcpZBFQlls87 wghi8wp4SGxb9pkFpERCQEFiziQbkDCngKfEouanjBCbgEqOHmGdwMi7gJFhFaNoakFyQXFS eq6RXnFibnFpXrpecn7uJkZwUD6T3sG4qsHiEKMAB6MSD++BUu5QIdbEsuLK3EOMEhzMSiK8 U1N5QoV4UxIrq1KL8uOLSnNSiw8xSnOwKInzKtm3hQgJpCeWpGanphakFsFkmTg4pRoY492/ nmud6FzWPO/DX7577wsuLFkveO2K8+8pjhvcFjWxi2ydG96wrmGVQ7upnqfRj+x99VEqVs/V IzV3HcieLrh8Vrf+fK5Lcg9LN/VvreA7LLfOzfVZex2rg4OI5eTwyBSbfdJT7YL1Nr85krXh wrp9kSZlywRDNrb5eFifT/z6+OaxcscUJZbijERDLeai4kQATjZHVUYCAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 6e3f62f0793e ("mfd: core: Fix platform-device id generation") changed the way platform device ids are generated from mfd id base and cell ids in mfd_add_device(). Unfortunately the change in question breaks mfd drivers which are using mfd_add_devices() with mfd id base equal to -1 and non-zero cell ids (used to distinguish cells with the same name field). The result is that mfd core tries to register platform devices with the same name which obviously fails and leads to mfd device probe failure. Changing mfd_add_devices() mfd id base from -1 to 0 and at the same time setting proper cell ids for all cells fixes the issue. Fixes: 6e3f62f0793e ("mfd: core: Fix platform-device id generation") Cc: Johan Hovold Cc: Milo Kim Cc: Signed-off-by: Bartlomiej Zolnierkiewicz --- stable v3.19+ drivers/mfd/lp8788.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/mfd/lp8788.c b/drivers/mfd/lp8788.c index a30bc15..2883b97 100644 --- a/drivers/mfd/lp8788.c +++ b/drivers/mfd/lp8788.c @@ -23,6 +23,7 @@ #define MFD_DEV_SIMPLE(_name) \ { \ .name = LP8788_DEV_##_name, \ + .id = -1, \ } #define MFD_DEV_WITH_ID(_name, _id) \ @@ -36,6 +37,7 @@ .name = LP8788_DEV_##_name, \ .resources = _resource, \ .num_resources = num_resource, \ + .id = -1, \ } static struct resource chg_irqs[] = { @@ -73,12 +75,13 @@ static struct resource rtc_irqs[] = { static const struct mfd_cell lp8788_devs[] = { /* 4 bucks */ + MFD_DEV_WITH_ID(BUCK, 0), MFD_DEV_WITH_ID(BUCK, 1), MFD_DEV_WITH_ID(BUCK, 2), MFD_DEV_WITH_ID(BUCK, 3), - MFD_DEV_WITH_ID(BUCK, 4), /* 12 digital ldos */ + MFD_DEV_WITH_ID(DLDO, 0), MFD_DEV_WITH_ID(DLDO, 1), MFD_DEV_WITH_ID(DLDO, 2), MFD_DEV_WITH_ID(DLDO, 3), @@ -90,9 +93,9 @@ static const struct mfd_cell lp8788_devs[] = { MFD_DEV_WITH_ID(DLDO, 9), MFD_DEV_WITH_ID(DLDO, 10), MFD_DEV_WITH_ID(DLDO, 11), - MFD_DEV_WITH_ID(DLDO, 12), /* 10 analog ldos */ + MFD_DEV_WITH_ID(ALDO, 0), MFD_DEV_WITH_ID(ALDO, 1), MFD_DEV_WITH_ID(ALDO, 2), MFD_DEV_WITH_ID(ALDO, 3), @@ -102,7 +105,6 @@ static const struct mfd_cell lp8788_devs[] = { MFD_DEV_WITH_ID(ALDO, 7), MFD_DEV_WITH_ID(ALDO, 8), MFD_DEV_WITH_ID(ALDO, 9), - MFD_DEV_WITH_ID(ALDO, 10), /* ADC */ MFD_DEV_SIMPLE(ADC), @@ -199,7 +201,7 @@ static int lp8788_probe(struct i2c_client *cl, const struct i2c_device_id *id) if (ret) return ret; - return mfd_add_devices(lp->dev, -1, lp8788_devs, + return mfd_add_devices(lp->dev, 0, lp8788_devs, ARRAY_SIZE(lp8788_devs), NULL, 0, NULL); } -- 1.8.2.3