iio: adc: Fix read and write functions

- The read and write functions were tested on actual hardware and
both worked fine
- Fix the overlay to be correctly read by the driver

Signed-off-by: Marilene A Garcia <[email protected]>

Author: MarileneGarcia

Documentation/devicetree/bindings/iio/adc/adi,max14001.yaml

@@ -14,7 +14,7 @@ description:
   Bindings for the Analog Devices MAX14001-MAX14002 Configurable,
   Isolated 10-bit ADCs for Multi-Range Binary Inputs.
 
-  Datasheet can be found here:
+  Datasheet can be found here
     https://www.analog.com/media/en/technical-documentation/data-sheets/MAX14001-MAX14002.pdf
 
 properties:

arch/arm/boot/dts/overlays/rpi-max14001-pmb-overlay.dts

@@ -12,14 +12,16 @@
 
 / {
 	compatible = "brcm,bcm2712";
+};
 
+&{/} {
 	vdd: fixedregulator@0 {
 		compatible = "regulator-fixed";
 		regulator-name = "Isolated DC-DC Power Supply Input Voltage";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
 		regulator-boot-on;
-		enable-active-high;
+		regulator-always-on;
 		status = "okay";
 	};
 
@@ -29,7 +31,7 @@
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
 		regulator-boot-on;
-		enable-active-high;
+		regulator-always-on;
 		status = "okay";
 	};
 
@@ -39,7 +41,7 @@
 		regulator-min-microvolt = <1250000>;
 		regulator-max-microvolt = <1250000>;
 		regulator-boot-on;
-		enable-active-high;
+		regulator-always-on;
 		status = "okay";
 	};
 };
@@ -57,9 +59,9 @@
 	};
 	max14001_current_channel: max14001@1 {
 		compatible = "adi,max14001";
+		current-channel;
 		reg = <0x1>;
 		spi-max-frequency = <5000000>;
-		current-channel;
 		vdd-supply = <&vdd>;
 		vddl-supply = <&vddl>;
 		vrefin-supply = <&vrefin>;

drivers/iio/adc/max14001.c

@@ -103,50 +103,53 @@ struct max14001_state {
 
 static int max14001_spi_read(struct max14001_state *st, u16 reg, int *val)
 {
-	u16 rx, reversed;
-	u16 tx = 0;
+	u16 rx, tx = 0;
 	int ret;
 
-	dev_info(&st->spi->dev, "%s: reg: %x, val: %x\n", __func__, reg, *val);
-
 	tx |= FIELD_PREP(MAX14001_MASK_ADDR, reg);
 	tx |= FIELD_PREP(MAX14001_MASK_WR, MAX14001_REG_READ);
-	reversed = bitrev16(tx);
-
-	ret = spi_write_then_read(st->spi, &reversed, 2, &rx, 2);
-	if (ret < 0)
-		return ret;
-
-	/* TODO: Validate this line in the hw, could be le16_to_cpu */
-	reversed = bitrev16(be16_to_cpu(rx));
-	*val = FIELD_GET(MAX14001_MASK_DATA, reversed);
+	tx  = bitrev16(tx);
+
+	struct spi_transfer xfer[] = {
+		{
+			.tx_buf = &tx,
+			.len = sizeof(tx),
+			.bits_per_word = 16,
+			.cs_change = 1,
+		},
+		{
+			.rx_buf = &rx,
+			.len = sizeof(rx),
+			.bits_per_word = 16,
+		},
+	};
+	ret = spi_sync_transfer(st->spi, xfer, ARRAY_SIZE(xfer));
+
+	rx = bitrev16(rx);
+	*val = FIELD_GET(MAX14001_MASK_DATA, rx);
 
 	return ret;
 }
 
 static int max14001_spi_write(struct max14001_state *st, u16 reg, u16 val)
 {
-	struct spi_transfer xfer;
+	u16 tx = 0;
 	int ret;
-	u16 tx, reversed;
-	u16 msg = 0;
-
-	dev_info(&st->spi->dev, "%s: reg: %x, val: %x\n", __func__, reg, val);
-
-	msg |= FIELD_PREP(MAX14001_MASK_ADDR, reg);
-	msg |= FIELD_PREP(MAX14001_MASK_WR, MAX14001_REG_WRITE);
-	msg |= FIELD_PREP(MAX14001_MASK_DATA, val);
 
-	reversed = bitrev16(msg);
-	/* TODO: Validate this line in the hw, could be put_unaligned_le16 */
-	put_unaligned_be16(reversed, &tx);
-
-	xfer.tx_buf = &tx;
-	xfer.len = sizeof(tx);
-
-	dev_info(&st->spi->dev, "%s: msg: %x, tx: %x\n", __func__, msg, tx);
-
-	ret = spi_sync_transfer(st->spi, &xfer, 1);
+	tx |= FIELD_PREP(MAX14001_MASK_ADDR, reg);
+	tx |= FIELD_PREP(MAX14001_MASK_WR, MAX14001_REG_WRITE);
+	tx |= FIELD_PREP(MAX14001_MASK_DATA, val);
+	tx = bitrev16(tx);
+
+	struct spi_transfer xfer[] = {
+		{
+			.tx_buf = &tx,
+			.len = sizeof(tx),
+			.bits_per_word = 16,
+		},
+	};
+
+	ret = spi_sync_transfer(st->spi, xfer, ARRAY_SIZE(xfer));
 	if (ret < 0)
 		return ret;
 
@@ -222,22 +225,19 @@ static int max14001_read_raw(struct iio_dev *indio_dev,
 	switch (mask) {
 	case IIO_CHAN_INFO_RAW:
 		ret = max14001_spi_read(st, MAX14001_REG_ADC, val);
-		dev_info(&st->spi->dev, "%s: IIO_CHAN_INFO_RAW: channel: %d, val: %d\n", __func__, chan->channel, *val);
 		if (ret < 0)
 			return ret;
 
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_AVERAGE_RAW:
 		ret = max14001_spi_read(st, MAX14001_REG_FADC, val);
-		dev_info(&st->spi->dev, "%s: IIO_CHAN_INFO_AVERAGE_RAW: channel: %d, val: %d\n", __func__, chan->channel, *val);
 		if (ret < 0)
 			return ret;
 
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_SCALE:
 		*val = st->vref_mv;
 		*val2 = 10;
-		dev_info(&st->spi->dev, "%s: IIO_CHAN_INFO_SCALE: val: %d, val2: %d\n", __func__, *val, *val2);
 
 		return IIO_VAL_FRACTIONAL_LOG2;
 	}
@@ -277,8 +277,8 @@ static int max14001_probe(struct spi_device *spi)
 	struct device *dev = &spi->dev;
 	struct max14001_state *st;
 	struct iio_dev *indio_dev;
-	bool current_channel = false;
 	int ret;
+	bool current_channel = false;
 
 	info = spi_get_device_match_data(spi);
 	if (!dev)
@@ -307,18 +307,11 @@ static int max14001_probe(struct spi_device *spi)
 	ret = devm_regulator_get_enable_read_voltage(dev, "vrefin");
 	if (ret < 0) {
 		st->vref_mv = 1250000 / 1000;
-		dev_info(&st->spi->dev, "%s: vrefin not found. vref_mv %d\n", __func__, st->vref_mv);
 	} else {
 		st->vref_mv = ret / 1000;
-		dev_info(&st->spi->dev, "%s: vrefin found. vref_mv %d\n", __func__, st->vref_mv);
-	}
-
-	for_each_available_child_of_node_scoped(spi->dev.of_node, child) {
-		current_channel = of_property_read_bool(child, "current-channel");
-		if (current_channel)
-			break;
 	}
 
+	current_channel = device_property_read_bool(dev, "current-channel");
 	if (current_channel) {
 		indio_dev->channels = max14001_channel_current;
 		indio_dev->num_channels = ARRAY_SIZE(max14001_channel_current);
@@ -327,8 +320,6 @@ static int max14001_probe(struct spi_device *spi)
 		indio_dev->num_channels = ARRAY_SIZE(max14001_channel_voltage);
 	}
 
-	dev_info(&st->spi->dev, "%s: probe\n", __func__);
-
 	/* Write the appropriate verification registers values to clear the
 	 * failed memory validation (MV Fault)
 	 */