diff options
| author | Roger Quadros <rogerq@ti.com> | 2014-11-07 09:49:21 -0500 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2014-11-17 06:19:27 -0500 |
| commit | 0f4da3a8da5fe3a079b1adf613d121a0fafd63f1 (patch) | |
| tree | d1760a99468352e6d9471ce6c820e2dcaff2192c | |
| parent | 3973c526ae9cda5959bf6ef8ed936c46845eb774 (diff) | |
can: c_can: Add support for TI DRA7 DCAN
DRA7 SoC has 2 CAN IPs. Provide compatible IDs and RAMINIT
register data for both.
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | Documentation/devicetree/bindings/net/can/c_can.txt | 1 | ||||
| -rw-r--r-- | drivers/net/can/c_can/c_can_platform.c | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/net/can/c_can.txt b/Documentation/devicetree/bindings/net/can/c_can.txt index a3ca3ee53546..f682fdb6d921 100644 --- a/Documentation/devicetree/bindings/net/can/c_can.txt +++ b/Documentation/devicetree/bindings/net/can/c_can.txt | |||
| @@ -4,6 +4,7 @@ Bosch C_CAN/D_CAN controller Device Tree Bindings | |||
| 4 | Required properties: | 4 | Required properties: |
| 5 | - compatible : Should be "bosch,c_can" for C_CAN controllers and | 5 | - compatible : Should be "bosch,c_can" for C_CAN controllers and |
| 6 | "bosch,d_can" for D_CAN controllers. | 6 | "bosch,d_can" for D_CAN controllers. |
| 7 | Can be "ti,dra7-d_can". | ||
| 7 | - reg : physical base address and size of the C_CAN/D_CAN | 8 | - reg : physical base address and size of the C_CAN/D_CAN |
| 8 | registers map | 9 | registers map |
| 9 | - interrupts : property with a value describing the interrupt | 10 | - interrupts : property with a value describing the interrupt |
diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c index 41fa460c3592..570da5f56aae 100644 --- a/drivers/net/can/c_can/c_can_platform.c +++ b/drivers/net/can/c_can/c_can_platform.c | |||
| @@ -190,6 +190,18 @@ static const struct c_can_driver_data d_can_drvdata = { | |||
| 190 | .id = BOSCH_D_CAN, | 190 | .id = BOSCH_D_CAN, |
| 191 | }; | 191 | }; |
| 192 | 192 | ||
| 193 | static const struct raminit_bits dra7_raminit_bits[] = { | ||
| 194 | [0] = { .start = 3, .done = 1, }, | ||
| 195 | [1] = { .start = 5, .done = 2, }, | ||
| 196 | }; | ||
| 197 | |||
| 198 | static const struct c_can_driver_data dra7_dcan_drvdata = { | ||
| 199 | .id = BOSCH_D_CAN, | ||
| 200 | .raminit_num = ARRAY_SIZE(dra7_raminit_bits), | ||
| 201 | .raminit_bits = dra7_raminit_bits, | ||
| 202 | .raminit_pulse = true, | ||
| 203 | }; | ||
| 204 | |||
| 193 | static struct platform_device_id c_can_id_table[] = { | 205 | static struct platform_device_id c_can_id_table[] = { |
| 194 | { | 206 | { |
| 195 | .name = KBUILD_MODNAME, | 207 | .name = KBUILD_MODNAME, |
| @@ -210,6 +222,7 @@ MODULE_DEVICE_TABLE(platform, c_can_id_table); | |||
| 210 | static const struct of_device_id c_can_of_table[] = { | 222 | static const struct of_device_id c_can_of_table[] = { |
| 211 | { .compatible = "bosch,c_can", .data = &c_can_drvdata }, | 223 | { .compatible = "bosch,c_can", .data = &c_can_drvdata }, |
| 212 | { .compatible = "bosch,d_can", .data = &d_can_drvdata }, | 224 | { .compatible = "bosch,d_can", .data = &d_can_drvdata }, |
| 225 | { .compatible = "ti,dra7-d_can", .data = &dra7_dcan_drvdata }, | ||
| 213 | { /* sentinel */ }, | 226 | { /* sentinel */ }, |
| 214 | }; | 227 | }; |
| 215 | MODULE_DEVICE_TABLE(of, c_can_of_table); | 228 | MODULE_DEVICE_TABLE(of, c_can_of_table); |
