From patchwork Thu May 23 07:53:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Schneider-Pargmann X-Patchwork-Id: 13671364 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 86E5CC25B79 for ; Thu, 23 May 2024 07:54:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=M/68eJT3AplQYfcvkLYzIcBmAhdEQa9CeV9/eW/kjkM=; b=K+X0hqRzgCA8jK gxJGw9fwinMjJdk34a3xG051DWyyBpgPCBAbin2OSuvU98oBuPD6WKxey6qYqa9td32IuXpnilWR3 q+WcNui4TSnYPCvSeQHSev9CHCVV/nX2LHm8KCZjzcczGQ3Yhz/Fp7KYLspqrEOmjbg3PpE8XybMn P5Utfj5xy5bWZAiLkXYI7JF4ia2XG6N9Q8jhjDuOPAKNoHk+qUDyWCtfcS1PVHuJ+ip6zju/fmZnz IuTgTahGRwisXCN5U8AqguQwfAEvdCYvDdNl4yYFrB2qubytO+JiHVRdHSEgp31cZjWG8bFpKyf1M hXHsQhmDfpiTUfp+gcSw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sA3He-00000005O5i-35X5; Thu, 23 May 2024 07:54:43 +0000 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sA3HS-00000005O0K-2th5 for linux-arm-kernel@lists.infradead.org; Thu, 23 May 2024 07:54:32 +0000 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-354f51ac110so1088711f8f.0 for ; Thu, 23 May 2024 00:54:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1716450868; x=1717055668; darn=lists.infradead.org; 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=P4T6sy6AEq30+xE+MXFJmyPKxLYvjiOTPFV8oNWYyfY=; b=G6Hd0FB2Mh+M0NicZfimCEIvrOTZYKNDiAJgI6ookkooE5NUJzKTc66yfSiwh2wtUo VnWntk8ZeMXcVyP42/qEb9dPtjULBlx4IlzQBsG2foDLwtVmyqLPSGRGEikHQPNM8oY3 Ps7D3x5EEElmujKmx0twoYX3UtDeJfzNdqP6WsMUF2iz9HAyTUms/3CSXJU2e17XWPD0 eSX5wCCoAVw987OCH1MdxQRyfDlxo7Psm9A46b4U+vg9L4T9x8WzT+TrDpW14muDEa+T gs+0nbQOxk5KU1nB+W8NoWdY0LsvdzXH5IhWiRqaCQ2u1+BGNlGvArsOGrC3fbvrWgE/ MAcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716450868; x=1717055668; 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=P4T6sy6AEq30+xE+MXFJmyPKxLYvjiOTPFV8oNWYyfY=; b=Lmv9kRrjmCr9tnSSFvnOKwztfve/m1++t3ol9Z/XphucmGNxfCjxzCsjFy9NJHLeO9 6i5G0mG52JrfKzQF9EkY2XIgAHfCzBRy2CojOQNOpnrxqW4hOMCt+KSHcJUTuS6TFK5m n2Ij3HYhxBTqUr4E23Wudi0kiY5rBnjPtKQqxRuFDgR5kvuXah/js2ysAD1ErzyplxPv RgZkGip8MYUde37xRgQ/eE9XP61btNhDUG1j/LD9QmIsDX80ruRUic30lbGXqRYnPkLG PRdg392kKhKY1kyvYASG/YVeYtBD1SDcLVAYOWt6ALh0R9rU4SA12GPsNit+qBqqT/1p yPRQ== X-Forwarded-Encrypted: i=1; AJvYcCW21kb8Sp1BI4DT4hYlGEGqqkRb/gfexaHvTfDuHasUOMMK3uoyPVdO3TEWMdt29IC5pG5E33yxy0BMD/ltJjx11DRoazMWq5499AlO66c4wfW57hg= X-Gm-Message-State: AOJu0YzmaLnITXFZKe7yDVdm7d7OH8vMq5JvQB1vB4DKuhGC/LYRoNLq aE60n5kqh856DM4nUPYcsVh6sdfq9d+8rc2r5Ue3dx6YyzJGE0EB13cda/d+C98= X-Google-Smtp-Source: AGHT+IFtIc5i+hivOWt1FZJ1gwG5chb73rVNDKqh9Iu9jNZxfSYT+HyovD+5k8o5exozIdt5jmzJ4A== X-Received: by 2002:adf:e6cb:0:b0:354:f2b0:ebda with SMTP id ffacd0b85a97d-354f2b0ec82mr3067448f8f.10.1716450868279; Thu, 23 May 2024 00:54:28 -0700 (PDT) Received: from blmsp.fritz.box ([2001:4091:a246:821e:6f3b:6b50:4762:8343]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3502baad074sm36501833f8f.70.2024.05.23.00.54.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 00:54:27 -0700 (PDT) From: Markus Schneider-Pargmann To: Chandrasekar Ramakrishnan , Marc Kleine-Budde , Vincent Mailhol , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Nishanth Menon , Vignesh Raghavendra , Tero Kristo Cc: Vibhore Vardhan , Kevin Hilman , Dhruva Gole , =?utf-8?q?Martin_Hundeb=C3=B8ll?= , Simon Horman , linux-can@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Markus Schneider-Pargmann Subject: [PATCH 4/7] can: m_can: Support pinctrl wakeup state Date: Thu, 23 May 2024 09:53:44 +0200 Message-ID: <20240523075347.1282395-5-msp@baylibre.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240523075347.1282395-1-msp@baylibre.com> References: <20240523075347.1282395-1-msp@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240523_005430_915848_6AE8FF56 X-CRM114-Status: GOOD ( 14.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org am62 requires a wakeup flag being set in pinctrl when mcan pins acts as a wakeup source. Add support to select the wakeup state if WOL is enabled. Signed-off-by: Markus Schneider-Pargmann --- drivers/net/can/m_can/m_can.c | 20 +++++++++++++++++++- drivers/net/can/m_can/m_can.h | 4 ++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c index 80964e403a5e..c5585dc68f2f 100644 --- a/drivers/net/can/m_can/m_can.c +++ b/drivers/net/can/m_can/m_can.c @@ -2140,11 +2140,21 @@ static void m_can_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol) static int m_can_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) { struct m_can_classdev *cdev = netdev_priv(dev); + struct pinctrl_state *new_pinctrl_state = NULL; + bool wol_enable = !!wol->wolopts & WAKE_PHY; if ((wol->wolopts & WAKE_PHY) != wol->wolopts) return -EINVAL; - device_set_wakeup_enable(cdev->dev, !!wol->wolopts & WAKE_PHY); + if (wol_enable) + new_pinctrl_state = cdev->pinctrl_state_wakeup; + else + new_pinctrl_state = cdev->pinctrl_state_default; + + if (!IS_ERR_OR_NULL(new_pinctrl_state)) + pinctrl_select_state(cdev->pinctrl, new_pinctrl_state); + + device_set_wakeup_enable(cdev->dev, wol_enable); return 0; } @@ -2309,6 +2319,14 @@ struct m_can_classdev *m_can_class_allocate_dev(struct device *dev, SET_NETDEV_DEV(net_dev, dev); m_can_of_parse_mram(class_dev, mram_config_vals); + + class_dev->pinctrl = devm_pinctrl_get(dev); + if (!IS_ERR_OR_NULL(class_dev->pinctrl)) { + class_dev->pinctrl_state_default = + pinctrl_lookup_state(class_dev->pinctrl, "default"); + class_dev->pinctrl_state_wakeup = + pinctrl_lookup_state(class_dev->pinctrl, "wakeup"); + } out: return class_dev; } diff --git a/drivers/net/can/m_can/m_can.h b/drivers/net/can/m_can/m_can.h index 3a9edc292593..bdfbba67b336 100644 --- a/drivers/net/can/m_can/m_can.h +++ b/drivers/net/can/m_can/m_can.h @@ -126,6 +126,10 @@ struct m_can_classdev { struct mram_cfg mcfg[MRAM_CFG_NUM]; struct hrtimer hrtimer; + + struct pinctrl *pinctrl; + struct pinctrl_state *pinctrl_state_default; + struct pinctrl_state *pinctrl_state_wakeup; }; struct m_can_classdev *m_can_class_allocate_dev(struct device *dev, int sizeof_priv);