From patchwork Mon Feb 4 15:40:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 14539 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id DB23723F8B for ; Mon, 4 Feb 2013 15:42:10 +0000 (UTC) Received: from mail-vb0-f49.google.com (mail-vb0-f49.google.com [209.85.212.49]) by fiordland.canonical.com (Postfix) with ESMTP id 96B6AA18AC1 for ; Mon, 4 Feb 2013 15:42:10 +0000 (UTC) Received: by mail-vb0-f49.google.com with SMTP id s24so3893503vbi.8 for ; Mon, 04 Feb 2013 07:42:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=C1GkVS5t5cth7uOuKu2Twm9LxuHG/sOfAYnuqLPMxyo=; b=kJJZyTP8/m231VXk3BcAR0Wtkufw35ZRpWDZ6qDU22NOOoKbcaZW7TXYsEIgJ4nLbl KJz96lNy2ACNRm9HHmVql30kumzEs9v8dTowgZxs/xAsN2pNRb5JglORhWYEQpvEZ//i g0XRgPHYZYXxa1eId9fO2zC7N/zpyVwBZJ/a/j4KjanNEobSDpJlyXhfu8INt1/zPA9x E5a0gZut2GJs1LrtjFPM63CE2YozZyg4enh2+TmEuCotJGjRseZWrZ6LKvujTzbzWihe 3knKUSCwrCfR3S9REHKt0O+C++NL1TheKvLumffTXnoSWs83MvKDEO5FKx6smu2MTK5E WJWQ== X-Received: by 10.52.27.50 with SMTP id q18mr20270268vdg.20.1359992530103; Mon, 04 Feb 2013 07:42:10 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.252.8 with SMTP id zo8csp92938vec; Mon, 4 Feb 2013 07:42:09 -0800 (PST) X-Received: by 10.66.89.199 with SMTP id bq7mr54135258pab.26.1359992529005; Mon, 04 Feb 2013 07:42:09 -0800 (PST) Received: from mail-da0-f49.google.com (mail-da0-f49.google.com [209.85.210.49]) by mx.google.com with ESMTPS id x6si17961340pay.180.2013.02.04.07.42.08 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 07:42:08 -0800 (PST) Received-SPF: neutral (google.com: 209.85.210.49 is neither permitted nor denied by best guess record for domain of haojian.zhuang@linaro.org) client-ip=209.85.210.49; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.49 is neither permitted nor denied by best guess record for domain of haojian.zhuang@linaro.org) smtp.mail=haojian.zhuang@linaro.org Received: by mail-da0-f49.google.com with SMTP id v40so2732827dad.36 for ; Mon, 04 Feb 2013 07:42:08 -0800 (PST) X-Received: by 10.66.80.70 with SMTP id p6mr54184558pax.23.1359992528408; Mon, 04 Feb 2013 07:42:08 -0800 (PST) Received: from localhost.localdomain ([67.198.145.34]) by mx.google.com with ESMTPS id d1sm22254330pav.6.2013.02.04.07.42.03 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 07:42:07 -0800 (PST) From: Haojian Zhuang To: sameo@linux.intel.com, qingx@marvell.com, grant.likely@secretlab.ca, rob.herring@calxeda.com, cxie4@marvell.com, linux-kernel@vger.kernel.org, devicetree-discuss@lists.ozlabs.org Cc: patches@linaro.org Subject: [PATCH 2/6] mfd: max8925: fix mfd device register failure Date: Mon, 4 Feb 2013 23:40:43 +0800 Message-Id: <1359992448-22229-2-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1359992448-22229-1-git-send-email-haojian.zhuang@linaro.org> References: <1359992448-22229-1-git-send-email-haojian.zhuang@linaro.org> X-Gm-Message-State: ALoCoQkogMl4jyc87b8ItCq9JWFny5pd2p1E+B/E2+u2rBDzzkycNFHn2OBCYZYldN5C3+uzA24Y From: Qing Xu we encounter rtc/power/touch driver registry failure, root cause it is resources confilict in insert_resouce, solved by changing mfd_add_devices 5th parameter to NULL Signed-off-by: Qing Xu --- drivers/mfd/max8925-core.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c index 0ad8d9a..d7abbb3 100644 --- a/drivers/mfd/max8925-core.c +++ b/drivers/mfd/max8925-core.c @@ -859,7 +859,7 @@ int max8925_device_init(struct max8925_chip *chip, ret = mfd_add_devices(chip->dev, 0, &rtc_devs[0], ARRAY_SIZE(rtc_devs), - &rtc_resources[0], chip->irq_base, NULL); + NULL, chip->irq_base, NULL); if (ret < 0) { dev_err(chip->dev, "Failed to add rtc subdev\n"); goto out; @@ -867,7 +867,7 @@ int max8925_device_init(struct max8925_chip *chip, ret = mfd_add_devices(chip->dev, 0, &onkey_devs[0], ARRAY_SIZE(onkey_devs), - &onkey_resources[0], 0, NULL); + NULL, 0, NULL); if (ret < 0) { dev_err(chip->dev, "Failed to add onkey subdev\n"); goto out_dev; @@ -886,21 +886,19 @@ int max8925_device_init(struct max8925_chip *chip, goto out_dev; } - if (pdata && pdata->power) { - ret = mfd_add_devices(chip->dev, 0, &power_devs[0], - ARRAY_SIZE(power_devs), - &power_supply_resources[0], 0, NULL); - if (ret < 0) { - dev_err(chip->dev, - "Failed to add power supply subdev\n"); - goto out_dev; - } + ret = mfd_add_devices(chip->dev, 0, &power_devs[0], + ARRAY_SIZE(power_devs), + NULL, 0, NULL); + if (ret < 0) { + dev_err(chip->dev, + "Failed to add power supply subdev, err = %d\n", ret); + goto out_dev; } if (pdata && pdata->touch) { ret = mfd_add_devices(chip->dev, 0, &touch_devs[0], ARRAY_SIZE(touch_devs), - &touch_resources[0], 0, NULL); + NULL, chip->tsc_irq, NULL); if (ret < 0) { dev_err(chip->dev, "Failed to add touch subdev\n"); goto out_dev;