From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3AA61C2D0C7 for ; Wed, 11 Dec 2019 15:12:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 086D924680 for ; Wed, 11 Dec 2019 15:12:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077173; bh=B1UXAB/bYlO/FlMXnBATFCOrk8JDbFA9GLvu61ZPP70=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aQnY8ZOoXnLn1fiqlJZPl+s0P29bPQ1DVvG2lsOljxwUvsreMFc5XWkR/BoNqgCt1 FEYj0T4DRWxY3sHfbReBlOVbcZ3Ats+7ut86rjwacNuELJJRnjpQ6NSTEbB8y5AuYV nHcs/uQ4djDvFS/P2b1CL83rJ0iRaRjtcU2UeW0U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731246AbfLKPMw (ORCPT ); Wed, 11 Dec 2019 10:12:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:35196 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730864AbfLKPMu (ORCPT ); Wed, 11 Dec 2019 10:12:50 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 61B0E24658; Wed, 11 Dec 2019 15:12:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077170; bh=B1UXAB/bYlO/FlMXnBATFCOrk8JDbFA9GLvu61ZPP70=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U0HUswer/HvHYZ4FOZVKofLysiCMZV/EatgzhSyijh5UvHgOjVs+4+8pHaQde+gZg IiX+Ff5Ba1So3yA7acA29AE23oWXrz6DIaWAeDW85lqgkrSkyj6ifWNCbDjEA9pvW7 ij3wKAnCDqBf7NECeEhEQoB2hk9TuyqXs36mFee8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Lee Jones , Barry Song , Stephan Gerhold , Daniel Thompson , Mark Brown , Sasha Levin Subject: [PATCH AUTOSEL 5.4 055/134] mfd: mfd-core: Honour Device Tree's request to disable a child-device Date: Wed, 11 Dec 2019 10:10:31 -0500 Message-Id: <20191211151150.19073-55-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191211151150.19073-1-sashal@kernel.org> References: <20191211151150.19073-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Lee Jones [ Upstream commit 6b5c350648b857047b47acf74a57087ad27d6183 ] Until now, MFD has assumed all child devices passed to it (via mfd_cells) are to be registered. It does not take into account requests from Device Tree and the like to disable child devices on a per-platform basis. Well now it does. Link: https://www.spinics.net/lists/arm-kernel/msg366309.html Link: https://lkml.org/lkml/2019/8/22/1350 Reported-by: Barry Song Reported-by: Stephan Gerhold Reviewed-by: Daniel Thompson Reviewed-by: Mark Brown Tested-by: Stephan Gerhold Signed-off-by: Lee Jones Signed-off-by: Sasha Levin --- drivers/mfd/mfd-core.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c index 23276a80e3b48..b0afefdc9eac8 100644 --- a/drivers/mfd/mfd-core.c +++ b/drivers/mfd/mfd-core.c @@ -174,6 +174,11 @@ static int mfd_add_device(struct device *parent, int id, if (parent->of_node && cell->of_compatible) { for_each_child_of_node(parent->of_node, np) { if (of_device_is_compatible(np, cell->of_compatible)) { + if (!of_device_is_available(np)) { + /* Ignore disabled devices error free */ + ret = 0; + goto fail_alias; + } pdev->dev.of_node = np; pdev->dev.fwnode = &np->fwnode; break; -- 2.20.1