From patchwork Wed May 23 11:42:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 10420995 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 42CB36032A for ; Wed, 23 May 2018 11:43:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 33DAC28D5F for ; Wed, 23 May 2018 11:43:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 28A5728EB5; Wed, 23 May 2018 11:43:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 900A928D5F for ; Wed, 23 May 2018 11:43:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932677AbeEWLnB (ORCPT ); Wed, 23 May 2018 07:43:01 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:37894 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932662AbeEWLm5 (ORCPT ); Wed, 23 May 2018 07:42:57 -0400 Received: by mail-wr0-f195.google.com with SMTP id 94-v6so25882412wrf.5; Wed, 23 May 2018 04:42:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FVkCdsRgDYnfC9GNcGfoTtsIJMoMQ6YtmMXYL/1p94M=; b=h/rkGJvPpSxDESHLNuD4i15OJmOvdRFx7PnA/uxmtSQmkpOKMe3b6egjn28fUpQaDZ 0QIzcS4PFu/CzUWGjvgD7zcKSXE+a+KilY3FlNyA/VNxOp8wcn1hNu0h4DuUZ0I/CMgy y0M51c3+bx1sEAwUy8h2fsYH65VFgxpE6PeshaYD4ezROP6xJpnqXg9HdijQRgiD+vbt jleZV4IALmWQMT6XgyjLR3l1imHe0tx/gWsBFX7HrIBUQPTGWdpGaKO+rX5mNjOyi5z+ O/56kPaV8bZ/mJy5nWFws0znESq5iNYGnEq3GGXY4Ea15wCoAyTuu7WpWWteHZOCAmSk I6GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FVkCdsRgDYnfC9GNcGfoTtsIJMoMQ6YtmMXYL/1p94M=; b=ChtX+oYsemeHdvBk1zrReRwYshMcsvNm+8/w33CvoJDjH0aBXRojkm6hzJK9AZsxBp IbC6C66GcL1LCcdmqDgTHnbINOA8C5N9I44fQWImjCT2lAzq4q2tucBJyb3FinUhwqDB O5HxgPOI+TyVOmVtEg3INIlhhduUmMHQXYtlsJCPFXE2ltUGytec8sO2j1DpLlUav/d9 wxtiOBiOlTWDMb0Z6n3R9PlLguOh8hPZIL5TkUQkeczrb5goIOuNUvmo5OT2mDMbgmSK 2Q0lJ0hGcxJ1C/HRoOeF/sGRIkLySJvov02tjBtXtac65zS/myloTtynijzLexfPr7Fi XWtw== X-Gm-Message-State: ALKqPwcM14gL4dIUT6MGNTuMd3U/WZgiI3REmKEQKgMpQn56AlunWqgk JPiDCtY5Kl+t1TDJoYFV653bCCd5 X-Google-Smtp-Source: AB8JxZrNovUUBdops1xIBOqmJzQRsC1plFiktWGd6Tic+894cDxvIbOPOnXhb4Qap/Gq/5nQmKQipA== X-Received: by 2002:adf:92e3:: with SMTP id 90-v6mr2106630wrn.64.1527075775344; Wed, 23 May 2018 04:42:55 -0700 (PDT) Received: from kurokawa.lan (ip-86-49-107-50.net.upcbroadband.cz. [86.49.107.50]) by smtp.gmail.com with ESMTPSA id y45-v6sm17382223wrd.97.2018.05.23.04.42.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 May 2018 04:42:54 -0700 (PDT) From: Marek Vasut X-Google-Original-From: Marek Vasut To: linux-kernel@vger.kernel.org Cc: Marek Vasut , Geert Uytterhoeven , Lee Jones , Mark Brown , Steve Twiss , Wolfram Sang , linux-renesas-soc@vger.kernel.org Subject: [PATCH 4/6] mfd: da9063: Disallow RTC on DA9063L Date: Wed, 23 May 2018 13:42:28 +0200 Message-Id: <20180523114230.10109-4-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180523114230.10109-1-marek.vasut+renesas@gmail.com> References: <20180523114230.10109-1-marek.vasut+renesas@gmail.com> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The DA9063L does not contain RTC block, unlike the full DA9063. Do not allow binding RTC driver on this variant of the chip. Signed-off-by: Marek Vasut Cc: Geert Uytterhoeven Cc: Lee Jones Cc: Mark Brown Cc: Steve Twiss Cc: Wolfram Sang Cc: linux-renesas-soc@vger.kernel.org Reviewed-by: Geert Uytterhoeven Acked-by: Steve Twiss --- drivers/mfd/da9063-core.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/mfd/da9063-core.c b/drivers/mfd/da9063-core.c index 7360b76b4f72..263c83006413 100644 --- a/drivers/mfd/da9063-core.c +++ b/drivers/mfd/da9063-core.c @@ -101,14 +101,14 @@ static const struct mfd_cell da9063_devs[] = { .of_compatible = "dlg,da9063-onkey", }, { + .name = DA9063_DRVNAME_VIBRATION, + }, + { /* Only present on DA9063 , not on DA9063L */ .name = DA9063_DRVNAME_RTC, .num_resources = ARRAY_SIZE(da9063_rtc_resources), .resources = da9063_rtc_resources, .of_compatible = "dlg,da9063-rtc", }, - { - .name = DA9063_DRVNAME_VIBRATION, - }, }; static int da9063_clear_fault_log(struct da9063 *da9063) @@ -163,7 +163,7 @@ int da9063_device_init(struct da9063 *da9063, unsigned int irq) { struct da9063_pdata *pdata = da9063->dev->platform_data; int model, variant_id, variant_code; - int ret; + int da9063_devs_len, ret; ret = da9063_clear_fault_log(da9063); if (ret < 0) @@ -225,9 +225,13 @@ int da9063_device_init(struct da9063 *da9063, unsigned int irq) da9063->irq_base = regmap_irq_chip_get_base(da9063->regmap_irq); - ret = mfd_add_devices(da9063->dev, -1, da9063_devs, - ARRAY_SIZE(da9063_devs), NULL, da9063->irq_base, - NULL); + da9063_devs_len = ARRAY_SIZE(da9063_devs); + /* RTC, the last device in the list, is only present on DA9063 */ + if (da9063->type == PMIC_TYPE_DA9063L) + da9063_devs_len -= 1; + + ret = mfd_add_devices(da9063->dev, -1, da9063_devs, da9063_devs_len, + NULL, da9063->irq_base, NULL); if (ret) dev_err(da9063->dev, "Cannot add MFD cells\n");