From patchwork Wed Jan 20 11:55:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Grzeschik X-Patchwork-Id: 570665 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 B767A1402ED for ; Wed, 20 Jan 2016 23:01:44 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933181AbcATMBl (ORCPT ); Wed, 20 Jan 2016 07:01:41 -0500 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:37788 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932590AbcATMBj (ORCPT ); Wed, 20 Jan 2016 07:01:39 -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 1aLrS8-0005qb-Pq; Wed, 20 Jan 2016 13:01:32 +0100 Received: from mgr by dude.hi.pengutronix.de with local (Exim 4.86) (envelope-from ) id 1aLrS8-00063W-Hw; Wed, 20 Jan 2016 13:01:32 +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] can: c_can: add xceiver enable/disable support Date: Wed, 20 Jan 2016 12:55:30 +0100 Message-Id: <1453290930-19136-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 --- drivers/net/can/c_can/c_can.c | 31 +++++++++++++++++++++++++++++++ drivers/net/can/c_can/c_can.h | 1 + 2 files changed, 32 insertions(+) diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c index f91b094..ca42044 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 @@ -588,6 +589,22 @@ static int c_can_chip_config(struct net_device *dev) return c_can_set_bittiming(dev); } +static inline int c_can_transceiver_enable(const struct c_can_priv *priv) +{ + if (!priv->reg_xceiver) + return 0; + + return regulator_enable(priv->reg_xceiver); +} + +static inline int c_can_transceiver_disable(const struct c_can_priv *priv) +{ + if (!priv->reg_xceiver) + return 0; + + return regulator_disable(priv->reg_xceiver); +} + static int c_can_start(struct net_device *dev) { struct c_can_priv *priv = netdev_priv(dev); @@ -612,6 +629,10 @@ static int c_can_start(struct net_device *dev) else pinctrl_pm_select_default_state(priv->device); + err = c_can_transceiver_enable(priv); + if (err) + return err; + return 0; } @@ -626,6 +647,9 @@ static void c_can_stop(struct net_device *dev) /* deactivate pins */ pinctrl_pm_select_sleep_state(dev->dev.parent); + + c_can_transceiver_disable(priv); + priv->can.state = CAN_STATE_STOPPED; } @@ -1263,6 +1287,13 @@ 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)) { + if (PTR_ERR(priv->reg_xceiver) == -EPROBE_DEFER) + return -EPROBE_DEFER; + priv->reg_xceiver = NULL; + } + 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);