1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
|
From ff03f1075bd445d1dbb5bb087c8d8d3f3b29a025 Mon Sep 17 00:00:00 2001
From: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
Date: Mon, 2 May 2016 22:05:53 +0300
Subject: [PATCH 007/122] can: rcar_can: add enable and standby control pins
Add enable and standby can transceiver control pins
Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
---
.../devicetree/bindings/net/can/rcar_can.txt | 4 ++
drivers/net/can/rcar/rcar_can.c | 58 +++++++++++++++++-----
include/linux/can/platform/rcar_can.h | 2 +
3 files changed, 51 insertions(+), 13 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/can/rcar_can.txt b/Documentation/devicetree/bindings/net/can/rcar_can.txt
index 94a7f33..5860349 100644
--- a/Documentation/devicetree/bindings/net/can/rcar_can.txt
+++ b/Documentation/devicetree/bindings/net/can/rcar_can.txt
@@ -43,6 +43,7 @@ Optional properties:
<0x0> (default) : Peripheral clock (clkp1)
<0x1> : Peripheral clock (clkp2)
<0x3> : Externally input clock
+- gpios: GPIO used for controlling the enable pin and standby pin
Example
-------
@@ -64,5 +65,8 @@ Board specific .dts file:
&can0 {
pinctrl-0 = <&can0_pins>;
pinctrl-names = "default";
+ gpios = <&gpio5 29 GPIO_ACTIVE_HIGH /* enable */
+ &gpio5 30 GPIO_ACTIVE_LOW /* standby */
+ >;
status = "okay";
};
diff --git a/drivers/net/can/rcar/rcar_can.c b/drivers/net/can/rcar/rcar_can.c
index 11662f4..8d2c709 100644
--- a/drivers/net/can/rcar/rcar_can.c
+++ b/drivers/net/can/rcar/rcar_can.c
@@ -21,6 +21,7 @@
#include <linux/clk.h>
#include <linux/can/platform/rcar_can.h>
#include <linux/of.h>
+#include <linux/of_gpio.h>
#define RCAR_CAN_DRV_NAME "rcar_can"
@@ -94,6 +95,8 @@ struct rcar_can_priv {
u32 tx_tail;
u8 clock_select;
u8 ier;
+ unsigned int enable_pin; /* transceiver enable */
+ unsigned int standby_pin; /* transceiver standby */
};
static const struct can_bittiming_const rcar_can_bittiming_const = {
@@ -505,6 +508,10 @@ static int rcar_can_open(struct net_device *ndev)
struct rcar_can_priv *priv = netdev_priv(ndev);
int err;
+ /* transceiver normal mode */
+ if (gpio_is_valid(priv->standby_pin))
+ gpio_set_value(priv->standby_pin, 1);
+
err = clk_prepare_enable(priv->clk);
if (err) {
netdev_err(ndev,
@@ -581,6 +588,9 @@ static int rcar_can_close(struct net_device *ndev)
clk_disable_unprepare(priv->clk);
close_candev(ndev);
can_led_event(ndev, CAN_LED_EVENT_STOP);
+ /* transceiver stanby mode */
+ if (gpio_is_valid(priv->standby_pin))
+ gpio_set_value(priv->standby_pin, 0);
return 0;
}
@@ -743,20 +753,9 @@ static int rcar_can_probe(struct platform_device *pdev)
struct resource *mem;
void __iomem *addr;
u32 clock_select = CLKR_CLKP1;
- int err = -ENODEV;
+ int err = -ENODEV, ret;
int irq;
-
- if (pdev->dev.of_node) {
- of_property_read_u32(pdev->dev.of_node,
- "renesas,can-clock-select", &clock_select);
- } else {
- pdata = dev_get_platdata(&pdev->dev);
- if (!pdata) {
- dev_err(&pdev->dev, "No platform data provided!\n");
- goto fail;
- }
- clock_select = pdata->clock_select;
- }
+ enum of_gpio_flags enable_flags, standby_flags;
irq = platform_get_irq(pdev, 0);
if (irq < 0) {
@@ -826,6 +825,39 @@ static int rcar_can_probe(struct platform_device *pdev)
devm_can_led_init(ndev);
+ if (pdev->dev.of_node) {
+ of_property_read_u32(pdev->dev.of_node,
+ "renesas,can-clock-select", &clock_select);
+ priv->enable_pin = of_get_gpio_flags(pdev->dev.of_node, 0, &enable_flags);
+ priv->standby_pin = of_get_gpio_flags(pdev->dev.of_node, 1, &standby_flags);
+ } else {
+ pdata = dev_get_platdata(&pdev->dev);
+ if (!pdata) {
+ dev_err(&pdev->dev, "No platform data provided!\n");
+ goto fail;
+ }
+ clock_select = pdata->clock_select;
+ priv->enable_pin = pdata->enable_pin;
+ priv->standby_pin = pdata->standby_pin;
+ }
+
+ if (gpio_is_valid(priv->enable_pin)) {
+ int val = enable_flags & OF_GPIO_ACTIVE_LOW ?
+ GPIOF_OUT_INIT_LOW : GPIOF_OUT_INIT_HIGH;
+ ret = devm_gpio_request_one(&pdev->dev, priv->enable_pin, val, "enable");
+ if (ret)
+ dev_info(&pdev->dev, "Failed to request enable pin\n");
+ }
+
+ if (gpio_is_valid(priv->standby_pin)) {
+ int val = standby_flags & OF_GPIO_ACTIVE_LOW ?
+ GPIOF_OUT_INIT_LOW : GPIOF_OUT_INIT_HIGH;
+ /* transceiver standby mode */
+ ret = devm_gpio_request_one(&pdev->dev, priv->standby_pin, val, "standby");
+ if (ret)
+ dev_info(&pdev->dev, "Failed to request standby pin\n");
+ }
+
dev_info(&pdev->dev, "device registered (IRQ%d)\n", ndev->irq);
return 0;
diff --git a/include/linux/can/platform/rcar_can.h b/include/linux/can/platform/rcar_can.h
index a43dcd0..8f23659 100644
--- a/include/linux/can/platform/rcar_can.h
+++ b/include/linux/can/platform/rcar_can.h
@@ -13,6 +13,8 @@ enum CLKR {
struct rcar_can_platform_data {
enum CLKR clock_select; /* Clock source select */
+ unsigned int enable_pin;
+ unsigned int standby_pin;
};
#endif /* !_CAN_PLATFORM_RCAR_CAN_H_ */
--
2.7.4
|
