From patchwork Fri Aug 18 05:43:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suniel Mahesh X-Patchwork-Id: 9907649 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 C7ABE6038C for ; Fri, 18 Aug 2017 05:44:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B93C928A94 for ; Fri, 18 Aug 2017 05:44:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD5D528B0C; Fri, 18 Aug 2017 05:44:24 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 34A2928BD2 for ; Fri, 18 Aug 2017 05:44:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750977AbdHRFn4 (ORCPT ); Fri, 18 Aug 2017 01:43:56 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:38455 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750966AbdHRFnz (ORCPT ); Fri, 18 Aug 2017 01:43:55 -0400 Received: by mail-pg0-f67.google.com with SMTP id 123so13281944pga.5 for ; Thu, 17 Aug 2017 22:43:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=techveda-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=z7AHTOpohR/xnS++7rkSd5a5RD16v5canj+HFbFd0V0=; b=IJF4vLralLNwvGgvi5J/Ptgx4gh3thzthx503GC9kfy1liK1Zy+lwnSG+s1hoLFXkz efrvjRwDx32t0GrLD6G0/B+p3EIKBUVsAgWTZrPZNYj/1M2x/jDTM8xK3VCY57NXmtb/ rijBVWQZV1md/4yFp3RaTvM/kJJBxbWtepfGwc73b3p1nbvjEpONluGo7G8T24NrIuh3 fg/hznp1s4i+bAnx4RVDAGLK8+o5kR8n8h9c6XR0vipjtYS/Nb6q/YJji1HiRENwrCTu BzIDKJzpkzGI33nc1SVTUd+N0wrigMDMdWNuqj5RYXP3VkblyoW4T53f+uAuzuDpz61N lpPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=z7AHTOpohR/xnS++7rkSd5a5RD16v5canj+HFbFd0V0=; b=ArorzVKKg6r/6itmRwevBwVyyB73v76/hSOBWdZE4d2Ep1Zjn/ocf47tSoZmc6pO4e k2JDa5rVr/8FhRi6evo5Iw4boMMKw/Cgt8KZ9jlm4sCl02XQG+F5oClUFEOsWUdkL97l vdv1DDXpVVtNIuIVoiekzl5iippwVcwK/8EyEYDeh2gHNejXU5MyiKbQ+aOfPEoBZZB3 WNi7T8/CIK+W7KOLPU5wJ3pnJX0Kuie0kYifsdnEI7bXA17k6C0DPKLOURKK0tB+yZL0 /MQoCPU/JIfi5eP1qCeeWBJ0Xp2nq6fZspMuSTw1Pdc28ZjNNwkOY05YotTfHyvenAZ3 9oLw== X-Gm-Message-State: AHYfb5h8v8NTBufsqz2QyW8OC5DNqbqsq+7Mhjjrk8KUOhlwUdTwls8w fjJ3R7GB/GAaLog2 X-Received: by 10.84.211.150 with SMTP id c22mr8344447pli.372.1503035034606; Thu, 17 Aug 2017 22:43:54 -0700 (PDT) Received: from localhost.localdomain ([124.123.42.5]) by smtp.gmail.com with ESMTPSA id o15sm9647806pgf.22.2017.08.17.22.43.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Aug 2017 22:43:53 -0700 (PDT) From: sunil.m@techveda.org To: broonie@kernel.org Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, karthik@techveda.org, Suniel Mahesh Subject: [PATCH] drivers: spi: Allocate bus number from spi framework Date: Fri, 18 Aug 2017 11:13:40 +0530 Message-Id: <1503035020-4347-1-git-send-email-sunil.m@techveda.org> X-Mailer: git-send-email 1.9.1 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 From: Suniel Mahesh spi framework should allocate bus number dynamically either via Linux IDR or spi alias for master drivers. This patch deletes code pertaining to manual allocation of spi bus number in spi omap2 master driver. Signed-off-by: Suniel Mahesh Signed-off-by: Karthik Tummala Tested-by: Karthik Tummala --- Note: - Patch was compile tested and built(ARCH=arm) on next-20170817. - Patch was hardware tested on AM335x (McSPI controller) with spi flash chips. - Added spi aliases in aliases node, device tree and tested. - No build/run-time issues reported. - The commit: "spi: Pick spi bus number from Linux idr or spi alias" (SHA1:9b61e302210eba55768962f2f11e96bb508c2408) has introduced bus numbering which happens dynamically either via Linux IDR or spi alias for master drivers. --- drivers/spi/spi-omap2-mcspi.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c index e048268..9bf64e6 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c @@ -1338,7 +1338,6 @@ static int omap2_mcspi_probe(struct platform_device *pdev) struct resource *r; int status = 0, i; u32 regs_offset = 0; - static int bus_num = 1; struct device_node *node = pdev->dev.of_node; const struct of_device_id *match; @@ -1374,14 +1373,11 @@ static int omap2_mcspi_probe(struct platform_device *pdev) of_property_read_u32(node, "ti,spi-num-cs", &num_cs); master->num_chipselect = num_cs; - master->bus_num = bus_num++; if (of_get_property(node, "ti,pindir-d0-out-d1-in", NULL)) mcspi->pin_dir = MCSPI_PINDIR_D0_OUT_D1_IN; } else { pdata = dev_get_platdata(&pdev->dev); master->num_chipselect = pdata->num_cs; - if (pdev->id != -1) - master->bus_num = pdev->id; mcspi->pin_dir = pdata->pin_dir; } regs_offset = pdata->regs_offset;