From patchwork Fri Oct 13 19:54:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trent Piepho X-Patchwork-Id: 10005823 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 EFB5F60230 for ; Fri, 13 Oct 2017 19:54:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E2EAB2915D for ; Fri, 13 Oct 2017 19:54:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D6F3629160; Fri, 13 Oct 2017 19:54:46 +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 7807A2915D for ; Fri, 13 Oct 2017 19:54:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753050AbdJMTyq (ORCPT ); Fri, 13 Oct 2017 15:54:46 -0400 Received: from mail-by2nam03on0092.outbound.protection.outlook.com ([104.47.42.92]:45376 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752984AbdJMTyo (ORCPT ); Fri, 13 Oct 2017 15:54:44 -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=4Jc/NB2RzQ4S15UhWwZKkH6xxK2SpNYxkG0yJC10jPo=; b=T7iEttIAfPOqUoFdOACKqyKn5YbonMtRQDGt4jf+FMB/MzC0qsL2UegrNAsBoFNqOk8aY6v637aRH/IhzRhkSPvm3t7HhGW65sc6CBlsnhKwIe9B1qSR1WY9bH+z1OzWbxLJTu6Jp5QHE5ZP6NV8NsBIXXDjaRxHHn5DW8w+ODM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=tpiepho@impinj.com; Received: from impinj.com (216.243.31.162) by BN6PR06MB2803.namprd06.prod.outlook.com (10.175.127.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Fri, 13 Oct 2017 19:54:42 +0000 From: Trent Piepho To: linux-spi , linux-arm-kernel Cc: Shawn Guo , Sascha Hauer , Fabio Estevam , Greg Ungerer , Trent Piepho Subject: [PATCH 3/4] spi: imx: Don't require platform data chipselect array Date: Fri, 13 Oct 2017 12:54:09 -0700 Message-Id: <20171013195410.30767-3-tpiepho@impinj.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171013195410.30767-1-tpiepho@impinj.com> References: <20171013195410.30767-1-tpiepho@impinj.com> MIME-Version: 1.0 X-Originating-IP: [216.243.31.162] X-ClientProxiedBy: MWHPR21CA0064.namprd21.prod.outlook.com (10.172.93.154) To BN6PR06MB2803.namprd06.prod.outlook.com (10.175.127.21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 57a36b3d-56f8-4a50-1e2f-08d512743f9d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:BN6PR06MB2803; X-Microsoft-Exchange-Diagnostics: 1; BN6PR06MB2803; 3:IU6RP3wlILoW0WU4jxtoaUeOSvOUydArWzYIzxNUsy3hYkCPFxKPUEaAo7iVyDBJSZhX9naMIHPZZMC66NDefAY2KegoURV4nVhCZgluYSiGvlRiAOd7cGLvPwWOxLYWOGm2MprfoQl1zlNz1zmbXp/vZZAVcWRW3c62GoaJJTi4tOMkzZrr1H1pdvOJ4fZdEjiS5uG6ipsKGyAPLW4Xqd2ELdxVTrqoCAZjX9e3vK+ycDCN627U/otyqHMSyRoj; 25:5DMAjIBUV4vV1HLAHRdN8TIC1AkNZrO+X39BHiXyZAe3zZKURiYxHlDmfwGlFBGLBKjPldCYczXyjvb8mH0r+4WkNz4pyMUbBVuM3PPhHCAavbr0rf1rskFdvjGfywnjcSVHHomjEnZ7Gtrg0D3HDTs1u8vlaA5aBkXszvj+pXlEc6hnpfIoJIG8Y0UJTdfBBzK1d8hVtJCkW2J0R/WrYviszGywwz89HS3DA7iyjsIWdQFS2HDHs1kXHaTW9xXI/J8P+8pPLxA8b/M0+UbizPAt9ZhIJAyRjUPObNySUTgrXT6rVFIXhGnW2PeER4X8uRAu9lfKCegM1/UpQgxvdw==; 31:DWQAamI/X80NIv9NoMJDzkxIjkXyWNu8T4PxNUNrV/2fhq9YQsBztU5ZXYcqwLx+Qfgi6D1I49/D7xsecOT17+P0S7zIaOLB3NCUPJYv62+J6K+p2LiOhkspPlO1XTmRcYlq7GyrI70izSAQK2641AdOK9MLqGWVaWOKhtvh6MBRpQqsSnqIxjDwIpuZHBz7OtbE8aZCbZVPEUgpPQWxVuRBe76j+owI5GEwbI1V7/M= X-MS-TrafficTypeDiagnostic: BN6PR06MB2803: X-Microsoft-Exchange-Diagnostics: 1; BN6PR06MB2803; 20:kiwktuh0ZQo9rdnmd9VFJfiSs1bY2t9dYTcgTMKl8rJIjvr+hBmQa2e83FtcmIexM8HU0UtZiT6v7p5+gAJBXHZWbi5UKscASdtWXKTj38tt81AdG0fSJmV1wVA3lPq7MIJlq10PydEOcFxwdTrtpG93r5AZ8pBWFVjknw3q0Zgw1ZPRauuyNxn4xRfm2xKCzHpH66NDrmosI/0LEbtc++nOOOONZdVzNNExlfFQssn6JKuyHogposXBu6zXSUwliFlCz53TrC0wTIaPwa2hvuZvO42XsYH+ApQN5HZh7RbIzpxuj4Ips+K7opKDqVVwyOuCcnieLNBnBG0blfwdOOpq/hQtqHptOIp+PZBNPdSO2e9ArioIs0B6QDbt5qWZOnjQ3S5VdJpFlDBhLyiPfOzbKxokk6h9qShA8eeVW5OUsZAFn/N04SB34vGiGoB5mBJWYKujnGv43o3981ZzMXUv0J9XJAr1THhZ0oBpC0vO3ENq3COdefnVS+GdixIn; 4:enY52c57EBR+JMMLSzStR6zozoAtiDstk0GZgSIdap+eOhlZZIGar/sY62cNZ6IFf4xLHiBWSIqnoF5YJsb1n8yU/hNTfs25JdR5D4ooyp4N20AWm4Crcc7Q6R8/MKwuY7WciLRq1Zm8O6zBTxo1a0BLDx8ZyAr8TRYgsR7Or0twagxMn5ThD0ZD93fqpaRD56k26KBpOWUHv/7AIqDXdjFXjlff+eZyFkwajraTvCZwfkbuEVvfSl+wbo4xpBFU X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(3002001)(93006095)(93001095)(10201501046)(6041248)(20161123560025)(20161123562025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR06MB2803; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR06MB2803; X-Forefront-PRVS: 04599F3534 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(346002)(39830400002)(376002)(199003)(189002)(47776003)(6666003)(107886003)(8656003)(4326008)(53936002)(21086003)(68736007)(66066001)(2906002)(5003940100001)(2950100002)(3846002)(1076002)(69596002)(33646002)(6116002)(8676002)(105586002)(55016002)(189998001)(106356001)(48376002)(478600001)(50466002)(110136005)(50986999)(97736004)(76176999)(5660300001)(54906003)(50226002)(16586007)(81166006)(8936002)(316002)(305945005)(16526018)(86362001)(7736002)(25786009)(101416001)(36756003)(81156014); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR06MB2803; H:impinj.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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; BN6PR06MB2803; 23:VQp6PutCfPnB+LNhiAoh3s2NquucxcHX0s234tQYI?= =?us-ascii?Q?nK5Iht80Q4YWOVq8GHEbWeXHL1RuQWrbliByJMnyVoVoMIdBVV0xSFsB0v37?= =?us-ascii?Q?mE8y2Kgii+SvujUIvive/SAwhtZVapJUxY0ot8ZknQQjCeWAeDNUE0WITNId?= =?us-ascii?Q?Oo6CFPty69p6LXUD4DPZxkXEvqijhOK02+RgHR78ekJsAs6v48IVqpTer5y5?= =?us-ascii?Q?+75iPTE4h3hUC0tqfqus1bFn+Tn8F3VQEb6gfGullup7ne+80WnHLL6UN7lJ?= =?us-ascii?Q?57rnMEyjwr+9G0VE7qLdG3u/HxmqHOYXOG1Bt3G4mYhPUeKYmwqQG/s0eQ7m?= =?us-ascii?Q?IGrFw/QJ3KbmYkRfSSuekt9Wp6EaW03chtcsrgCpoCvUNxRkBeItwqN5LIKS?= =?us-ascii?Q?xiu+5tszTf1srL0UAW3q9+zoILtlNJ+pfyDTnfVkV9xQsR9XITD9b8LR6Lro?= =?us-ascii?Q?JBcn+Hc1IfGGf90HdL/j8wrZneaEsxbkL64x09xW7l8g3XNikQZpne24g8iz?= =?us-ascii?Q?zdLIzQcg/hDZaolJCMW2SMekGIVvGSUnH2PZpQ/00Z/C+tKgpef6dSpPfO4G?= =?us-ascii?Q?TRiILUI06wLqnxR2JjjPo3whGCXF+/gzxHhFexZPXQa3DPiYH5WKNvQYVemz?= =?us-ascii?Q?zxaFnYMH+tOzIOpr6VHYXKmbRi2qgrLnKWkFSzP92YY5pS30kuRU0X3oC0wa?= =?us-ascii?Q?7lhJb7z1IsxTDPyluVDYsxCOSx8VXZPdIgWlHYkcn8htoOD3Ewrsp5Nzfxi1?= =?us-ascii?Q?bUQxLxJO7ShW7mP34q5gldacpJDJ11L7tq1Mi1WdyAyzR4L5UI8w/ra/NKbk?= =?us-ascii?Q?p+xJrkTVgESmcd+KH2W8aQ+PiG1uQ1eRIjsIFPmuiSxfO7GOEN69uHiVbqfL?= =?us-ascii?Q?/8Mm5iPAhm+waA1VW4WvYKnSldjG2lqmETAOIDuH7QFOw1opBB1oVBatCcuA?= =?us-ascii?Q?dU2b8z/CWNgZLpSBv5Z6QxG1UHYKzUY+Y6zxXnRTIZy0Y+EAlyrxGYiDE2xX?= =?us-ascii?Q?mgP0nMGd0dH1Mma1eTYvodPRYmUEqi6nIzolT8r5fMl0eHspjsahu2Ncw9JM?= =?us-ascii?Q?Ekncr9yBJGFCSCcKjq58Fzr1/kp1ySxmzeBNg+mFWsmrSzTJi0DKgwhEUcei?= =?us-ascii?Q?MpT5hNi5o0IEAZr33P1/AXJm7TDyJM4FZGi0SQ51k4jkgGMwEMSJXwIy6YWu?= =?us-ascii?Q?p8YAKTgAnuAXzw=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR06MB2803; 6:7SkZVt0pXxgRzIHFtgznQa6ZIGRuGLvawjgT3tFYOfOULGznqRmLIR/5iNDYkK2SFAfdJoaSHpBYPU/H3txggLNiNGjl3DQgMKISvjxK1HCBqie2KYasdJ0fRQ5s6JIFoM/k36nKE5g5nh30QDWR7DhUvGURLbfBa3hqFi2OFRG81wLnzhm9zmU6ug1xs7vuz+6lG8n/5sV3H1DafskWHJXjxKKmMfNpXOrxkYhSXgdXXpfg/aXtZmgpewcN30mcH77w2Fh0OQ4EBKb1D4A8t8fotCIqYeA/fuRqk+v1Ir+Nc1k+gQ6LkVuZAkV7TgrMdj0HOonJU4Y9CXuLEkwJWw==; 5:iyKK03Lm03HbAwwdoMneLz2V4MJYoi5UvPCOobW91pApQEjxYDd8AdPMLoWQtWfDPWq7FPEEavgoIWq6uCu3VYyzPpBdzX500FK1EXTUJshix9WY5+dIfL/EN7zAQVb+K4LDjRB6L0QwHJDSBv8w+erdddhwBx5rn97c7qmKNrg=; 24:EJDIfkD75N2KPdgDubsJxv1fAEROaiFOXoqn2MfaMxKyXrX9XzMX9RDucl448bPjLXnds1c1XUQbAQXVhMYZqdCBSuhgKmmojNVLNv56564=; 7:w+jNKbCkkWM8bMNUT2FXNFi8EXnMmfD4wWBYNiCpaG3j9plpOa7H4sSqReAcK8tnB8Dv3gFqFPC7KxLTi2nIdP/mHend7L8OGSfmPYTMggWDFEppPYLeNLz+44BYdWAFQSBPAbXpaVa2OUxeEe5CUu1ZHkTahGwY4nLaX5gCE2y0JBt1B46iC5BTSG7lGhtCxFoFk8XgtxbrpxAYIVRasB9YrrUAsziGCj6JZBvqejE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: impinj.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2017 19:54:42.8685 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 6de70f0f-7357-4529-a415-d8cbb7e93e5e X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR06MB2803 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 If the array is not present, assume all chip selects are native. This is the standard behavior for SPI masters configured via the device tree and the behavior of this driver as well when it is configured via device tree. This reduces platform data vs DT differences and allows most of the platform data based boards to remove their chip select arrays. Signed-off-by: Trent Piepho --- drivers/spi/spi-imx.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index fea46cbf458a..3a2c34522655 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -1364,13 +1364,15 @@ static int spi_imx_probe(struct platform_device *pdev) if (mxc_platform_info) { master->num_chipselect = mxc_platform_info->num_chipselect; - master->cs_gpios = devm_kzalloc(&master->dev, - sizeof(int) * master->num_chipselect, GFP_KERNEL); - if (!master->cs_gpios) - return -ENOMEM; - - for (i = 0; i < master->num_chipselect; i++) - master->cs_gpios[i] = mxc_platform_info->chipselect[i]; + if (mxc_platform_info->chipselect) { + master->cs_gpios = devm_kzalloc(&master->dev, + sizeof(int) * master->num_chipselect, GFP_KERNEL); + if (!master->cs_gpios) + return -ENOMEM; + + for (i = 0; i < master->num_chipselect; i++) + master->cs_gpios[i] = mxc_platform_info->chipselect[i]; + } } spi_imx->bitbang.chipselect = spi_imx_chipselect;