Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5f400cf40fc703673aa791966ffb1c628c1ff45a

Authored by Michael Hennerich
Committed by Linus Torvalds
1 parent 10ad5278bb
Exists in master and in 7 other branches imx_3.0.35_4.1.0, 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, smarc-l5.0.0_1.0.0-ga

drivers/misc/ad525x_dpot.c: fix part name typos in defines 

There is no runtime effect by this change.  It frees up namespace for
defines erroneously used.  This is required to actually support devices
requiring the namespace, added with "drivers/misc/ad525x_dpot.c: new
features".

All defines touched have the same value defined, after the change.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Chris Verges <chrisv@cyberswitching.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 10 additions and 10 deletions Side-by-side Diff

drivers/misc/ad525x_dpot.c
Diff comments   View file @ 5f400cf
... ... @@ -166,7 +166,7 @@
166 166 case DPOT_UID(AD5280_ID):
167 167 case DPOT_UID(AD5282_ID):
168 168 ctrl = ((reg & DPOT_RDAC_MASK) == DPOT_RDAC0) ?
169   - 0 : DPOT_AD5291_RDAC_AB;
  169 + 0 : DPOT_AD5282_RDAC_AB;
170 170 return dpot_read_r8d8(dpot, ctrl);
171 171 case DPOT_UID(AD5170_ID):
172 172 case DPOT_UID(AD5171_ID):
... ... @@ -175,7 +175,7 @@
175 175 case DPOT_UID(AD5172_ID):
176 176 case DPOT_UID(AD5173_ID):
177 177 ctrl = ((reg & DPOT_RDAC_MASK) == DPOT_RDAC0) ?
178   - 0 : DPOT_AD5272_3_A0;
  178 + 0 : DPOT_AD5172_3_A0;
179 179 return dpot_read_r8d8(dpot, ctrl);
180 180 default:
181 181 if ((reg & DPOT_REG_TOL) || (dpot->max_pos > 256))
... ... @@ -273,7 +273,7 @@
273 273 case DPOT_UID(AD5280_ID):
274 274 case DPOT_UID(AD5282_ID):
275 275 ctrl = ((reg & DPOT_RDAC_MASK) == DPOT_RDAC0) ?
276   - 0 : DPOT_AD5291_RDAC_AB;
  276 + 0 : DPOT_AD5282_RDAC_AB;
277 277 return dpot_write_r8d8(dpot, ctrl, value);
278 278 break;
279 279 case DPOT_UID(AD5171_ID):
280 280  
... ... @@ -289,12 +289,12 @@
289 289 case DPOT_UID(AD5172_ID):
290 290 case DPOT_UID(AD5173_ID):
291 291 ctrl = ((reg & DPOT_RDAC_MASK) == DPOT_RDAC0) ?
292   - 0 : DPOT_AD5272_3_A0;
  292 + 0 : DPOT_AD5172_3_A0;
293 293 if (reg & DPOT_ADDR_OTP) {
294 294 tmp = dpot_read_r8d16(dpot, ctrl);
295 295 if (tmp >> 14) /* Ready to Program? */
296 296 return -EFAULT;
297   - ctrl |= DPOT_AD5270_2_3_FUSE;
  297 + ctrl |= DPOT_AD5170_2_3_FUSE;
298 298 }
299 299 return dpot_write_r8d8(dpot, ctrl, value);
300 300 break;
drivers/misc/ad525x_dpot.h
Diff comments   View file @ 5f400cf
... ... @@ -166,14 +166,14 @@
166 166 #define DPOT_AD5291_RDAC 0x01
167 167 #define DPOT_AD5291_READ_RDAC 0x02
168 168  
169   -/* AD524x use special commands */
170 169 #define DPOT_AD5291_RDAC_AB 0x80
171 170  
  171 +#define DPOT_AD5282_RDAC_AB 0x80
172 172 #define DPOT_AD5273_FUSE 0x80
173   -#define DPOT_AD5270_2_3_FUSE 0x20
174   -#define DPOT_AD5270_2_3_OW 0x08
175   -#define DPOT_AD5272_3_A0 0x08
176   -#define DPOT_AD5270_2FUSE 0x80
  173 +#define DPOT_AD5170_2_3_FUSE 0x20
  174 +#define DPOT_AD5170_2_3_OW 0x08
  175 +#define DPOT_AD5172_3_A0 0x08
  176 +#define DPOT_AD5170_2FUSE 0x80
177 177  
178 178 struct dpot_data;
179 179