iio:adc:max1363 incorrect resolutions for max11604, max11605, max11610 and max11611.

PATCH In review Jonathan Cameron 2 participants 3 messages May 24, 2014 – May 25, 2014 IIO

lore

Share & tools

lore

Jonathan Cameron

author maintainer

2014-05-24 12:04 UTC #0 lore raw

PATCH 1/1 iio:adc:max1363 incorrect resolutions for max11604, max11605, max11610 and max11611.

Reported-by Erik Habbinga <[email protected]>

Signed-off-by Jonathan Cameron <[email protected]>

---
 drivers/iio/adc/max1363.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

drivers/iio/adc/max1363.c +8 -8

index 9cf3229..1b3b74b 100644
@@ -1252,8 +1252,8 @@ static const struct max1363_chip_info max1363_chip_info_tbl[] = {
 		.num_modes = ARRAY_SIZE(max1238_mode_list),
 		.default_mode = s0to11,
 		.info = &max1238_info,
-		.channels = max1238_channels,
-		.num_channels = ARRAY_SIZE(max1238_channels),
+		.channels = max1038_channels,
+		.num_channels = ARRAY_SIZE(max1038_channels),
 	},
 	[max11605] = {
 		.bits = 8,

@@ -1262,8 +1262,8 @@ static const struct max1363_chip_info max1363_chip_info_tbl[] = {
 		.num_modes = ARRAY_SIZE(max1238_mode_list),
 		.default_mode = s0to11,
 		.info = &max1238_info,
-		.channels = max1238_channels,
-		.num_channels = ARRAY_SIZE(max1238_channels),
+		.channels = max1038_channels,
+		.num_channels = ARRAY_SIZE(max1038_channels),
 	},
 	[max11606] = {
 		.bits = 10,

@@ -1312,8 +1312,8 @@ static const struct max1363_chip_info max1363_chip_info_tbl[] = {
 		.num_modes = ARRAY_SIZE(max1238_mode_list),
 		.default_mode = s0to11,
 		.info = &max1238_info,
-		.channels = max1238_channels,
-		.num_channels = ARRAY_SIZE(max1238_channels),
+		.channels = max1138_channels,
+		.num_channels = ARRAY_SIZE(max1138_channels),
 	},
 	[max11611] = {
 		.bits = 10,

@@ -1322,8 +1322,8 @@ static const struct max1363_chip_info max1363_chip_info_tbl[] = {
 		.num_modes = ARRAY_SIZE(max1238_mode_list),
 		.default_mode = s0to11,
 		.info = &max1238_info,
-		.channels = max1238_channels,
-		.num_channels = ARRAY_SIZE(max1238_channels),
+		.channels = max1138_channels,
+		.num_channels = ARRAY_SIZE(max1138_channels),
 	},
 	[max11612] = {
 		.bits = 12,

Signature · 1 line

1.9.3

Hartmut Knaack

Acked-by on v1 1/1

2014-05-24 21:01 UTC #1 lore raw

Quoted 2 lines · Jonathan Cameron

Reported-by Erik Habbinga <[email protected]>
Signed-off-by Jonathan Cameron <[email protected]>

Acked-by Hartmut Knaack <[email protected]>

Quoted 52 lines

---
 drivers/iio/adc/max1363.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

drivers/iio/adc/max1363.c +8 -8

index 9cf3229..1b3b74b 100644
@@ -1252,8 +1252,8 @@ static const struct max1363_chip_info max1363_chip_info_tbl[] = {
 		.num_modes = ARRAY_SIZE(max1238_mode_list),
 		.default_mode = s0to11,
 		.info = &max1238_info,
-		.channels = max1238_channels,
-		.num_channels = ARRAY_SIZE(max1238_channels),
+		.channels = max1038_channels,
+		.num_channels = ARRAY_SIZE(max1038_channels),
 	},
 	[max11605] = {
 		.bits = 8,

@@ -1262,8 +1262,8 @@ static const struct max1363_chip_info max1363_chip_info_tbl[] = {
 		.num_modes = ARRAY_SIZE(max1238_mode_list),
 		.default_mode = s0to11,
 		.info = &max1238_info,
-		.channels = max1238_channels,
-		.num_channels = ARRAY_SIZE(max1238_channels),
+		.channels = max1038_channels,
+		.num_channels = ARRAY_SIZE(max1038_channels),
 	},
 	[max11606] = {
 		.bits = 10,

@@ -1312,8 +1312,8 @@ static const struct max1363_chip_info max1363_chip_info_tbl[] = {
 		.num_modes = ARRAY_SIZE(max1238_mode_list),
 		.default_mode = s0to11,
 		.info = &max1238_info,
-		.channels = max1238_channels,
-		.num_channels = ARRAY_SIZE(max1238_channels),
+		.channels = max1138_channels,
+		.num_channels = ARRAY_SIZE(max1138_channels),
 	},
 	[max11611] = {
 		.bits = 10,

@@ -1322,8 +1322,8 @@ static const struct max1363_chip_info max1363_chip_info_tbl[] = {
 		.num_modes = ARRAY_SIZE(max1238_mode_list),
 		.default_mode = s0to11,
 		.info = &max1238_info,
-		.channels = max1238_channels,
-		.num_channels = ARRAY_SIZE(max1238_channels),
+		.channels = max1138_channels,
+		.num_channels = ARRAY_SIZE(max1138_channels),
 	},
 	[max11612] = {
 		.bits = 12,

Jonathan Cameron

author maintainer

2014-05-25 11:06 UTC #2 lore raw

Quoted 4 lines · Hartmut Knaack

Quoted 2 lines · Jonathan Cameron
Reported-by Erik Habbinga <[email protected]>
Signed-off-by Jonathan Cameron <[email protected]>
Acked-by Hartmut Knaack <[email protected]>

Thanks,

Given the late stage in the cycle and the relatively minor nature of this bug I've applied it to the togreg tree for the next merge window.

Jonathan

Quoted 53 lines

Quoted 52 lines

---
  drivers/iio/adc/max1363.c | 16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)

drivers/iio/adc/max1363.c +8 -8

index 9cf3229..1b3b74b 100644
@@ -1252,8 +1252,8 @@ static const struct max1363_chip_info max1363_chip_info_tbl[] = {
  		.num_modes = ARRAY_SIZE(max1238_mode_list),
  		.default_mode = s0to11,
  		.info = &max1238_info,
-		.channels = max1238_channels,
-		.num_channels = ARRAY_SIZE(max1238_channels),
+		.channels = max1038_channels,
+		.num_channels = ARRAY_SIZE(max1038_channels),
  	},
  	[max11605] = {
  		.bits = 8,

@@ -1262,8 +1262,8 @@ static const struct max1363_chip_info max1363_chip_info_tbl[] = {
  		.num_modes = ARRAY_SIZE(max1238_mode_list),
  		.default_mode = s0to11,
  		.info = &max1238_info,
-		.channels = max1238_channels,
-		.num_channels = ARRAY_SIZE(max1238_channels),
+		.channels = max1038_channels,
+		.num_channels = ARRAY_SIZE(max1038_channels),
  	},
  	[max11606] = {
  		.bits = 10,

@@ -1312,8 +1312,8 @@ static const struct max1363_chip_info max1363_chip_info_tbl[] = {
  		.num_modes = ARRAY_SIZE(max1238_mode_list),
  		.default_mode = s0to11,
  		.info = &max1238_info,
-		.channels = max1238_channels,
-		.num_channels = ARRAY_SIZE(max1238_channels),
+		.channels = max1138_channels,
+		.num_channels = ARRAY_SIZE(max1138_channels),
  	},
  	[max11611] = {
  		.bits = 10,

@@ -1322,8 +1322,8 @@ static const struct max1363_chip_info max1363_chip_info_tbl[] = {
  		.num_modes = ARRAY_SIZE(max1238_mode_list),
  		.default_mode = s0to11,
  		.info = &max1238_info,
-		.channels = max1238_channels,
-		.num_channels = ARRAY_SIZE(max1238_channels),
+		.channels = max1138_channels,
+		.num_channels = ARRAY_SIZE(max1138_channels),
  	},
  	[max11612] = {
  		.bits = 12,