From patchwork Wed May 26 19:33:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 12282629 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A7DBC4708A for ; Wed, 26 May 2021 19:33:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0A1D8613BD for ; Wed, 26 May 2021 19:33:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234311AbhEZTes (ORCPT ); Wed, 26 May 2021 15:34:48 -0400 Received: from mga14.intel.com ([192.55.52.115]:17299 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234251AbhEZTeq (ORCPT ); Wed, 26 May 2021 15:34:46 -0400 IronPort-SDR: YaI/khUR/StpxGKi6mv65lSK99MkJS6s0XqqtR7sO6TP+KVNcHzRmtBNEgLYC6Vv50b28u2TdL qtzOEIq88fPg== X-IronPort-AV: E=McAfee;i="6200,9189,9996"; a="202314545" X-IronPort-AV: E=Sophos;i="5.82,331,1613462400"; d="scan'208";a="202314545" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2021 12:33:11 -0700 IronPort-SDR: u5Dsla4+nA3YXcRtVgubHz+WtYEUida1UdESPh5X61zZuSIm6ARXQRD1b5pTeA7eWHlTlWzYkl SAeRcmWumKrA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,331,1613462400"; d="scan'208";a="397439038" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 26 May 2021 12:33:09 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 5308CB7; Wed, 26 May 2021 22:33:31 +0300 (EEST) From: Andy Shevchenko To: Marc Kleine-Budde , linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Manivannan Sadhasivam , Thomas Kopp , Wolfgang Grandegger , "David S. Miller" , Jakub Kicinski , Andy Shevchenko Subject: [PATCH v2 1/2] can: mcp251xfd: Try to get crystal clock rate from property Date: Wed, 26 May 2021 22:33:26 +0300 Message-Id: <20210526193327.70468-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org In some configurations, mainly ACPI-based, the clock frequency of the device is supplied by very well established 'clock-frequency' property. Hence, try to get it from the property at last if no other providers are available. Signed-off-by: Andy Shevchenko --- v2: new patch drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c index e0ae00e34c7b..e42f87c3f2ec 100644 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c @@ -2856,7 +2856,7 @@ static int mcp251xfd_probe(struct spi_device *spi) struct gpio_desc *rx_int; struct regulator *reg_vdd, *reg_xceiver; struct clk *clk; - u32 freq; + u32 freq, rate; int err; if (!spi->irq) @@ -2883,11 +2883,16 @@ static int mcp251xfd_probe(struct spi_device *spi) return dev_err_probe(&spi->dev, PTR_ERR(reg_xceiver), "Failed to get Transceiver regulator!\n"); - clk = devm_clk_get(&spi->dev, NULL); + /* Always ask for fixed clock rate from a property. */ + device_property_read_u32(&spi->dev, "clock-frequency", &rate); + + clk = devm_clk_get_optional(&spi->dev, NULL); if (IS_ERR(clk)) return dev_err_probe(&spi->dev, PTR_ERR(clk), "Failed to get Oscillator (clock)!\n"); freq = clk_get_rate(clk); + if (freq == 0) + freq = rate; /* Sanity check */ if (freq < MCP251XFD_SYSCLOCK_HZ_MIN || From patchwork Wed May 26 19:33:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 12282631 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DBA2FC47088 for ; Wed, 26 May 2021 19:33:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BD277613CD for ; Wed, 26 May 2021 19:33:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234350AbhEZTet (ORCPT ); Wed, 26 May 2021 15:34:49 -0400 Received: from mga04.intel.com ([192.55.52.120]:61274 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234266AbhEZTeq (ORCPT ); Wed, 26 May 2021 15:34:46 -0400 IronPort-SDR: O3f0degrh6WJGQEfU1Ke2AsRkeFRAt3vkBlSPL4xxGNuCh/gG7/inSVMLD2Qc3JWHKtvxqFmQJ DLPlOAwsSrug== X-IronPort-AV: E=McAfee;i="6200,9189,9996"; a="200657997" X-IronPort-AV: E=Sophos;i="5.82,331,1613462400"; d="scan'208";a="200657997" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2021 12:33:12 -0700 IronPort-SDR: UF6cYVxk30oZkNqp3DAM8Do4DaMoAUAqenPq/eWSNngH9J6ZWX6pUmk8Fda6edXBLKLOGiImy5 f0QkzrnHt8AA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,331,1613462400"; d="scan'208";a="480206995" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga002.fm.intel.com with ESMTP; 26 May 2021 12:33:10 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 6124CD7; Wed, 26 May 2021 22:33:32 +0300 (EEST) From: Andy Shevchenko To: Marc Kleine-Budde , linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Manivannan Sadhasivam , Thomas Kopp , Wolfgang Grandegger , "David S. Miller" , Jakub Kicinski , Andy Shevchenko Subject: [PATCH v2 2/2] can: mcp251xfd: Fix header block to clarify independence from OF Date: Wed, 26 May 2021 22:33:27 +0300 Message-Id: <20210526193327.70468-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210526193327.70468-1-andriy.shevchenko@linux.intel.com> References: <20210526193327.70468-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org The driver is neither dependent on OF, nor it requires any OF headers. Fix header block to clarify independence from OF. Signed-off-by: Andy Shevchenko --- v2: included property.h drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c index e42f87c3f2ec..e919f7e4d566 100644 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c @@ -15,10 +15,10 @@ #include #include #include +#include #include -#include -#include #include +#include #include