Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f27b1db95d047d05e8d4dd22813b1078267892f2

Authored by AnilKumar Ch
Committed by Marc Kleine-Budde
1 parent abb17e6c0c
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

can: c_can: Modify c_can device names 

Modify c_can device names from *_CAN_DEVTYPE to BOSCH_*_CAN to make
use of same names for array indexes in c_can_id_table[] as well as
device names.

This patch also add indexes to c_can_id_table array.

Signed-off-by: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

Showing 3 changed files with 16 additions and 13 deletions Side-by-side Diff

drivers/net/can/c_can/c_can.h
Diff comments   View file @ f27b1db
... ... @@ -143,8 +143,9 @@
143 143 };
144 144  
145 145 enum c_can_dev_id {
146   - C_CAN_DEVTYPE,
147   - D_CAN_DEVTYPE,
  146 + BOSCH_C_CAN_PLATFORM,
  147 + BOSCH_C_CAN,
  148 + BOSCH_D_CAN,
148 149 };
149 150  
150 151 /* c_can private data structure */
drivers/net/can/c_can/c_can_pci.c
Diff comments   View file @ f27b1db
... ... @@ -120,10 +120,10 @@
120 120  
121 121 /* Configure CAN type */
122 122 switch (c_can_pci_data->type) {
123   - case C_CAN_DEVTYPE:
  123 + case BOSCH_C_CAN:
124 124 priv->regs = reg_map_c_can;
125 125 break;
126   - case D_CAN_DEVTYPE:
  126 + case BOSCH_D_CAN:
127 127 priv->regs = reg_map_d_can;
128 128 priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;
129 129 break;
... ... @@ -192,7 +192,7 @@
192 192 }
193 193  
194 194 static struct c_can_pci_data c_can_sta2x11= {
195   - .type = C_CAN_DEVTYPE,
  195 + .type = BOSCH_C_CAN,
196 196 .reg_align = C_CAN_REG_ALIGN_32,
197 197 .freq = 52000000, /* 52 Mhz */
198 198 };
drivers/net/can/c_can/c_can_platform.c
Diff comments   View file @ f27b1db
... ... @@ -116,7 +116,7 @@
116 116 priv = netdev_priv(dev);
117 117 id = platform_get_device_id(pdev);
118 118 switch (id->driver_data) {
119   - case C_CAN_DEVTYPE:
  119 + case BOSCH_C_CAN:
120 120 priv->regs = reg_map_c_can;
121 121 switch (mem->flags & IORESOURCE_MEM_TYPE_MASK) {
122 122 case IORESOURCE_MEM_32BIT:
... ... @@ -130,7 +130,7 @@
130 130 break;
131 131 }
132 132 break;
133   - case D_CAN_DEVTYPE:
  133 + case BOSCH_D_CAN:
134 134 priv->regs = reg_map_d_can;
135 135 priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;
136 136 priv->read_reg = c_can_plat_read_reg_aligned_to_16bit;
137 137  
138 138  
139 139  
... ... @@ -196,15 +196,17 @@
196 196 }
197 197  
198 198 static const struct platform_device_id c_can_id_table[] = {
199   - {
  199 + [BOSCH_C_CAN_PLATFORM] = {
200 200 .name = KBUILD_MODNAME,
201   - .driver_data = C_CAN_DEVTYPE,
202   - }, {
  201 + .driver_data = BOSCH_C_CAN,
  202 + },
  203 + [BOSCH_C_CAN] = {
203 204 .name = "c_can",
204   - .driver_data = C_CAN_DEVTYPE,
205   - }, {
  205 + .driver_data = BOSCH_C_CAN,
  206 + },
  207 + [BOSCH_D_CAN] = {
206 208 .name = "d_can",
207   - .driver_data = D_CAN_DEVTYPE,
  209 + .driver_data = BOSCH_D_CAN,
208 210 }, {
209 211 }
210 212 };