From patchwork Tue Oct 31 19:49:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trent Piepho X-Patchwork-Id: 10035297 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 88C2F602B5 for ; Tue, 31 Oct 2017 19:49:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A6242808F for ; Tue, 31 Oct 2017 19:49:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F5422823E; Tue, 31 Oct 2017 19:49:38 +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 53D092808F for ; Tue, 31 Oct 2017 19:49:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932673AbdJaTtg (ORCPT ); Tue, 31 Oct 2017 15:49:36 -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 S932655AbdJaTtf (ORCPT ); Tue, 31 Oct 2017 15:49:35 -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=m0tCcE9gsZjuqTl6avmTxNs5FSqi4rspflBFktuikGw=; b=mI55abIAc+t1lfXJxrekealfxgm8RIGK3sbmuu5nmCFeX9bAeB1fkIOEGJvgS5JAe8/gb2Q0kJQcTB9+QdvXpnEQjar/XNf+RPwX37p7zPq034D75x18Q+GA8r0KNsJr+QVKhaQ0F0DAO6WmAYWYQhfl+5jwqaQymCILubEgCn8= 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:33 +0000 From: Trent Piepho To: linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Trent Piepho , Shawn Guo , Sascha Hauer , Fabio Estevam , Mark Brown Subject: [PATCH v3 3/4] spi: imx: Don't require platform data chipselect array Date: Tue, 31 Oct 2017 12:49:06 -0700 Message-Id: <20171031194907.29108-4-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: e3effb44-55df-4053-da2e-08d52098829b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(2017052603238); SRVR:CY4PR06MB2808; X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2808; 3:GlxUcbgtYL31LiALe4Rt6zHt7mat6X7clI/QbewmFMfCfne2Lq8MwE7r62mXcQoirW0cyY2SvDudE8xX/Y/P6swuw+XNKlmgasyqvF0WHFpNwlGayqsqLRDP5Kg1HH9zIhC4iMryAk4oL2mxfZarF7ucnqPOaA2LtM05RfovDiakcNVh4jqDn8RivkNDYBZ0XjMoG+bxFftBUDwnDZpVYQ96bDhqZCd3C0mymBBrzvTcwe71+vD9FQHjjOjyhKWV; 25:YxfOklCa4ZcaF0qXINR5MzXFfeggdIMXUr1YEkowedUeNwumEZBQBO5L8HR2LWtRNyLM1DHTWFx+D/PE8XUX9/z2oFnx1yAzdtLeFE28ux61ZHelFrJkaXV26t4tDquGJH+pB7/nlF5s3EZsUXQi9etGBhbmKKYyNSQsNYRTNzYkV9qPDLmdA9ndbWUAxDv84COCeIrrFxrb5AAd5Us1r+Lxmhw99EYMeOcMNpFuXNsU3tiyVreOYKapvaVeVWYAf3ePFqyAsinNNxY0XCrXtWGlzV2554ddmvNjIH4D7i2DryZ2X5uAsDnA3MPSdQCuNNQm9VEkzxz+RX6luoYElg==; 31:H0cNNlg2rsHsCeZ1NOpLTT5lt0rUZhDMEYoNRRtMB59CYPH0lEXRhbQzjbWMp4ffoosmjJhYI8UI8Pj62mbFUr20rh5VeauQCPsEvDSzxb3FK483lvMjsp8XUV1DvjvzEXMr9Kk5JjAIxR4LSg4gBcceUQVzZvnqJZloo8umvxaM79FGvaeOVDYVY+pmMX3KcaQWEjNY0+8XguUWOC+L5IncWe8JjQKk8+2cXQJke9k= X-MS-TrafficTypeDiagnostic: CY4PR06MB2808: X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2808; 20:bQDqWgcBcF/dYI9PpW8GTC17LkhkMnZwj3gS8uGwFgcyjmG1Oh2z9ZbJZxFm5fVl5AgK9hlHQW97Gxzqq3Ih9GCDKOj2YOIIhhea6XOvLsdHUhmE/2Vl19EYEvj/sAuOCYnE4DK6J7i6TMwmk/CvA96jnVcWXyr9MH8ZT0jq+q3pMaHMsO/CBVdB18mHYZ23Hz+DoyxA6UGudAamv3L2EP649jtdmZZDEqmRlzkBnB/go9PPMEQpUjkzgRruqgep+/a2zdqLFiBeRLXWS5mt3v9tLQeg0VkslN0nxKHEiGBkv/Tx2ZMCP/ouf3DbBwl/19XqXm2K+MyjvtYgHrR10Xm8b9KjLJxFTJ3moB0QnKhc2ZcpjISjGRJjOKuztWneWvmxAigv+hNhCKML70sjBO/dFQmQBE5hiwKgoRPKGfS6M6lEYQNjPTL1DbA1a9MNiQ0KM6xmm967ib4zYzYtWfhUDE9TCoV/4jAfsy/uceF3rxIGCaiFeDj1Z2/k/bVe; 4:UlGwRFeHIK4PmkM04W+ulTn5QaBotH+I3QEBIJLfP9SUGOoQXT+KvkqGA9seXN51uZz8xnBEL1WzET1C4hLP44+phGIgtyDlbXWSyZU4UCZTdEkrjjvA7N8hiHcS3L1Pke5gMkEoCQXjAAp9tF3/yb3eDKSbswEWh+i7tO7BzC41jHZiujozoEkVfgxln2VNO8sfxk7Pmly4wret3H88al0XTGO7lFlcnTds1FSLlmPvS6dpX0hmTty6K1F5xE5fO0qSSW6HkUjIFtyqOq0ahFjfhOKxw00A+sQdx4OjEh1Czr5UWLIxX80wBKXa6R6n 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)(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:TFys/lB5LtpHQl9q9XPOeJPOhXEmpbKhPlK+0iY3U?= =?us-ascii?Q?R9koXdze0j69sQD22N0Xw4Quzdfn/dCUPQEvWvvTpur7CJ2rSq6EsIngDdbs?= =?us-ascii?Q?vWhQeLtwXXV2RP+En36mZ+mkTYSmlF0XucDUP2tpc40D6+svxhitpeUoE2PO?= =?us-ascii?Q?R6hf/Uvprmu/3mDuSxaSnTtNpB19Mfj3BzEYbkNiZ94rvqn/a/OYbZk85bRH?= =?us-ascii?Q?QtNyIpfONlY3TjkFaHKyX0GqOIm/NS44pZoTFULe0i80mGT9/uXvFKyRZNsl?= =?us-ascii?Q?AgRs1P4NDTEMXl5tchsDgRmqYU7jAORy3FRyCSBUxhpQKZ/Skcif9eXn54Gn?= =?us-ascii?Q?Q+UkiE1BoLktUd1l1WY8I9ScwEJFY4svYTYFuPCMxd0TlW7m93Zi3pVHh25L?= =?us-ascii?Q?syJPiw8Ra1nQbLUZRFxv6VNdz+aBksW8XOh4aB5H9YLVbaLnb+6zXNEsNcmq?= =?us-ascii?Q?76kSC46SvZitZThUReGgr9FknCmAJUTfjhPgHt1Ml2C/JnO4mdOHsYxPjc3F?= =?us-ascii?Q?D6rpEopEaKcrmJbhNsqTePF/VaIwuoKESxeuaZ16Qjpt/ylF66ryZtdRIIhL?= =?us-ascii?Q?8u83ajrdEK1+8Yz4B/xsC7Of6O4zYwSVBS+mQgyaCwUcudDyH+LdadVjbBcM?= =?us-ascii?Q?okIiSYnFSF6SVHTBiWD+zspIF+mLcKCVCALW+If53XAZbpANjVj6Gd0S8hn6?= =?us-ascii?Q?lXsrHug94dhDEO1U7K3JCh1owfNvdzbBaAM+Y+HdiNTspTRUTuOu0YRhRzy4?= =?us-ascii?Q?Elj2ysm01P4gN7nS5DlNV7UnP2ObzRA+Sr2q38BpxxO0CvD416NRmpg0P4kD?= =?us-ascii?Q?0iAZap6YVu51fXu/oq21NFfSa1HqfgNw0YoSriKIJQ0lS3GSesfZ4QpUSVbq?= =?us-ascii?Q?u3DG4/jSm3Y+LMlgjdjWNtjjhRu4YTcqOmTonNR7BcFzfIqjwPB1fu4oz3TB?= =?us-ascii?Q?SbDvw4cHPq4VzZWPVY9FXkR9jiVcLgZfSIV0eIbMrSYT09FJVa5BNEMvAyWQ?= =?us-ascii?Q?u0Eq00dthcjnyto0izDetgOGC3f6K1S8pBxasB4BK2SdlAPTQc9Yq+oSL5rf?= =?us-ascii?Q?VgXxncOYgv7d/CGMoVIUWy+XiSRK2dbZHC09MDLc3QR43AQ6iMJUdcPW4bJ7?= =?us-ascii?Q?42UuA44aov1X9NR7JMMaKTEoQbZ9UL9?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2808; 6:6A+BujnDtV6mG0OeX8G+OD/OmDEnFOWVFEvqXUfOjKwJOBkqlK0WtUVGaPm+ueDUZrk0NAwBOMRAcMl1YYDqocpX+SoK1KDk/ybL9tKcRqrF3YsC9ucrrHU0au5Dt5rz+K8UjlbxV2r4oahcGEnTMyrJ53b+7koOuXRLpGjWSEWKOiCHG+kEA2fbnSY4/TRrvyEg2ObaPDC7qf0s3gEeVYtI85F6YWqpDtnmj4gNw423u0CyJqv/TtJzu7UZTwhSnT1CQJ6daAMDBgeg1fWfV3FtmxgqDgTUc5L4smKUuRez/gjsFxpqctq4pWzBEa0iekqYAor4gWTZpXFfgrW80ZULKaZTOhkhn8pDZdpR8W4=; 5:H48Gb/uZwnxMgHPJ+VoWcRoy0gzX2G25idtZCFago0oD3bs7oLNwJIVKwqYEVaXwq4sp8oUl4V62olxntGIs2R1M3uyRVyI3EmwqzEgdfhk4I31cURNehXot149IMGZEb3jQV4NllIHaxUy8+SunomeYNqUf+Nqe2seB7ZQevpU=; 24:9FWadqxoas7OhjQX5P/W9GWHF/Jjd9snBJxdYXP89AEbRMDdyd+jQJ45qtE35h9uWoJKgxnIdMVQFRVmreW50TGnB5lW/iAmDjktTGCk7a0=; 7:M2RncivWmXF8vqB/yp2+e/ZdYoxJx9Z2PolGBKFX5Sqzlko5LzT91lPJ0kGu+fwKfK1UeUjSJGh0HiqdHq4/ZD5NXNspye8vjUv2AMkYvYV/KXrYa0GvUZLGZY8RUQQPiXPMtkdmI4235H0zZ6rhZQOEVh8McyEfWg3FiwSLOe5SMiOto6SWYUPCDau8lfnsj9SvcNxq7Ze7mky1eLlYotcLi18SobbQtGTSA4WFCUGRB/BSTBSAO0JQCk3kgF2H SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: impinj.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Oct 2017 19:49:33.6006 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e3effb44-55df-4053-da2e-08d52098829b 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 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. CC: Shawn Guo CC: Sascha Hauer CC: Fabio Estevam CC: Mark Brown 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 ad54f8258513..5caa6c9524fa 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -1526,13 +1526,15 @@ static int spi_imx_probe(struct platform_device *pdev) /* 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, - 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]; + } } else { u32 num_cs;