From patchwork Fri Jul 21 13:50:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Schneider-Pargmann X-Patchwork-Id: 123905 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp252584vqg; Fri, 21 Jul 2023 07:41:09 -0700 (PDT) X-Google-Smtp-Source: APBJJlGQuBux8NH0v8QzdArTD0jLPcoxoHGPqQOx69qV/1+a79+Dwyi5+Vfh7ENdFPz7IsttTa31 X-Received: by 2002:a17:90b:3792:b0:262:ec8d:b563 with SMTP id mz18-20020a17090b379200b00262ec8db563mr1379461pjb.18.1689950468734; Fri, 21 Jul 2023 07:41:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689950468; cv=none; d=google.com; s=arc-20160816; b=NCapYxLIiKO2w3d3MIqNZCH4qCQYZ+oOlDdmcyohJft6Em4mbNGrGslXEIGmR0bAAn 8GtI0kFXxo5a0BXhg78SWd55LhtEOB/IDLT92kL83SeKuq2JsRO0BXKxQ4rjXF0eiQOC nq6ThvSJS7XUGnFnxsHflSdWQxBZ0cyN+vde7MxFD/86mB1ctD2MLwmAXqQ/pCHy8VUr BpvfWycFjD1Q5jD+QQcUUGjOvXNlqri79C8wFHB+w9odql+dXeMLFEkytvkiO8nzLBQG nzTNwrPD4CRBdRRIkx+XBlPpvdOxYNPzkP59zLYDYE3MNEDdpBhIxrjFFxBi+QBU0g65 WnSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KudsjLXhwuLL2d8mNXrF7qeXjTkj4g+r6rSckABUYoI=; fh=nH7gV2gKgMw9uac/GAdm6X6lgPBcDzZTgvh8+ZFMAS0=; b=WJ9klDiHhvEe5ogucVq01NC8sjx2HyMAmDCOi5CXe9rTXg64kEhB4c4a9RDGyvZk5l V5sLMsgrhbwaB3p6y/Rr7/jkW6OoDuwsPAo+NI2PdRF09kyCAexo6fP3bop8V+Jm5hfR 7AVeoIUQF/AhXAAzSUHl7nC7xVUZygcU0QsqT++1KQPQsV7Box1zejCncInpkXHfztJd oJ+YfQ/bYq8HjRtElMPOEvErpqPWK3u7oBCkS0wKe8Th8Cmk8ll3qwyU0N9h/AsUIQTS 7m2ioIBkFu7c34z7DVd1idvq1CLESSjwteQzuLBrzwW61P2UIajFHuiyfhzB3TfyoQ6u 2KXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b=2NRn1us4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l13-20020a17090a660d00b0025eee012ca4si5944933pjj.30.2023.07.21.07.40.55; Fri, 21 Jul 2023 07:41:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b=2NRn1us4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231494AbjGUNuW (ORCPT + 99 others); Fri, 21 Jul 2023 09:50:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231344AbjGUNuR (ORCPT ); Fri, 21 Jul 2023 09:50:17 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6CAFE2D4C for ; Fri, 21 Jul 2023 06:50:15 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-3fd190065a7so16496285e9.2 for ; Fri, 21 Jul 2023 06:50:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20221208.gappssmtp.com; s=20221208; t=1689947414; x=1690552214; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KudsjLXhwuLL2d8mNXrF7qeXjTkj4g+r6rSckABUYoI=; b=2NRn1us4t8D9/KGOVraAzRc2weO/CjZXoBzsExFWUhmyPHDl72UmZxVzGMFDc3H1Vh thh0QV6x1cXr1SbNkzzAfb1RiM8sIjv7A6OSI6ptrghyhASXcEsRB1q7STOT++4a/EL4 C4peKQRi7m1KnP+lQcvkRfV0oyM20vFfuFbk6lJA14fEAKeKbXTF5HBd+zIrFqivY+Dr hMOKoYYM/9C9Yn8Q6ll9glrDw78EQXHPerif78lw+U07UwaY9Wq9FqtW0HuOfUM5IJB0 Imz7CrkCci7JRzryeG11fmu5o24rWNGEF1TYkNukynVEbizabHeXhkLYim/OPbdKAid2 M9Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689947414; x=1690552214; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KudsjLXhwuLL2d8mNXrF7qeXjTkj4g+r6rSckABUYoI=; b=HvvDwGu/fz0lyUIL2zfVGNuBz4EANlFnchGwepD/Ef6/or7RTygqKmVGBKIM8IEu20 0re7cwvw8IKprVfv5WCf+x5zbfSlK6Q1EJDXFmOaRULfq4ipXKbd9Qs7c3IeiXtfLnpF iJwqbUTo5BQC/eyqn1W3/BhmQLQ2FYfr8c/WcmBYYEP02JXZpG/GSW+afWnvayelnOMw s43C8BtcW3c+/Ic/OlzMmYP5sAxai15TBRRE29Yql2QexqDsSLzAIsEhJW0AjxFMJqQP HxuqLR4rYo9anRrJsypYgnwBgD6rA3ulWMbTDWenl8jJ6A2ywFfF2DvmU68tOQTpmpi6 ykTQ== X-Gm-Message-State: ABy/qLaJFd8knGCVOiUKetG1inu/hQnXFSM1saOyWNvHPARotTQENfbB ZI+72CWiePqgONVAa1j0UXhGxQ== X-Received: by 2002:a05:600c:2802:b0:3fb:c462:1833 with SMTP id m2-20020a05600c280200b003fbc4621833mr1493076wmb.30.1689947413829; Fri, 21 Jul 2023 06:50:13 -0700 (PDT) Received: from blmsp.fritz.box ([2001:4091:a247:82fa:b762:4f68:e1ed:5041]) by smtp.gmail.com with ESMTPSA id c14-20020adfed8e000000b00313e4d02be8sm4233980wro.55.2023.07.21.06.50.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jul 2023 06:50:13 -0700 (PDT) From: Markus Schneider-Pargmann To: Wolfgang Grandegger , Marc Kleine-Budde , Rob Herring , Krzysztof Kozlowski Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Conor Dooley , Chandrasekar Ramakrishnan , Michal Kubiak , Vivek Yadav , linux-can@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Markus Schneider-Pargmann , Krzysztof Kozlowski Subject: [PATCH v3 1/6] dt-bindings: can: tcan4x5x: Add tcan4552 and tcan4553 variants Date: Fri, 21 Jul 2023 15:50:04 +0200 Message-Id: <20230721135009.1120562-2-msp@baylibre.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230721135009.1120562-1-msp@baylibre.com> References: <20230721135009.1120562-1-msp@baylibre.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772041503083652285 X-GMAIL-MSGID: 1772041503083652285 These two new chips do not have state or wake pins. Signed-off-by: Markus Schneider-Pargmann Acked-by: Krzysztof Kozlowski --- .../devicetree/bindings/net/can/tcan4x5x.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/net/can/tcan4x5x.txt b/Documentation/devicetree/bindings/net/can/tcan4x5x.txt index e3501bfa22e9..170e23f0610d 100644 --- a/Documentation/devicetree/bindings/net/can/tcan4x5x.txt +++ b/Documentation/devicetree/bindings/net/can/tcan4x5x.txt @@ -4,7 +4,10 @@ Texas Instruments TCAN4x5x CAN Controller This file provides device node information for the TCAN4x5x interface contains. Required properties: - - compatible: "ti,tcan4x5x" + - compatible: + "ti,tcan4552", "ti,tcan4x5x" + "ti,tcan4553", "ti,tcan4x5x" or + "ti,tcan4x5x" - reg: 0 - #address-cells: 1 - #size-cells: 0 @@ -21,8 +24,10 @@ Optional properties: - reset-gpios: Hardwired output GPIO. If not defined then software reset. - device-state-gpios: Input GPIO that indicates if the device is in - a sleep state or if the device is active. - - device-wake-gpios: Wake up GPIO to wake up the TCAN device. + a sleep state or if the device is active. Not + available with tcan4552/4553. + - device-wake-gpios: Wake up GPIO to wake up the TCAN device. Not + available with tcan4552/4553. Example: tcan4x5x: tcan4x5x@0 { From patchwork Fri Jul 21 13:50:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Schneider-Pargmann X-Patchwork-Id: 123896 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp241613vqg; Fri, 21 Jul 2023 07:23:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlHIDBusdsmFNEzTdLLxkCElCqXF2/FabOGZjt7eJb+kePlUWglfSmJOwmmelcS2/H0xtrFl X-Received: by 2002:a05:6a00:cc7:b0:686:24b0:554b with SMTP id b7-20020a056a000cc700b0068624b0554bmr286322pfv.22.1689949427747; Fri, 21 Jul 2023 07:23:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689949427; cv=none; d=google.com; s=arc-20160816; b=AUz8XxgyxBeLHOhsWqKvJMbfQ5p/j3x4cdWul0Nm7YBJSO4YG4ClRF2GUcF6Bnimid LhANV1KogwzRJLcQWUGPvT+MpMQDKB/7CdJd+sRkFfK/CNCmB6rCPwzq6+57WNbcglO/ F4tUAFry6uuAytY63A+7F/Nd8JMcV0GFzOErVgmGAkchplJjyX89NH54f8+qwkpMwSIZ Ihpfm7+Lff/jcNhYEEGN0tRvx+f7eB77MkZ5jbGPYIHsWdLEvqqPsrcjHKSJuJVX1Ur4 mTReYlb5gL/9BHvvyKouS/EHU139Y8aXpHIse5exhhjbJgtJ/F70j8437LY64qtZLChc q9Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=aOPR69iAQ16PRI3TWa1E2gZcgSDBVpUe2mB3Tg7XdFY=; fh=9frbIG+5eKvNqELn2qUZ8UP3akRIGRm6w0alHg8xR8g=; b=CA9NNb79xQLIWjrL534KJL6mFJfhIL0rQB8tX974Fy6/nQhSff/7baxVoEIeBvFvZg K5B4JO3UFIU5o1Sn1YCcHiH2yDQbDts/QEd6yRA2pZVGTJoVdFyL/jcNzNvuo16iwAxf 8QHrbHy9+twVO1e3v4fhNCsMbQju7O/XEtLYdKrQyIS6WQFpiToSH23dSE8DUtdMuTri d7tH7ZcFh+S++CmhlNwcVfVX4K4iy4UeVoR+j8hrsfyWw66WLxnu7dItywyfMPnYI/g+ hE0xa58t5BnBA7ikf4WjBKGlZvszyCqOHFszaCbOf4uqeK1PKV1uHlffZ11z+OfTO9QK gzTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b=S5dWitbn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y2-20020a056a00190200b0066879f2c3c8si3168764pfi.244.2023.07.21.07.23.34; Fri, 21 Jul 2023 07:23:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b=S5dWitbn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231264AbjGUNuZ (ORCPT + 99 others); Fri, 21 Jul 2023 09:50:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231451AbjGUNuT (ORCPT ); Fri, 21 Jul 2023 09:50:19 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB4D9273C for ; Fri, 21 Jul 2023 06:50:16 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3144098df56so1676668f8f.2 for ; Fri, 21 Jul 2023 06:50:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20221208.gappssmtp.com; s=20221208; t=1689947415; x=1690552215; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aOPR69iAQ16PRI3TWa1E2gZcgSDBVpUe2mB3Tg7XdFY=; b=S5dWitbnh9elOa2q9vS/O6dNz1JkoENscNstuy3J7BNYk2/m6k98E8AxiKJ9977QL0 lNIQK2k8JE2UxkxW4th6c5WftiHUIyB4ad7eNknbEG64kQ4l3PYKxLCveUL1J2VNg0Q6 +aaO0a6lYfije4SM6F+8KmfcM2mckMmuOeRmp+ySYNV2fTIFcquqbtvPgdoJI7ub1k6p 9Q5Sm8/u6lVDPHdE+Hwr7mYb0V3/qAN3/fXBn+yDAdxzFVLkeGotnjp8Q1HkP1ndu/YP FKacxuXIPmcNETfgkQbNu7V8K6YDFzSlVT8Araax1YIHfa6gBpJblvTiCS76KRE0i7DY EXEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689947415; x=1690552215; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aOPR69iAQ16PRI3TWa1E2gZcgSDBVpUe2mB3Tg7XdFY=; b=LtU940GdV3AAoGelsxktuMoF20uy8TTiX0ltx0jlxBL68tsx60nvlJRwflgow47UAm RkUFvmLAKfNNu+dEWTI81mXjzftn9fQD/7VnVo8PoOtYU4mQq7dK/ca8UJ68rgoWShlc az44ZwhAR7WAPqORf2kzxOq9oAs5UMNOxjn+fLMO+InBAN41NB+cbdIVfasPSfo+glcg VbTXhZAyRyW6hEl6U3KK5CiCp3BTF/FyuaCuZIDuwYqI7uhTx33RlXSa6utoGyVu6JRI DwKs0ytM83/MCg7paTqczmN5v1Ruo6ZP9wH+z+DPm4Nk8xgbYyap+fAKmc09peXmwkCT zQiA== X-Gm-Message-State: ABy/qLapEnjx/U7jU/w47G5T0DSxPX17dyQ+K452nI/hPJbr7cB2B6+v rRNGS2i6bIrW4Ue6cIYIoI35xQ== X-Received: by 2002:a5d:6047:0:b0:316:e04a:29e8 with SMTP id j7-20020a5d6047000000b00316e04a29e8mr1699793wrt.54.1689947415101; Fri, 21 Jul 2023 06:50:15 -0700 (PDT) Received: from blmsp.fritz.box ([2001:4091:a247:82fa:b762:4f68:e1ed:5041]) by smtp.gmail.com with ESMTPSA id c14-20020adfed8e000000b00313e4d02be8sm4233980wro.55.2023.07.21.06.50.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jul 2023 06:50:14 -0700 (PDT) From: Markus Schneider-Pargmann To: Wolfgang Grandegger , Marc Kleine-Budde , Rob Herring , Krzysztof Kozlowski Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Conor Dooley , Chandrasekar Ramakrishnan , Michal Kubiak , Vivek Yadav , linux-can@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Markus Schneider-Pargmann Subject: [PATCH v3 2/6] can: tcan4x5x: Remove reserved register 0x814 from writable table Date: Fri, 21 Jul 2023 15:50:05 +0200 Message-Id: <20230721135009.1120562-3-msp@baylibre.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230721135009.1120562-1-msp@baylibre.com> References: <20230721135009.1120562-1-msp@baylibre.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772040411230231142 X-GMAIL-MSGID: 1772040411230231142 The mentioned register is not writable. It is reserved and should not be written. Fixes: 39dbb21b6a29 ("can: tcan4x5x: Specify separate read/write ranges") Signed-off-by: Markus Schneider-Pargmann Reviewed-by: Michal Kubiak --- drivers/net/can/m_can/tcan4x5x-regmap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/can/m_can/tcan4x5x-regmap.c b/drivers/net/can/m_can/tcan4x5x-regmap.c index 2b218ce04e9f..fafa6daa67e6 100644 --- a/drivers/net/can/m_can/tcan4x5x-regmap.c +++ b/drivers/net/can/m_can/tcan4x5x-regmap.c @@ -95,7 +95,6 @@ static const struct regmap_range tcan4x5x_reg_table_wr_range[] = { regmap_reg_range(0x000c, 0x0010), /* Device configuration registers and Interrupt Flags*/ regmap_reg_range(0x0800, 0x080c), - regmap_reg_range(0x0814, 0x0814), regmap_reg_range(0x0820, 0x0820), regmap_reg_range(0x0830, 0x0830), /* M_CAN */ From patchwork Fri Jul 21 13:50:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Schneider-Pargmann X-Patchwork-Id: 123900 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp243456vqg; Fri, 21 Jul 2023 07:26:55 -0700 (PDT) X-Google-Smtp-Source: APBJJlFvcIjtfLOiC3T5CiIeaB49t64Upg6Ec0JWYhFcLvUzA5goZf9LNej+GTgw8xxPnvrKwZ1e X-Received: by 2002:a17:906:10c:b0:98e:2423:708 with SMTP id 12-20020a170906010c00b0098e24230708mr2121152eje.62.1689949614974; Fri, 21 Jul 2023 07:26:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689949614; cv=none; d=google.com; s=arc-20160816; b=K8KVmJLIRqJku4FOaYGwRjLotM+VI5kqfeSaYe+hb4gDtGyxB3mjvLC/W2J/keblmK qjnTLJ8S0CIv5hxyVaQVqyTOS8sicDH3qVspnqzlzVBD7xccTm7Bau4yREiK0jyvXSOv vLfAi8TWzN5BHz8k+3JRYwTMc2kBH0/GKpG6/4GFgdkyHYuJ9oAlDn2kGid1KyEGZmMe 5cS9MZMSRJ80renUccvmYGso2qIM6WHxj9Oc1RIF8hElBT9yjzKqs07scpUIvgLR3pYm nwftgZVblfzuQHDPVZTMq5oI+rt8Ou6+zU66dQWW1xNHRQwQeDzxk5X6fpwGxeerz6Cd r90w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mzaljnOO1Gw4qS38ZHWvBAE06zq5Umr4CoJZWfxvzDg=; fh=9frbIG+5eKvNqELn2qUZ8UP3akRIGRm6w0alHg8xR8g=; b=z0bmf4Aqi+YcEB6m2qCGuvKMipEZIbGP0MwgjWew5x78y4eSTudbZuLgdIXkwtB7XG HNT4A2v8bUa4ERqQPQg1tjY6A470wK0MkuDJxSTlR7Mj5tIDCNOao0QaLH/w3jfeUKkT d5wWDYiFp0UcufZRqwtXgSeVilTA1jrqPnvEDgSjATGGf1nmrEtMdPO0AX8h7j+D31Od 8bT6nvcTV3139moXITou8urbN4QaT0UfJmVr9WsT9HX7wHj16kVFoL+jMg+RER19L6NL qeQng0Wh4Xhb0KBrpJtEGpPD/zLriD+rbrZO1WBny7nGA12/arKlH+i2r1gknYbILTYA Bvfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b=mrlDKR0T; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i17-20020a17090671d100b009823926ec36si2329015ejk.931.2023.07.21.07.26.30; Fri, 21 Jul 2023 07:26:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b=mrlDKR0T; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231572AbjGUNu3 (ORCPT + 99 others); Fri, 21 Jul 2023 09:50:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231501AbjGUNuU (ORCPT ); Fri, 21 Jul 2023 09:50:20 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0AC9D2D45 for ; Fri, 21 Jul 2023 06:50:17 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-3fd190065a7so16496975e9.2 for ; Fri, 21 Jul 2023 06:50:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20221208.gappssmtp.com; s=20221208; t=1689947416; x=1690552216; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mzaljnOO1Gw4qS38ZHWvBAE06zq5Umr4CoJZWfxvzDg=; b=mrlDKR0TvYN/dZTrWxIqkMI9FU4brRH4Vd71KsjUmafFWEE9Twd7y2B2aNWBz1o0Ib IMfK+5XtbtEFobIfcVMXGSExJroOalKnMZHuHfz1ut2Wv1HeRuSrmTSO4fuJ6s6G9Ofu NxoFGTRHn1zD7q8DhHZxDYN06LQTBti2XripCNHhi4sNCX24Qupr3mLoMy3e/AhG6VI7 FmLm6AzxqLHGrFR4KRyZanF+vay/3ALShsdrQEp9eKCg+F8ir63as67xpeQpEycZ9g7X fgleWAr0fXFXePD+vtS8+cqIz3Ix69bta3utJzCu67JGKZU0VkHP1eQVDvLOmRo5EY2i 2H0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689947416; x=1690552216; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mzaljnOO1Gw4qS38ZHWvBAE06zq5Umr4CoJZWfxvzDg=; b=i2AUlVnSfGHThIamKVtLMERIUb909AtXxXxjEsbrOThMhokhe2DtUR94OxwGAzNIUb Kzpoby0jag9n6NPHqkavt3Sb5Q+VJ1slrwPwEoIT9siXMb8G10dMCMOYl6lG0kEckxGV p4dNcjUw9Ju5HO0fFvkhYHnmaWTSq/XU5wp8kGVLhhXcRj7VnxBB04vJSqU6qeBV/9pH 3E8Nc0q2acKlNb9bV/MvysTL3ZjEEyZU2qiObU24SH4CC98P8Jz4ef3JE2cxlMToMldf DEp8g8Idac2tIK/KqwGH8oaju/FkUCTUOYXOqoEm1SJzz2N2cnBPbGNUY9x+4ZEPyFMD AwxA== X-Gm-Message-State: ABy/qLZq6eaSZDiAtBawtgTRI5MjvxD/wYDbsL4+MXNtEVM41kWhALxl tWw2v19w+FtBUKu6r2t+bH9+LQ== X-Received: by 2002:a05:600c:2259:b0:3fb:adc0:609b with SMTP id a25-20020a05600c225900b003fbadc0609bmr1534653wmm.13.1689947416232; Fri, 21 Jul 2023 06:50:16 -0700 (PDT) Received: from blmsp.fritz.box ([2001:4091:a247:82fa:b762:4f68:e1ed:5041]) by smtp.gmail.com with ESMTPSA id c14-20020adfed8e000000b00313e4d02be8sm4233980wro.55.2023.07.21.06.50.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jul 2023 06:50:15 -0700 (PDT) From: Markus Schneider-Pargmann To: Wolfgang Grandegger , Marc Kleine-Budde , Rob Herring , Krzysztof Kozlowski Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Conor Dooley , Chandrasekar Ramakrishnan , Michal Kubiak , Vivek Yadav , linux-can@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Markus Schneider-Pargmann Subject: [PATCH v3 3/6] can: tcan4x5x: Check size of mram configuration Date: Fri, 21 Jul 2023 15:50:06 +0200 Message-Id: <20230721135009.1120562-4-msp@baylibre.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230721135009.1120562-1-msp@baylibre.com> References: <20230721135009.1120562-1-msp@baylibre.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772040607457242273 X-GMAIL-MSGID: 1772040607457242273 To reduce debugging effort in case the mram is misconfigured, add this size check of the DT configuration. Currently if the mram configuration doesn't fit into the available MRAM it just overwrites other areas of the MRAM. Signed-off-by: Markus Schneider-Pargmann Reviewed-by: Michal Kubiak --- drivers/net/can/m_can/m_can.c | 16 ++++++++++++++++ drivers/net/can/m_can/m_can.h | 1 + drivers/net/can/m_can/tcan4x5x-core.c | 5 +++++ 3 files changed, 22 insertions(+) diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c index c5af92bcc9c9..9210cf0705a1 100644 --- a/drivers/net/can/m_can/m_can.c +++ b/drivers/net/can/m_can/m_can.c @@ -1887,6 +1887,22 @@ static int register_m_can_dev(struct net_device *dev) return register_candev(dev); } +int m_can_check_mram_cfg(struct m_can_classdev *cdev, u32 mram_max_size) +{ + u32 total_size; + + total_size = cdev->mcfg[MRAM_TXB].off - cdev->mcfg[MRAM_SIDF].off + + cdev->mcfg[MRAM_TXB].num * TXB_ELEMENT_SIZE; + if (total_size > mram_max_size) { + dev_err(cdev->dev, "Total size of mram config(%u) exceeds mram(%u)\n", + total_size, mram_max_size); + return -EINVAL; + } + + return 0; +} +EXPORT_SYMBOL_GPL(m_can_check_mram_cfg); + static void m_can_of_parse_mram(struct m_can_classdev *cdev, const u32 *mram_config_vals) { diff --git a/drivers/net/can/m_can/m_can.h b/drivers/net/can/m_can/m_can.h index a839dc71dc9b..d8150d8128e7 100644 --- a/drivers/net/can/m_can/m_can.h +++ b/drivers/net/can/m_can/m_can.h @@ -101,6 +101,7 @@ int m_can_class_register(struct m_can_classdev *cdev); void m_can_class_unregister(struct m_can_classdev *cdev); int m_can_class_get_clocks(struct m_can_classdev *cdev); int m_can_init_ram(struct m_can_classdev *priv); +int m_can_check_mram_cfg(struct m_can_classdev *cdev, u32 mram_max_size); int m_can_class_suspend(struct device *dev); int m_can_class_resume(struct device *dev); diff --git a/drivers/net/can/m_can/tcan4x5x-core.c b/drivers/net/can/m_can/tcan4x5x-core.c index 2342aa011647..e706518176e4 100644 --- a/drivers/net/can/m_can/tcan4x5x-core.c +++ b/drivers/net/can/m_can/tcan4x5x-core.c @@ -80,6 +80,7 @@ TCAN4X5X_MCAN_IR_RF1F) #define TCAN4X5X_MRAM_START 0x8000 +#define TCAN4X5X_MRAM_SIZE 0x800 #define TCAN4X5X_MCAN_OFFSET 0x1000 #define TCAN4X5X_CLEAR_ALL_INT 0xffffffff @@ -307,6 +308,10 @@ static int tcan4x5x_can_probe(struct spi_device *spi) if (!mcan_class) return -ENOMEM; + ret = m_can_check_mram_cfg(mcan_class, TCAN4X5X_MRAM_SIZE); + if (ret) + goto out_m_can_class_free_dev; + priv = cdev_to_priv(mcan_class); priv->power = devm_regulator_get_optional(&spi->dev, "vsup"); From patchwork Fri Jul 21 13:50:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Schneider-Pargmann X-Patchwork-Id: 123904 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp252084vqg; Fri, 21 Jul 2023 07:40:29 -0700 (PDT) X-Google-Smtp-Source: APBJJlFZPOCRLNBv4fx4NNsqOPyw+uPekwQv6ajeCSmrQqvs9g3lZcDqYl6E3DaazPA+QcW+Ipc5 X-Received: by 2002:a05:6a20:502:b0:134:3013:cdb5 with SMTP id 2-20020a056a20050200b001343013cdb5mr1722509pzp.35.1689950429162; Fri, 21 Jul 2023 07:40:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689950429; cv=none; d=google.com; s=arc-20160816; b=nLGBpd7p5amkcFN5U+FMAD8jbyOcWw5MzN4MJstpaQugD4pUc8e/RANlXn3cF33yZy wnsekSWvnx3iUYYsPy6PUGT0/ZVU2TEiJBiD3QTRW/7dimB2YYxIcxowwNkHPQWg3Dfz ia9h2ACZB9e0LgUBzLayVnAEnIWD0eX2CIQTlFdjdsQ/IslXaSK2hqcf1gx25Z/3UCWQ Jx28Yh+zpk/hpkUkb00vq3KZ/v4cUTnL06dTZf+1twciRAOumSDW3U6PHpXTVlI6gtKK lXZ0GNeko55MXuJ2/0soidIRlbZNALIlMR2V9Fwh8V7q4bzFoFXa0qB0vfI8DLbksHAK 3SKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tK3XW9CvIKNotY0VMKRibuYSfqNfjSdewyrI1jRS2zM=; fh=9frbIG+5eKvNqELn2qUZ8UP3akRIGRm6w0alHg8xR8g=; b=dZbgDtXOQxptHdVWnWkakooIAOYMnJaZkeZhz2BnZiXIn+z0+6zu4RAAAGlfDWr49o ghNVIyZNjZAlWafZvS0oVuU0fh24fZv85asHGf6pCeMpeArb+Lb67/sDi9sP5cF4Dcpb L+WqzLjSirUg17e/cuEdu6pHdBAN6PqBcNttSLjxN0jrsHLR75xu6ILrO49ozalNknGB T9mAxDmgfO4DtKgUi/W+eN3u2mqnw/+Z51XvMcRqXIayJ4tMgoZYG4Z+CgK8XEFE3CH1 ovwhd9SDNmJ5fPKfyDQHrTgPpz+U/UOAMfVsj/t9XM7paInK28Xooxr0NZKOXKOw3XBF UC6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b=0ctkDHsJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h14-20020a056a00170e00b00666ad95e625si3300906pfc.337.2023.07.21.07.39.51; Fri, 21 Jul 2023 07:40:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b=0ctkDHsJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231537AbjGUNuh (ORCPT + 99 others); Fri, 21 Jul 2023 09:50:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231516AbjGUNuV (ORCPT ); Fri, 21 Jul 2023 09:50:21 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32CCB30CF for ; Fri, 21 Jul 2023 06:50:19 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-3fbc5d5742bso17326875e9.2 for ; Fri, 21 Jul 2023 06:50:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20221208.gappssmtp.com; s=20221208; t=1689947417; x=1690552217; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tK3XW9CvIKNotY0VMKRibuYSfqNfjSdewyrI1jRS2zM=; b=0ctkDHsJLr567qj00My9u/DwovaTt7nVS0cVaepA86zfFneViqAlpM4chikj9YNjt3 KlTL4vYYcjlmlMHwc+SKh/+xXAkR3OhXaqYSFferh6wND2fdMOEDZ6aS5HB14zXPaVLu 01Ge809ipavv5JQ8PxQ/x6kPY60W2EuxY/4BPBpNQHl4y8M1q/iN9+73+T9K9czoeU9y jwVXSRdJyVefdJ1xzvkssK9P4GpXffMhdBBW1WIExz05IpK+HM6yDYwpUFpHYZX2Qq3t Pv1PgAcxoOTi2f1MUVrDdmu3LJ2nnadMjVj7wS7B3U4lLCwY0ES6m8/rf8nHVwZta9G9 cRKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689947417; x=1690552217; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tK3XW9CvIKNotY0VMKRibuYSfqNfjSdewyrI1jRS2zM=; b=ZmAxWQ1tRGKDmD0zV22mq599pyC5yy/7TUqRWodq5L48RkomfoH6jNdurjI3oeCmmu Ee2SuSgKl2SG69A5wak6xY1K+gKD0N3flaUujWoz7D9BTbO6pn2qkA+KG6HCSQrCzxvl VcNcRjs2O8RGKH8DI0OGPkANiUaXtk10gz+f9BlcPPI1sjIP49RroSkEcGswytDwWqRQ kzjA/+Tw8Bjzxj4h6mQM2g+amIfy7U3Wc2kcA+OBRjQhQ37U6+nd5bz2VWSbnTUVPX61 GwDNXZsVbO5zdl0TrVYD+JZ7q4AufRmPApBSDwiET+DR6/+TB9wgDErc13Bl7AHvsaPw FrMw== X-Gm-Message-State: ABy/qLboIjUFOUNJdByxzffGiqOuHM6ebvWBrxpoTVc4YMNiheBqhyt5 oQRUcfQQh/bB35AfpTH80LR3oQ== X-Received: by 2002:a1c:f206:0:b0:3fb:415a:d07 with SMTP id s6-20020a1cf206000000b003fb415a0d07mr1476441wmc.36.1689947417293; Fri, 21 Jul 2023 06:50:17 -0700 (PDT) Received: from blmsp.fritz.box ([2001:4091:a247:82fa:b762:4f68:e1ed:5041]) by smtp.gmail.com with ESMTPSA id c14-20020adfed8e000000b00313e4d02be8sm4233980wro.55.2023.07.21.06.50.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jul 2023 06:50:16 -0700 (PDT) From: Markus Schneider-Pargmann To: Wolfgang Grandegger , Marc Kleine-Budde , Rob Herring , Krzysztof Kozlowski Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Conor Dooley , Chandrasekar Ramakrishnan , Michal Kubiak , Vivek Yadav , linux-can@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Markus Schneider-Pargmann Subject: [PATCH v3 4/6] can: tcan4x5x: Rename ID registers to match datasheet Date: Fri, 21 Jul 2023 15:50:07 +0200 Message-Id: <20230721135009.1120562-5-msp@baylibre.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230721135009.1120562-1-msp@baylibre.com> References: <20230721135009.1120562-1-msp@baylibre.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772041461099335084 X-GMAIL-MSGID: 1772041461099335084 The datasheet calls these registers ID1 and ID2. Rename these to avoid confusion. Signed-off-by: Markus Schneider-Pargmann Reviewed-by: Michal Kubiak --- drivers/net/can/m_can/tcan4x5x-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/can/m_can/tcan4x5x-core.c b/drivers/net/can/m_can/tcan4x5x-core.c index e706518176e4..fb9375fa20ec 100644 --- a/drivers/net/can/m_can/tcan4x5x-core.c +++ b/drivers/net/can/m_can/tcan4x5x-core.c @@ -6,8 +6,8 @@ #define TCAN4X5X_EXT_CLK_DEF 40000000 -#define TCAN4X5X_DEV_ID0 0x00 -#define TCAN4X5X_DEV_ID1 0x04 +#define TCAN4X5X_DEV_ID1 0x00 +#define TCAN4X5X_DEV_ID2 0x04 #define TCAN4X5X_REV 0x08 #define TCAN4X5X_STATUS 0x0C #define TCAN4X5X_ERROR_STATUS_MASK 0x10 From patchwork Fri Jul 21 13:50:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Schneider-Pargmann X-Patchwork-Id: 123872 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp222952vqg; Fri, 21 Jul 2023 06:58:52 -0700 (PDT) X-Google-Smtp-Source: APBJJlE3rEuWh9Q1499XgvFusYTh/1s+594O5qFt9+hV+iDqKs53gqnSjU4l5l6+IN+P0zYX6STL X-Received: by 2002:a05:6a20:4c06:b0:137:53d1:405 with SMTP id fm6-20020a056a204c0600b0013753d10405mr1944143pzb.26.1689947932266; Fri, 21 Jul 2023 06:58:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689947932; cv=none; d=google.com; s=arc-20160816; b=d/6wr7cWE7RZBFiMB5xsxyJ0zMez3pyh85kAHOZDF3EWP4VSMZdYS6EhqQVe/UU4Ua ZPC9Qesds0mIgBb+qavO1rf4KjJeusZg4DIqMkvYOgmHyjPADWMO13NE8zQViiGYAfe+ aIIC9f4WuXpDVd4Wp+ALn01WbQ+x4iM17tDqdLPsXatUK9ZBdrTOIv8sQBVhHPORcxrP NUYHseSQNnTPmMCr7TOSHzyKhRcuj5CyllzZEbLLaDUv2v6NJrRBZTrbb6YOSxyH4O/z an5gPulhUiA3YdfXdK42UJVzN6nWN/4wGUVCQ01lUlR6gKh966s+TyeGiG64poQyN7o0 VR/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=SrC0OKi8JQYuMqsO21AINU5+pXiu6nr1MLw9iKQGNsE=; fh=9frbIG+5eKvNqELn2qUZ8UP3akRIGRm6w0alHg8xR8g=; b=uBqUngSEyTM0WjOl5jmbT0N0ZJEPiGkg4qXmKrySSVnzR9I8PwenUwbqWZTfjbjdIl Rp6xN8pf6io1ZNQkSvvaDTmo/1y7E6FIkqExqAukJjHSJnieqgptDAnV4RIvA33fDxIP xhLXYdhY4LKc8Y22aPlf2OM29C/0BXWumuy/kVoBSx8Ll81FWKUb8q5PVHyQUySdeHAA mMHhJCg0Zg5eDyxW28qSU9UyPTyLxzWLOLx6IgaVRi80yH7ZSY1jmrA3WUph3j+guzYZ SGzxPgTW5CoeWIh9tURPh7MQXSg9lGuUA4dLpW2b5X9jj/t/m+kDLXDkJBgYMkJBRKIv 20kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b=cw1Y22JM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w186-20020a6382c3000000b0053f0cdab81esi2987381pgd.357.2023.07.21.06.58.36; Fri, 21 Jul 2023 06:58:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b=cw1Y22JM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231508AbjGUNuk (ORCPT + 99 others); Fri, 21 Jul 2023 09:50:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231536AbjGUNuY (ORCPT ); Fri, 21 Jul 2023 09:50:24 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 30F3330DA for ; Fri, 21 Jul 2023 06:50:20 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-3fbd33a57b6so17698185e9.2 for ; Fri, 21 Jul 2023 06:50:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20221208.gappssmtp.com; s=20221208; t=1689947418; x=1690552218; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SrC0OKi8JQYuMqsO21AINU5+pXiu6nr1MLw9iKQGNsE=; b=cw1Y22JMoUFkP+Tx3LNBq4U3LrsJOXXyfWKC72ylHegFNsa2EsP6tpJO+W3v2P1tP/ gkPRrX9ZOWY1IO4KRJsBKjNdN5wTLnIg7d5MEDwNqHf/i+fGNNCZbRhivEXU3RDXzskS GCXhjGycty7P1ew72UShwsQylLGgIht4oVd+lV0cQ9KjQzWQ3rnQKvm0B5EP6a6U5XRP jbyGC9HmwBylYjcL5YCmayM6FDal1WwwApTjguUZG45FVuf4dF/zx5vqnf81U0u7JDsS 3QmfapFYuHbGYqBdaCVjCpgmoU1rfWhakRqq+xhRezkrLPrmK+Oqf1I0vCOUQ3NHtpqh NAJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689947418; x=1690552218; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SrC0OKi8JQYuMqsO21AINU5+pXiu6nr1MLw9iKQGNsE=; b=hHLSQUlyyrmboLrKTHZWz7cDYxWRRlrguCA8bSQxX8a1en6r3cYj4VaU4GAuxcS8++ SpTWx3BTSMdZyiCYPlEVESp5qKuYM1GmARAk9IUPRf9XHkwRtkIzIh+AGRGSde4+8w49 EIF0mVMuu4CUUjkAwRInkGm3jhXZ1nZCscDTu1QqlPpJqFA3fCQeMvxwYmTnWTk6EG6M Tg5vIdBGa0Y144oT2jL8vGe7Jl73GFB+pFydu+a0kmNcTyTbwlPvRFl3ifbObdHREN3i IV83OZOVFdUBOkkkK8BVV22GYNhsqUElsKAHaunNGXSmWx3OmG0vImvqmhz6tmjyyCBT 34cw== X-Gm-Message-State: ABy/qLbbY7jNSbpJJFYRcaoWLuC4l7tiOH2V2p1GcGlqNsMfotFz2WJQ jAFG/7am6/+yb2WfVkAnweLwtg== X-Received: by 2002:a05:600c:210d:b0:3fa:7b44:7195 with SMTP id u13-20020a05600c210d00b003fa7b447195mr1508308wml.10.1689947418587; Fri, 21 Jul 2023 06:50:18 -0700 (PDT) Received: from blmsp.fritz.box ([2001:4091:a247:82fa:b762:4f68:e1ed:5041]) by smtp.gmail.com with ESMTPSA id c14-20020adfed8e000000b00313e4d02be8sm4233980wro.55.2023.07.21.06.50.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jul 2023 06:50:18 -0700 (PDT) From: Markus Schneider-Pargmann To: Wolfgang Grandegger , Marc Kleine-Budde , Rob Herring , Krzysztof Kozlowski Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Conor Dooley , Chandrasekar Ramakrishnan , Michal Kubiak , Vivek Yadav , linux-can@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Markus Schneider-Pargmann Subject: [PATCH v3 5/6] can: tcan4x5x: Add support for tcan4552/4553 Date: Fri, 21 Jul 2023 15:50:08 +0200 Message-Id: <20230721135009.1120562-6-msp@baylibre.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230721135009.1120562-1-msp@baylibre.com> References: <20230721135009.1120562-1-msp@baylibre.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772038843236760642 X-GMAIL-MSGID: 1772038843236760642 tcan4552 and tcan4553 do not have wake or state pins, so they are currently not compatible with the generic driver. The generic driver uses tcan4x5x_disable_state() and tcan4x5x_disable_wake() if the gpios are not defined. These functions use register bits that are not available in tcan4552/4553. This patch adds support by introducing version information to reflect if the chip has wake and state pins. Also the version is now checked. Signed-off-by: Markus Schneider-Pargmann --- drivers/net/can/m_can/tcan4x5x-core.c | 104 ++++++++++++++++++++++---- 1 file changed, 90 insertions(+), 14 deletions(-) diff --git a/drivers/net/can/m_can/tcan4x5x-core.c b/drivers/net/can/m_can/tcan4x5x-core.c index fb9375fa20ec..2d329b4e4f52 100644 --- a/drivers/net/can/m_can/tcan4x5x-core.c +++ b/drivers/net/can/m_can/tcan4x5x-core.c @@ -7,6 +7,7 @@ #define TCAN4X5X_EXT_CLK_DEF 40000000 #define TCAN4X5X_DEV_ID1 0x00 +#define TCAN4X5X_DEV_ID1_TCAN 0x4e414354 /* ASCII TCAN */ #define TCAN4X5X_DEV_ID2 0x04 #define TCAN4X5X_REV 0x08 #define TCAN4X5X_STATUS 0x0C @@ -103,6 +104,37 @@ #define TCAN4X5X_WD_3_S_TIMER BIT(29) #define TCAN4X5X_WD_6_S_TIMER (BIT(28) | BIT(29)) +struct tcan4x5x_version_info { + const char *name; + u32 id2_register; + + bool has_wake_pin; + bool has_state_pin; +}; + +enum { + TCAN4552 = 0, + TCAN4553, + TCAN4X5X, +}; + +static const struct tcan4x5x_version_info tcan4x5x_versions[] = { + [TCAN4552] = { + .name = "4552", + .id2_register = 0x32353534, + }, + [TCAN4553] = { + .name = "4553", + .id2_register = 0x32353534, + }, + /* generic version with no id2_register at the end */ + [TCAN4X5X] = { + .name = "generic", + .has_wake_pin = true, + .has_state_pin = true, + }, +}; + static inline struct tcan4x5x_priv *cdev_to_priv(struct m_can_classdev *cdev) { return container_of(cdev, struct tcan4x5x_priv, cdev); @@ -254,18 +286,53 @@ static int tcan4x5x_disable_state(struct m_can_classdev *cdev) TCAN4X5X_DISABLE_INH_MSK, 0x01); } -static int tcan4x5x_get_gpios(struct m_can_classdev *cdev) +static const struct tcan4x5x_version_info +*tcan4x5x_find_version(struct tcan4x5x_priv *priv) +{ + u32 val; + int ret; + + ret = regmap_read(priv->regmap, TCAN4X5X_DEV_ID1, &val); + if (ret) + return ERR_PTR(ret); + + if (val != TCAN4X5X_DEV_ID1_TCAN) { + dev_err(&priv->spi->dev, "Not a tcan device %x\n", val); + return ERR_PTR(-ENODEV); + } + + ret = regmap_read(priv->regmap, TCAN4X5X_DEV_ID2, &val); + if (ret) + return ERR_PTR(ret); + + for (int i = 0; i != ARRAY_SIZE(tcan4x5x_versions); ++i) { + const struct tcan4x5x_version_info *vinfo = &tcan4x5x_versions[i]; + + if (!vinfo->id2_register || val == vinfo->id2_register) { + dev_info(&priv->spi->dev, "Detected TCAN device version %s\n", + vinfo->name); + return vinfo; + } + } + + return &tcan4x5x_versions[TCAN4X5X]; +} + +static int tcan4x5x_get_gpios(struct m_can_classdev *cdev, + const struct tcan4x5x_version_info *version_info) { struct tcan4x5x_priv *tcan4x5x = cdev_to_priv(cdev); int ret; - tcan4x5x->device_wake_gpio = devm_gpiod_get(cdev->dev, "device-wake", - GPIOD_OUT_HIGH); - if (IS_ERR(tcan4x5x->device_wake_gpio)) { - if (PTR_ERR(tcan4x5x->device_wake_gpio) == -EPROBE_DEFER) - return -EPROBE_DEFER; + if (version_info->has_wake_pin) { + tcan4x5x->device_wake_gpio = devm_gpiod_get(cdev->dev, "device-wake", + GPIOD_OUT_HIGH); + if (IS_ERR(tcan4x5x->device_wake_gpio)) { + if (PTR_ERR(tcan4x5x->device_wake_gpio) == -EPROBE_DEFER) + return -EPROBE_DEFER; - tcan4x5x_disable_wake(cdev); + tcan4x5x_disable_wake(cdev); + } } tcan4x5x->reset_gpio = devm_gpiod_get_optional(cdev->dev, "reset", @@ -277,12 +344,14 @@ static int tcan4x5x_get_gpios(struct m_can_classdev *cdev) if (ret) return ret; - tcan4x5x->device_state_gpio = devm_gpiod_get_optional(cdev->dev, - "device-state", - GPIOD_IN); - if (IS_ERR(tcan4x5x->device_state_gpio)) { - tcan4x5x->device_state_gpio = NULL; - tcan4x5x_disable_state(cdev); + if (version_info->has_state_pin) { + tcan4x5x->device_state_gpio = devm_gpiod_get_optional(cdev->dev, + "device-state", + GPIOD_IN); + if (IS_ERR(tcan4x5x->device_state_gpio)) { + tcan4x5x->device_state_gpio = NULL; + tcan4x5x_disable_state(cdev); + } } return 0; @@ -299,6 +368,7 @@ static struct m_can_ops tcan4x5x_ops = { static int tcan4x5x_can_probe(struct spi_device *spi) { + const struct tcan4x5x_version_info *version_info; struct tcan4x5x_priv *priv; struct m_can_classdev *mcan_class; int freq, ret; @@ -361,7 +431,13 @@ static int tcan4x5x_can_probe(struct spi_device *spi) if (ret) goto out_m_can_class_free_dev; - ret = tcan4x5x_get_gpios(mcan_class); + version_info = tcan4x5x_find_version(priv); + if (IS_ERR(version_info)) { + ret = PTR_ERR(version_info); + goto out_power; + } + + ret = tcan4x5x_get_gpios(mcan_class, version_info); if (ret) goto out_power; From patchwork Fri Jul 21 13:50:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Schneider-Pargmann X-Patchwork-Id: 123894 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp233096vqg; Fri, 21 Jul 2023 07:11:30 -0700 (PDT) X-Google-Smtp-Source: APBJJlGNneYqEA2HdIU2Wc5tlzxmAvReJIiVr5BTaxsaFkTSvKmDXXPmoAYeJ3L7fjgqZRU+P2ht X-Received: by 2002:a05:6e02:1314:b0:345:b536:61f with SMTP id g20-20020a056e02131400b00345b536061fmr49515ilr.31.1689948689551; Fri, 21 Jul 2023 07:11:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689948689; cv=none; d=google.com; s=arc-20160816; b=MxZB5tYVUdx2GhOfebpHf36wC14PYqxFBEcq/WLQvySLVe4Zays4tpPHo5s4PnFTQH IHtxxnjoWSBSPxUUmTgFm+G4m3QDwO/c62u8uBcxdrt5THY0CkJWg9DpJTl3ZtV2qage jYkOIGme2KjkERthYLq74/KmCMj/W7fNMjZJyaojkn0nzMXDCxJdFObcDL+g4gvOZuFR /Nei0CwYlvwtL/1brOyzOmfL2gQfJh/lctRhl8eCqf/OXi4WXibUqSS0WVx/QEJty5bv M1QJLGPGU9FcnH0YX7KWDOv2iT1rVXlg/FWWS1P/ywF62Z5bsiO5T5fktIckyj6c6Zda EOdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dRBYGxiJV+fUO8L5x5OkCA3grJdrnxlxanjlGq4MKP4=; fh=9frbIG+5eKvNqELn2qUZ8UP3akRIGRm6w0alHg8xR8g=; b=CGx+L+rNg9mv4FDUNSTCHgw2E6b/soscjePLH7ynfZz092tn+yF4ikpvfR8nRczv0B SpXV15TzNFHt9IXsut7kpZBpS4SHRjHCnO6UQld3tIWk5OnNYOfJhdHOTxfXzpt6kgyU wTD8X7ghlSMgsLkXwKnFm0Bn+QkuEmcdZpFRtU9XMchG5OJun0yWMv2iqkIXBOKk7Aal T6f634s1523+1rLSG9sqbwgkFZoS0sM4wEEV7EhFCwSyMt7YViqFGne7fv0GZHEiV2Jx IiALGOzeRq9pZa7IWVrIkSDYhhSd5xAeI2EgMKHvWKZSnyHtdQhasTBdKECdUGjNNWOT H2wA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b=pfR7mREr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v24-20020a63f218000000b0055af0729456si3009979pgh.399.2023.07.21.07.11.07; Fri, 21 Jul 2023 07:11:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20221208.gappssmtp.com header.s=20221208 header.b=pfR7mREr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231633AbjGUNur (ORCPT + 99 others); Fri, 21 Jul 2023 09:50:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231556AbjGUNu2 (ORCPT ); Fri, 21 Jul 2023 09:50:28 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6FFE30C7 for ; Fri, 21 Jul 2023 06:50:21 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-3fbc5d5746cso17232905e9.2 for ; Fri, 21 Jul 2023 06:50:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20221208.gappssmtp.com; s=20221208; t=1689947420; x=1690552220; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dRBYGxiJV+fUO8L5x5OkCA3grJdrnxlxanjlGq4MKP4=; b=pfR7mREr9aayrh+8f9nOd5qtIuFl435AvZJdQGv4nHPrajIcHM6UzskadI1FY3Jaxs NQS9yZsNmtZ22/yZjmm60KISaFO6zMnpY9KAevpevBTm4ZT4WNkfwH/P3qCRjmc8V9pX N1ff8VZXBWBZmIVdkVV0SBJH4slQeFxdXn09zAK+U12hTq9eShicztoNnxb3wLdWlp2N oCP5Zq610M8aEHl94yIKan/Lmk46W5ONk3k+hSSk3wwXqg9gLr3BGnLot2bedPF5OYtX TT760rAP4bbDEajDXH44a9AKHxRJfj7wzq337I1DRLVeYTf51pk7Jr8PCKH2TFu4igwA iN8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689947420; x=1690552220; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dRBYGxiJV+fUO8L5x5OkCA3grJdrnxlxanjlGq4MKP4=; b=cRs1IqoTYWqgFgk8EehBrmveFYIvb82ZkJ1Mj89uH2PlHde+MfSn642TgvPA1R2YX7 XVzWRMt5DE7NjgSOxFVRQeTSxdiyG3+DwJcZ/hGXBur00rksFyWQlTFyBzwIDjMaaeeM P4DLC/ZqK/CRLy4QwdQc8H9OyxiibBrksu8P5HSJ97tsO+h9Yh1JO4Imgp2ar3pM5Mg4 KBgt76MqsJ9CodRdbTZvWQjJt/VYDKV5JTEmtUcckrrbKYeKF67cQjJDA6fkrfZ9yEv/ IoEGiHvhlW6x10DJFCWAPcgI80xthQ6S9h4/IPZqFldUg4N1ApnAY/2pocnUAehqvGS4 nagg== X-Gm-Message-State: ABy/qLYMac+ULpQIF6S39Kb7MkYRmpEsHuteTR4c7Nnp2SRlmIafOAKO JKzlslM05EmezNaapXqd5Ix/qw== X-Received: by 2002:a05:600c:20c4:b0:3f4:d18f:b2fb with SMTP id y4-20020a05600c20c400b003f4d18fb2fbmr1623924wmm.8.1689947419766; Fri, 21 Jul 2023 06:50:19 -0700 (PDT) Received: from blmsp.fritz.box ([2001:4091:a247:82fa:b762:4f68:e1ed:5041]) by smtp.gmail.com with ESMTPSA id c14-20020adfed8e000000b00313e4d02be8sm4233980wro.55.2023.07.21.06.50.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jul 2023 06:50:19 -0700 (PDT) From: Markus Schneider-Pargmann To: Wolfgang Grandegger , Marc Kleine-Budde , Rob Herring , Krzysztof Kozlowski Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Conor Dooley , Chandrasekar Ramakrishnan , Michal Kubiak , Vivek Yadav , linux-can@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Markus Schneider-Pargmann Subject: [PATCH v3 6/6] can: tcan4x5x: Add error messages in probe Date: Fri, 21 Jul 2023 15:50:09 +0200 Message-Id: <20230721135009.1120562-7-msp@baylibre.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230721135009.1120562-1-msp@baylibre.com> References: <20230721135009.1120562-1-msp@baylibre.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772039637191036639 X-GMAIL-MSGID: 1772039637191036639 To be able to understand issues during probe easier, add error messages if something fails. Signed-off-by: Markus Schneider-Pargmann --- drivers/net/can/m_can/tcan4x5x-core.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/drivers/net/can/m_can/tcan4x5x-core.c b/drivers/net/can/m_can/tcan4x5x-core.c index 2d329b4e4f52..60380b50e553 100644 --- a/drivers/net/can/m_can/tcan4x5x-core.c +++ b/drivers/net/can/m_can/tcan4x5x-core.c @@ -402,6 +402,8 @@ static int tcan4x5x_can_probe(struct spi_device *spi) /* Sanity check */ if (freq < 20000000 || freq > TCAN4X5X_EXT_CLK_DEF) { + dev_err(&spi->dev, "Clock frequency is out of supported range %d\n", + freq); ret = -ERANGE; goto out_m_can_class_free_dev; } @@ -420,16 +422,22 @@ static int tcan4x5x_can_probe(struct spi_device *spi) /* Configure the SPI bus */ spi->bits_per_word = 8; ret = spi_setup(spi); - if (ret) + if (ret) { + dev_err(&spi->dev, "SPI setup failed %d\n", ret); goto out_m_can_class_free_dev; + } ret = tcan4x5x_regmap_init(priv); - if (ret) + if (ret) { + dev_err(&spi->dev, "regmap init failed %d\n", ret); goto out_m_can_class_free_dev; + } ret = tcan4x5x_power_enable(priv->power, 1); - if (ret) + if (ret) { + dev_err(&spi->dev, "Enabling regulator failed %d\n", ret); goto out_m_can_class_free_dev; + } version_info = tcan4x5x_find_version(priv); if (IS_ERR(version_info)) { @@ -438,16 +446,22 @@ static int tcan4x5x_can_probe(struct spi_device *spi) } ret = tcan4x5x_get_gpios(mcan_class, version_info); - if (ret) + if (ret) { + dev_err(&spi->dev, "Getting gpios failed %d\n", ret); goto out_power; + } ret = tcan4x5x_init(mcan_class); - if (ret) + if (ret) { + dev_err(&spi->dev, "tcan initialization failed %d\n", ret); goto out_power; + } ret = m_can_class_register(mcan_class); - if (ret) + if (ret) { + dev_err(&spi->dev, "Failed registering m_can device %d\n", ret); goto out_power; + } netdev_info(mcan_class->net, "TCAN4X5X successfully initialized.\n"); return 0;