From patchwork Tue Oct 31 19:49:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trent Piepho X-Patchwork-Id: 10035295 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 EEC68602B5 for ; Tue, 31 Oct 2017 19:49:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DFD6E26E7B for ; Tue, 31 Oct 2017 19:49:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D49712823E; Tue, 31 Oct 2017 19:49:37 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham 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 D238D26E7B for ; Tue, 31 Oct 2017 19:49:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932583AbdJaTtf (ORCPT ); Tue, 31 Oct 2017 15:49:35 -0400 Received: from mail-by2nam03on0110.outbound.protection.outlook.com ([104.47.42.110]:42548 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752066AbdJaTte (ORCPT ); Tue, 31 Oct 2017 15:49:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=impinj.onmicrosoft.com; s=selector1-impinj-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=jipPgmYN6O5z0/gFaGbn3aw4s1Y1uRhcHmJIzHjD+pI=; b=G/rYgy1VdLWKYhL9APONlo5hPrU8ACNNYRTb0y1FpL95GpBonzbwu5Y85SLUoTixleq9toi88zD4oKZRE7dHr0QH9sxK0kRspe4pyG/4ekNkYl9yaRb1WdQfW0YAwSn9T9mlfxxaDo79qks1zdGx/+/pttAnwMb5B/yMIiZkkZQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=tpiepho@impinj.com; Received: from impinj.com (216.243.31.162) by CY4PR06MB2808.namprd06.prod.outlook.com (10.175.118.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.178.6; Tue, 31 Oct 2017 19:49:31 +0000 From: Trent Piepho To: linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Trent Piepho , Mark Brown , Shawn Guo , Sascha Hauer , Fabio Estevam , Oleksij Rempel Subject: [PATCH v3 1/4] spi: imx: GPIO based chip selects should not be required Date: Tue, 31 Oct 2017 12:49:04 -0700 Message-Id: <20171031194907.29108-2-tpiepho@impinj.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171031194907.29108-1-tpiepho@impinj.com> References: <20171031194907.29108-1-tpiepho@impinj.com> MIME-Version: 1.0 X-Originating-IP: [216.243.31.162] X-ClientProxiedBy: MWHPR22CA0020.namprd22.prod.outlook.com (10.172.163.158) To CY4PR06MB2808.namprd06.prod.outlook.com (10.175.118.8) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2b08c3cd-a242-4aa2-2079-08d52098819f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(2017052603238); SRVR:CY4PR06MB2808; X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2808; 3:w67C0LBGArzYQZDgRpSGwAYjg7X+0/6AXzZIs54G0F4wk45oRL8Rqa4fUiSVPfjqZh/tnLwpImzblOvoK+xHtGVg2KCAPSCL7mp1U2wROolErW+iIrco0BmVh4tDU3b2d0XaAassmL96Z01ievQAJkiFmKN9GVkOtXaG5ef124jSONT3dxzxgenV44UqloS79gM8G9cRELm8sFouT80i3iJGyEkB5qGrkjN9DE8BnaiJ6qvXvWoa376kXm0qXMIM; 25:M3UExLVuU/sjKlfvKGlo4c5g5Za8wFzMt48YY2Wc68nnfFQzkGC4nxJgbwRzEzJqsa0GMR3MpD1WehmEIyDGet7Dl7CVTxO0pFwfS/URkFVm7IYPcKViN/hKo/ksMeWlawrL26g7SbStSCXnfYdUdYSGe2lEY9wgnteCMv6xbUxO3gnTky2ivLsm3CNwREtSrm4eZV5KxdWGfBTpve9sJtgfq3FunFNDHg5BjSY1tXkCjU3SVpBi6mRtTB0scJoGYg39ehQdP94O1eTO9kcYwEukKiMJuegwaarbLDgEV3h2Ko7SIXNul4AE0VjDuUR2l/5O0wQO+k55DvsUmiM/EA==; 31:ToktpOzIVYOj88B2Ahut3t1WYzIYa3SXceXqaJsDM8cgtPYd4fxv6kRM6Zg0fwa0KJ+dv8soxZ6DHYXYCIMKIEtAVaPnThfucFZpM3sSMmE84nQ50pGMRMaeHEIDTAnJkjzFkC1CW0e9MCQaXfOQD4RRKiv1/axul8Ho7TrYNtGxf2G903J+bi5gxWAOJ9jsY/DJI3wCTeR5LmOr+JrdZUaJKB6PTHDj2ytqoT9w1Mg= X-MS-TrafficTypeDiagnostic: CY4PR06MB2808: X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2808; 20:xRu2BU8UQHealf7epA9PFJPiePgV0ZLVRv6E4hBfdB6uhep0dIV/ZAK3YqQwKufSOmhtJIRjNtLl9Zrpwdmd4Wcivh4qeXVsbe+A3oOc5L20SIiG0gCW9nGcv/TtNAR53MJ0nYWC5ckO/zCbbqIKQtFLPZCB6EMf4kn+8XKQQ2uNV3jl5/B8CZoAqoXLVeif7/C5UHQpNeCj2fZgPRGTZWvzOa3R1gwKkx0kBYD60LGH9lTzmz6JYPCm+AF6duofdOGWjZA3p2l45GF2bzZ2tBv4NAfszsvSQSRd9NW55V5ZoKBvPBavleruZavJoWWeNUlADmcU1QXAdVwmw60CfmNjiR1GU49gZuMkpTh44moXjflXL2sj8gyzwEmFhlROt/PUdz9QtKokL9g9XdZIIHNYNN5pLwouvcZepKQsj4p7XQ/qZQWj/FthFWxmzV5/WnEdFQWbqmrjQSq9fxMLXeyNIaGyb6B55AJ2aYxMvOtOaS4P4HzS1HdQLvaFdW8A; 4:0k48seShsJHKOviSlDr9rVOYQCv0llYymoknEVVW3edsrAJW5gI0cFQVW+FngCmgiGz6lOeppuU40TNKMr5D8ta5wqimYeR3XFgqkZTiBmQHBb4oLYZl0e7+Owuzdaasi864vmOTYOv3q+Z0+pA9mFcciNcjUPnlqLY/4uZn+TIX1Mv5VWHfni+LbMucnz4UP1CSD3+MfLKSkIMDaY9dur8THo6sPbARoL6JD1RP6dUwmetjWJQfXpGjL9BlClfqTmb25qJU5hlVkRBhx7jCnwo2w60YmWJsjwBfj3IngphVfGEQPMQYieyDPQUs00Gk X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(3231020)(100000703101)(100105400095)(6041248)(20161123560025)(20161123555025)(20161123562025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR06MB2808; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR06MB2808; X-Forefront-PRVS: 04772EA191 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(376002)(346002)(39830400002)(189002)(199003)(97736004)(53936002)(478600001)(86362001)(575784001)(76176999)(101416001)(50466002)(50986999)(48376002)(69596002)(1076002)(25786009)(66066001)(81166006)(106356001)(8676002)(33646002)(105586002)(6116002)(3846002)(4326008)(36756003)(81156014)(2906002)(189998001)(8936002)(55016002)(68736007)(50226002)(2950100002)(16526018)(21086003)(305945005)(5660300001)(16586007)(47776003)(316002)(6666003)(54906003)(5003940100001)(7736002)(8656006); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR06MB2808; H:impinj.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: impinj.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR06MB2808; 23:Gb8db404z1TO6FY/Mw06NM/0Z2Wab6g7TRWw/54Mh?= =?us-ascii?Q?g+igb9Wu43+YprS4jrcFoj+f+THsAoClWVLfqD1g2cRXhz6qM0Fa1MyNlEZq?= =?us-ascii?Q?ApY1utDJ1XpjmJA4ZJZeuDqIgwu6Z/8pQ6EyG1iQJeAF293WsEq8M7Jsd2MY?= =?us-ascii?Q?FRMMyJmsqX1qAP112FJRu07MaCocNM7jJ6kFLDOoAOfK0K+15SCELaKVR+qV?= =?us-ascii?Q?ZfeIaHYYQBZC5sPAPhkbOQ0eVrWw75TCZ1EY6810zWYXNMXRoi49olN84H9B?= =?us-ascii?Q?hDasVrLr0TJBj4LBdLOpg8P4+73L4w5m22TuiB64SKPukYSAYZ8H+hdesuuu?= =?us-ascii?Q?HJQUvywlcUfK1LpM+PasURCTVYD28o1hpS8fkU0Lp+jN2sBe7pvP+vqwMxCR?= =?us-ascii?Q?YNABgVjggCHlU6PY+A1BxkPtv9MCUjSDh9Sd7dkK5fnS3ffTfT531nKusfRh?= =?us-ascii?Q?LKTBL0gDxzW8DAuopzhDqlOkVdJLH7YPNVJkcSt4+gmMzaX/jVSKp8LSeR8D?= =?us-ascii?Q?7GUDftnNP9R+iyuGBInoa+OX1BpdKNCNR89OwVoDi3mhv1krWIxA36ETs8Bs?= =?us-ascii?Q?Ws8hm6+7B9oxagemUKl7EbZadkjgymYluXPSag/1eSzaXPTP+9nbxtfADrmh?= =?us-ascii?Q?5Wvy8J/boFWwXHKWLQUCdvV/bjIDKC71544r1rRm1dDNmFhwfG7HH7HX++17?= =?us-ascii?Q?UpoB0nz6173mYIEBdsVJZxa5Ve4HW1NhYqXLwr55GnMgz1TyuSjRZ1YD6uw8?= =?us-ascii?Q?26rIFd0tY1jeKrU6POyIeftg3mu0M2pS8+1bbwlt+bPWTkIFZf24W3i9zBlR?= =?us-ascii?Q?8LXy0CkoXYvX7H07guy/Wa8XSE6+5Ts5EF4Bzp15umDZuX1jydXvjHw2fCHN?= =?us-ascii?Q?V/RTy57LYWlgD8K0n1qQEwnW0XE7NkFqmtIllz8m8t3sblR5oaTnrBFMYGOT?= =?us-ascii?Q?0Gs9vrhtdQC1EepZxhtl5xNHTlH7EFHxBF2bGq/YXSmRVTta1NP0GPotwKT7?= =?us-ascii?Q?x/OpRSQ6F72RNfyQmpWdZmx6byWv7dhPezabwIT794sFy1YwwHWNIYmgCV8y?= =?us-ascii?Q?fHYGSALQMhqBWgzfgL1/E5D6r8WeyPattUUs1EDMbb8SDdybLnDxaQtNylyV?= =?us-ascii?Q?1mIw3iA5eOiHX1qFkprMeLTzH4MTJyXjcqBkrVQkM3nVTrC8DH87Q=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2808; 6:A9IMUGyeJkh4NPW3tr2gIoTd5DiJNzu5EmXosnXy2D+m85GPaJ9YhdN9UjD48lY07fKgCVUxKaWa/q5jAe6xidq8E+kPbpBCEixKvE9G96O5mfWj0V9MNaYUDZpUU46WLKXKiLyDEm2fqSi7CtZjF0sCp1uv5xBEv4M8SdvQonbP1kSXlJ4r3HxFxEcA4exPTu47DkbHxhV5J18o2f8FixjdwoBTb9ytb5sEbFZt8v5UUPbh0lq42UpB6j36mDadGT9OxUA7yEs17d+j5r1BWHLsUDRxjz21Iv9XNfM3z8E5NC0r4t+EpkjC4vZh2TTnTum6SO6sp/jSGl8wpdY4otpeyFYuIqzX+I7F4pBnmB4=; 5:3QbaBnRHOUkzaCxFaBOlAGKXdkxPANHCzyDHvNsDRNhZqwbDiRj04UbNqQhcRDMsi0b/3G5x8LS1Q2YyTIN7ucqlvrYAh+uKkbpRG7Q0amPcvUO0uD2ctzaMs78/PaSOr4eicvCA7zhS8CxMzG/WcfixqUNwWGou3GZHf0QT3pw=; 24:FJJEpBd3D8Blmrzo1DIC122z+ywSwQ9XWGAeyQuNX9n23xmFJa+3Atmb6jWBcqk6fItp/spZ9hHDa7wJBVlVaD3b6VWdPFkWztWDz106mVI=; 7:Ly4KsSEb6skdmMUZABBea/B9fgq2H1WcWwE2QIC8BnxM2fNnWiw7I5bJYIzT0sX4wTtdep0N2ROfBB0a+2dKfNGB/4b2MLs1RUM1eOqboCAh7NdaV0s8rzTJPwU1sZijjKvvip/za5Zp5lXnNV/iad7qjP00TUomgH8rN7u5084CKZqQxnMpKhe2VtYuXzRuIqZsFE8RBgiiD8aOFFEieuEvzup1CwLF980o58pMUt6wC7vw6kJUkrMztW6pEVHF SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: impinj.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Oct 2017 19:49:31.8975 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2b08c3cd-a242-4aa2-2079-08d52098819f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 6de70f0f-7357-4529-a415-d8cbb7e93e5e X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR06MB2808 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The driver will fail to load if no gpio chip selects are specified, this patch changes this so that it no longer fails. It's possible to use all native chip selects, in which case there is no reason to have a gpio chip select array. This is what happens if the *optional* device tree property "cs-gpios" is omitted. The spi core already checks for the absence of gpio chip selects in the master and assigns any slaves the gpio_cs value of -ENOENT. Also have the driver respect the standard SPI device tree property "num-cs" to allow setting the number of chip selects without using cs-gpios. CC: Mark Brown CC: Shawn Guo CC: Sascha Hauer CC: Fabio Estevam CC: Oleksij Rempel Signed-off-by: Trent Piepho --- drivers/spi/spi-imx.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index fe35aaea323b..76bf0e4fc2c7 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -1523,6 +1523,7 @@ static int spi_imx_probe(struct platform_device *pdev) spi_imx->devtype_data = devtype_data; + /* Get number of chip selects, either platform data or OF */ if (mxc_platform_info) { master->num_chipselect = mxc_platform_info->num_chipselect; master->cs_gpios = devm_kzalloc(&master->dev, @@ -1532,7 +1533,13 @@ static int spi_imx_probe(struct platform_device *pdev) for (i = 0; i < master->num_chipselect; i++) master->cs_gpios[i] = mxc_platform_info->chipselect[i]; - } + } else { + u32 num_cs; + + if (!of_property_read_u32(np, "num-cs", &num_cs)) + master->num_chipselect = num_cs; + /* If not preset, default value of 1 is used */ + } spi_imx->bitbang.chipselect = spi_imx_chipselect; spi_imx->bitbang.setup_transfer = spi_imx_setupxfer; @@ -1619,13 +1626,8 @@ static int spi_imx_probe(struct platform_device *pdev) goto out_clk_put; } - if (!spi_imx->slave_mode) { - if (!master->cs_gpios) { - dev_err(&pdev->dev, "No CS GPIOs available\n"); - ret = -EINVAL; - goto out_clk_put; - } - + /* Request GPIO CS lines, if any */ + if (!spi_imx->slave_mode && master->cs_gpios) { for (i = 0; i < master->num_chipselect; i++) { if (!gpio_is_valid(master->cs_gpios[i])) continue;