From patchwork Wed Jan 20 13:44:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Grzeschik X-Patchwork-Id: 570720 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 246E9140AD9 for ; Thu, 21 Jan 2016 00:44:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933530AbcATNoc (ORCPT ); Wed, 20 Jan 2016 08:44:32 -0500 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:37855 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932839AbcATNob (ORCPT ); Wed, 20 Jan 2016 08:44:31 -0500 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1aLt3k-0005KQ-2x; Wed, 20 Jan 2016 14:44:28 +0100 Received: from mgr by dude.hi.pengutronix.de with local (Exim 4.86) (envelope-from ) id 1aLt3j-0001Oz-OW; Wed, 20 Jan 2016 14:44:27 +0100 From: Michael Grzeschik To: mkl@pengutronix.de, wg@grandegger.com Cc: linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH v2] can: c_can: add xceiver enable/disable support Date: Wed, 20 Jan 2016 14:44:03 +0100 Message-Id: <1453297443-23279-1-git-send-email-m.grzeschik@pengutronix.de> X-Mailer: git-send-email 2.7.0.rc3 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: mgr@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch adds support to enable and disable the xceiver in case it's switchable by the regulator framework. Signed-off-by: Michael Grzeschik Reviewed-by: Markus Pargmann --- v1 -> v2: - always returning PTR_ERR in case devm_regulator_get fails - removed inline wrapper functions with checks for xceiver == NULL drivers/net/can/c_can/c_can.c | 12 ++++++++++++ drivers/net/can/c_can/c_can.h | 1 + 2 files changed, 13 insertions(+) diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c index f91b094..0723aeb 100644 --- a/drivers/net/can/c_can/c_can.c +++ b/drivers/net/can/c_can/c_can.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -612,6 +613,10 @@ static int c_can_start(struct net_device *dev) else pinctrl_pm_select_default_state(priv->device); + err = regulator_enable(priv->reg_xceiver); + if (err) + return err; + return 0; } @@ -626,6 +631,9 @@ static void c_can_stop(struct net_device *dev) /* deactivate pins */ pinctrl_pm_select_sleep_state(dev->dev.parent); + + regulator_disable(priv->reg_xceiver); + priv->can.state = CAN_STATE_STOPPED; } @@ -1263,6 +1271,10 @@ int register_c_can_dev(struct net_device *dev) */ pinctrl_pm_select_sleep_state(dev->dev.parent); + priv->reg_xceiver = devm_regulator_get(priv->device, "xceiver"); + if (IS_ERR(priv->reg_xceiver)) + return PTR_ERR(priv->reg_xceiver); + c_can_pm_runtime_enable(priv); dev->flags |= IFF_ECHO; /* we support local echo */ diff --git a/drivers/net/can/c_can/c_can.h b/drivers/net/can/c_can/c_can.h index 8acdc7f..59246e3 100644 --- a/drivers/net/can/c_can/c_can.h +++ b/drivers/net/can/c_can/c_can.h @@ -213,6 +213,7 @@ struct c_can_priv { u32 comm_rcv_high; u32 rxmasked; u32 dlc[C_CAN_MSG_OBJ_TX_NUM]; + struct regulator *reg_xceiver; }; struct net_device *alloc_c_can_dev(void);