From patchwork Mon Feb 12 05:15:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 127929 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp2879207ljc; Sun, 11 Feb 2018 21:17:48 -0800 (PST) X-Google-Smtp-Source: AH8x227qpQDyPEjXZ+eZfBCyKMnqNPbqv7JvoXWUFKXngXLZlVPQ1NgvlVLRXHEw3QWH/eaA9YKu X-Received: by 2002:a17:902:788b:: with SMTP id q11-v6mr9600847pll.378.1518412668431; Sun, 11 Feb 2018 21:17:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518412668; cv=none; d=google.com; s=arc-20160816; b=gKCHqngzUraYN/dR8ZIFqGdvFjlmDsecBitysgu76juDaO85PPrX2tZQvFG87ArzqA zXkAw11c+D/ERHBjfJjOhNlaI+eJx2BcGxOFRChfae3YO7CcTeQ1dmBIPBxQBhve1rEV iWTcJNyI+2u/ZEJiOUu7DO7AKYFJ8RG1sNlXU4USc+fY9pnWALEsDdZm33oXCPNcF9Ik PxKAJEFb4hLsZBR/33K64dhfVInMEjV0wgXiL1rDEEJisjj/rIo59OTcxHtFD8N5L2dc dZbddSKCyW0tX11vgJQRFYUwnYGNq/R7KJcRg7cSGOOcEZBQIegkjJs8270GvmEfum1Q CLdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=9HLKuK1/pBm+NbqrvAiLkuHp7HO92Uh28VXRPfqgPIM=; b=jjzt1wdDLgWTxCJURbKCN+hDid7HYeL9mTRMdRugZ/AYoB2v8vOFR2WjzOTfc8qr3I kbGyp3VeyzdYLJGNAUvWemsvp3cv7C88AS0IL/pqyXXBnZwxpgs3KW+1FAsQJiCNlVGJ Lpi6jTMhkWOUuNMDZORBvNGN2/MNifV3q5+LAz1YoN0ZWINhaSDUbFAG+bI/w3job9fK AWGEIUbJRnXPHo+Exn/50AoI7VPU7WG1gcb9s7t2wxK/GHPREyzUy7MB6qk5UvajF4Zy ZjVOlTVpd+8XZLmeFqlgLPJCKQm7HZoxdfbjCX9MebccLuo1mc5iFx2B7EfEhlnjd5zI /p7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=aRtIP4uI; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l5-v6si1901551plk.390.2018.02.11.21.17.48; Sun, 11 Feb 2018 21:17:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=aRtIP4uI; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932769AbeBLFRm (ORCPT + 13 others); Mon, 12 Feb 2018 00:17:42 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:38063 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932467AbeBLFRf (ORCPT ); Mon, 12 Feb 2018 00:17:35 -0500 Received: by mail-pg0-f68.google.com with SMTP id l24so784208pgc.5; Sun, 11 Feb 2018 21:17:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=9HLKuK1/pBm+NbqrvAiLkuHp7HO92Uh28VXRPfqgPIM=; b=aRtIP4uIZrLnr6fGINFm0CSBIzU75xWidNI88+tNtehktHxd61wn39aKE7IcFjMF2y GkRH61SRueE2b3Nos+3pJQyo6vIaQVAeozIJ92YajIDY6BZAE25GIC9AoD+sp5p1MFxi suwa9rQu7XWhHAWwuR38ghm9wopdTBPCpYZ5mw+P6Wwqz8dpqtKIQsEFg6NwJE/OJTCY 75r68Zj73QSk0ak+S82clPzvXIdHF5AypTXVdhS37l2r+bh0i7eS+U0ZARR11+XhTHsO /s0903V5maZf+L71vWFabvCf2MkbnAKykUtkLMd7+Rip0uFJms2Pw6E4f1jrFbk4Gih5 3AAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=9HLKuK1/pBm+NbqrvAiLkuHp7HO92Uh28VXRPfqgPIM=; b=seI6wvAv51HbdfoLMIZ9i7qF7LAJi/Ri7PMkimE4HqLwmB0e4/oL4hAS+Kl9IIgHEK ey/UoQxCp8Ztbb5oCi8Kxf0SX932Rwm7Bl1XuWqISN/a4EvfZO/AxW4Iln6uD3995Jaq KbKWNIz37Fu+NKMuk1aT/Y6mViooiC9Jyeq6/hLRzBubJTTC7+xiJggjlwyxub5gc4dx b2aTRoSqDUNg7nYlrRb/1M5FTNxliNUDOlOHd8zxe+cZtTGBoeCkU8DwcN2kZFyqoPiS E6w4rCwzNCwvVomEoBmRibW5dYd/zuQhqTpCBeLqviuYGu+jOPqAdUo3K0NKbIjQ/bQi D2OA== X-Gm-Message-State: APf1xPCMjdfVV6yNXFds41k1X3DBnGEtp3tlwTEvhqBFgezWNwiF+7T5 9n8TvbygPnzTaXFU0XOcdWI= X-Received: by 10.99.168.8 with SMTP id o8mr8619231pgf.42.1518412654888; Sun, 11 Feb 2018 21:17:34 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id c185sm25064114pfb.146.2018.02.11.21.17.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 Feb 2018 21:17:34 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 12 Feb 2018 15:47:27 +1030 From: Joel Stanley To: Greg Kroah-Hartman , Rob Herring , Mark Rutland Cc: Christopher Bostic , Jeremy Kerr , Brad Bishop , Edward James , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 10/10] fsi: core: Add check for master property no-scan-on-init Date: Mon, 12 Feb 2018 15:45:49 +1030 Message-Id: <20180212051549.8575-11-joel@jms.id.au> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180212051549.8575-1-joel@jms.id.au> References: <20180212051549.8575-1-joel@jms.id.au> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christopher Bostic Prior to scanning a master check if the optional property no-scan-on-init is present. If it is then avoid scanning. This is necessary in cases where a master scan could interfere with another FSI master on the same bus. Signed-off-by: Christopher Bostic Acked-by: Jeremy Kerr Signed-off-by: Joel Stanley --- drivers/fsi/fsi-core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.15.1 diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c index 8d8b25809452..4c03d6933646 100644 --- a/drivers/fsi/fsi-core.c +++ b/drivers/fsi/fsi-core.c @@ -901,6 +901,7 @@ static DEVICE_ATTR(break, 0200, NULL, master_break_store); int fsi_master_register(struct fsi_master *master) { int rc; + struct device_node *np; if (!master) return -EINVAL; @@ -928,7 +929,9 @@ int fsi_master_register(struct fsi_master *master) return rc; } - fsi_master_scan(master); + np = dev_of_node(&master->dev); + if (!of_property_read_bool(np, "no-scan-on-init")) + fsi_master_scan(master); return 0; }