From patchwork Tue Jan 30 05:51:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 126207 Delivered-To: patch@linaro.org Received: by 10.46.84.92 with SMTP id y28csp3064158ljd; Mon, 29 Jan 2018 21:51:56 -0800 (PST) X-Google-Smtp-Source: AH8x227n7fiNQ1jCslx5Nu6XrM/NxllUUcgGkjsVPMvgCbzsN01P81JAsLtjrnUoH70UTns30cCU X-Received: by 2002:a17:902:8545:: with SMTP id d5-v6mr4308496plo.306.1517291516540; Mon, 29 Jan 2018 21:51:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517291516; cv=none; d=google.com; s=arc-20160816; b=RvPMpQLLGVx15FniFGRkFe6MHEsvLUx3Xw/pO+mG6MgDv2vkmhU6NzGDUuZMHaEh4e IAnQpr102/6kqgg2rm5w6JCtLw7aHaKKSPVv60Kno+4SxIId04YmhVvhSngwn23sS8ta T2AQD84BTaVT5GEAgH5OUGjpw2evncUqNpgbONi2qrsHvX+x2QVdsw920GOZMjZINGZO gNDvRVK/31nU8eWzhssZAUcMxY6mLfVCYU0GEQaLuN64lKS2mVrn8f1b7sUbyisiFeJC mvZV+Uauwut7xuhBSVH+fIu+zGMOGk4AyohZS9/EDJgJjlUq0MZGVuhL0vhNQnR2UZnA gwAw== 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=u3l8ZmGOaMJ3uICv1NmSLUmADybhVHEO0J4PAj+G9gGvILnvI1GYQw/d3RiBefmraq dqU09539xXiJygAIAAaB8txyScpTtpMsvfjOH6ZhoD40SrOZM7xNqbu2l6gtWGslsC95 Mo0wPewPIpsebFEwztnS1SW5b0k3jJZp8ApMFRuTlIf2wbEo5Bc3HRItnE4UnXOrB9a7 8kNje5byoewW1OJ93pwq6YX3mK4FO7a2C2C0/SPYFhhsPN6enP9CAoHGtb1Zxc9C+ILc ArlE/O3zN42O17PLWDYS7Ynb61+hU7E0CnbB6fIiPt++Eox+W2hX+tWCriMJF400Hamq Ysng== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=RjK6dc9L; 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 k12-v6si909981pll.576.2018.01.29.21.51.56; Mon, 29 Jan 2018 21:51:56 -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=RjK6dc9L; 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 S1752868AbeA3Fvv (ORCPT + 26 others); Tue, 30 Jan 2018 00:51:51 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:36647 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752293AbeA3Fvr (ORCPT ); Tue, 30 Jan 2018 00:51:47 -0500 Received: by mail-pf0-f193.google.com with SMTP id 23so7818926pfp.3; Mon, 29 Jan 2018 21:51:46 -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=RjK6dc9LR0ws5eZNTsOpR0lyIMzuOiZ//PX4pG4dbmeKTZi13UiXc6tfxN45ELeNiU t1K/F+8fyo3DMkMBQDTWzvgL6e8JckVrr3aByNwoTd/ACQEVIddEhx9hVQohT2LVdQ57 tdqGie1O+PR6x18upKqF7OqTRY/Nm+pD4IHpNHddRg+Aby31xMCCXDt1gvLdReaEeV0w f4lS9rC+buQW3KeNqvoTFoU07MDPUrZgpkInMM+j4hFNaTPTXJTk4Q+ke/w+oi9JQ29t yaCvPwlsK2vKnIvsLUiULtRHBUZPpF9Tpgo1F+86K0o42z51R5h/llzHV+wf/LXOpNwV ELZQ== 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=Q87/FOdNy3MD9jdJjmmfhyXU2lhAzkI6Rrv4wv0tj7K+f3Ho/OutSqwLgpKT+laDxA K4HqXAkJP3kc4RwSNojFePSedtmw5sldpzSAg/GkiYjHWG1dAnBb+C7TKIz6Ghu9Swi6 IvuLxl0iBbiAjkcZL083MnDF3nA/IPq9Zb9gv+ajcGmiYKwKndz3yMB0ABiE7ynyiFwr IYFfNUBVryC9Je8QteQQOJRbB+WvjjzTwhnBksxEQ857q9gb7e+OY18WUwBCa+SKpwQO 6/zbaM/rn8giF8aIr9UzlrHpJPbv+01gEAB/W6iNuGzLlTVuTjC861me4DP8Or7lCWtu aHkg== X-Gm-Message-State: AKwxytckuAvtE00tri+EN0PWSpQhoENyA1Cad9Z7oTXwVyeSZ/2svXjk aNPA9zT2Lfcs/yJvQx2dSig= X-Received: by 10.99.125.88 with SMTP id m24mr22705287pgn.277.1517291506407; Mon, 29 Jan 2018 21:51:46 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id e13sm872310pgt.82.2018.01.29.21.51.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Jan 2018 21:51:45 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Tue, 30 Jan 2018 16:21:39 +1030 From: Joel Stanley To: Rob Herring , Mark Rutland , devicetree@vger.kernel.org Cc: Christopher Bostic , Jeremy Kerr , Eddie James , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] fsi: core: Add check for master property no-scan-on-init Date: Tue, 30 Jan 2018 16:21:16 +1030 Message-Id: <20180130055116.17411-3-joel@jms.id.au> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180130055116.17411-1-joel@jms.id.au> References: <20180130055116.17411-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; }