iio: adc: ad4630: update to use pwm waveforms API

Signed-off-by: Trevor Gamblin <[email protected]>
analogdevicesinc · Nov 14, 2024 · 928f828 · 928f828
1 parent f9d67d2
commit 928f828
Showing 1 changed file with 24 additions and 28 deletions.
diff --git a/drivers/iio/adc/ad4630.c b/drivers/iio/adc/ad4630.c
@@ -258,10 +258,10 @@ static int ad4630_reg_access(struct iio_dev *indio_dev, unsigned int reg,
 
 static void ad4630_get_sampling_freq(const struct ad4630_state *st, int *freq)
 {
-	struct pwm_state conversion_state;
+	struct pwm_waveform conversion_wf;
 
-	pwm_get_state(st->conv_trigger, &conversion_state);
-	*freq = DIV_ROUND_CLOSEST_ULL(NANO, conversion_state.period);
+	pwm_get_waveform_might_sleep(st->conv_trigger, &conversion_wf);
+	*freq = DIV_ROUND_CLOSEST_ULL(NANO, conversion_wf.period_length_ns);
 }
 
 static int ad4630_get_chan_gain(struct iio_dev *indio_dev, int ch, int *val)
@@ -372,24 +372,22 @@ static int ad4630_read_avail(struct iio_dev *indio_dev,
 
 static int __ad4630_set_sampling_freq(const struct ad4630_state *st, unsigned int freq)
 {
-	struct pwm_state conv_state = {
-		.duty_cycle = 10,
-		.enabled = true,
-	}, fetch_state = {
-		.duty_cycle = 10,
-		.enabled = true,
+	struct pwm_waveform conv_wf = {
+		.duty_length_ns = 10,
+	}, fetch_wf = {
+		.duty_length_ns = 10,
 	};
 	int ret;
 
-	conv_state.period = DIV_ROUND_CLOSEST(NSEC_PER_SEC, freq);
-	ret = pwm_apply_might_sleep(st->conv_trigger, &conv_state);
+	conv_wf.period_length_ns = DIV_ROUND_CLOSEST(NSEC_PER_SEC, freq);
+	ret = pwm_round_waveform_might_sleep(st->conv_trigger, &conv_wf);
 	if (ret)
 		return ret;
 
 	if (!st->fetch_trigger)
 		return 0;
 
-	fetch_state.period = conv_state.period;
+	fetch_wf.period_length_ns = conv_wf.period_length_ns;
 
 	if (st->out_data == AD4630_30_AVERAGED_DIFF) {
 		u32 avg;
@@ -398,7 +396,7 @@ static int __ad4630_set_sampling_freq(const struct ad4630_state *st, unsigned in
 		if (ret)
 			return ret;
 
-		fetch_state.period <<= FIELD_GET(AD4630_AVG_AVG_VAL, avg);
+		fetch_wf.period_length_ns <<= FIELD_GET(AD4630_AVG_AVG_VAL, avg);
 	}
 
 	/*
@@ -407,9 +405,9 @@ static int __ad4630_set_sampling_freq(const struct ad4630_state *st, unsigned in
 	 * tsync + tquiet_con_delay being tsync the conversion signal period
 	 * and tquiet_con_delay 9.8ns. Hence set the PWM phase accordingly.
 	 */
-	fetch_state.phase = AD4630_TQUIET_CNV_DELAY_PS;
+	fetch_wf.duty_offset_ns = AD4630_TQUIET_CNV_DELAY_PS;
 
-	return pwm_apply_might_sleep(st->fetch_trigger, &fetch_state);
+	return pwm_round_waveform_might_sleep(st->fetch_trigger, &fetch_wf);
 }
 
 static int ad4630_set_sampling_freq(struct iio_dev *indio_dev, unsigned int freq)
@@ -592,17 +590,17 @@ static int ad4630_write_raw(struct iio_dev *indio_dev,
 
 static int ad4630_update_sample_fetch_trigger(const struct ad4630_state *st, u32 avg)
 {
-	struct pwm_state fetch_state, conv_state;
+	struct pwm_waveform fetch_wf = { }, conv_wf = { };
 
 	if (!st->fetch_trigger)
 		return 0;
 
-	pwm_get_state(st->conv_trigger, &conv_state);
-	pwm_get_state(st->fetch_trigger, &fetch_state);
-	fetch_state.period = conv_state.period * 1 << avg;
-	fetch_state.phase = AD4630_TQUIET_CNV_DELAY_PS;
+	pwm_get_waveform_might_sleep(st->conv_trigger, &conv_wf);
+	pwm_get_waveform_might_sleep(st->fetch_trigger, &fetch_wf);
+	fetch_wf.period_length_ns = conv_wf.period_length_ns * 1 << avg;
+	fetch_wf.duty_offset_ns = AD4630_TQUIET_CNV_DELAY_PS;
 
-	return pwm_apply_might_sleep(st->fetch_trigger, &fetch_state);
+	return pwm_round_waveform_might_sleep(st->fetch_trigger, &fetch_wf);
 }
 
 static int ad4630_set_avg_frame_len(struct iio_dev *dev,
@@ -648,21 +646,19 @@ static int ad4630_get_avg_frame_len(struct iio_dev *dev,
 
 static int ad4630_sampling_enable(const struct ad4630_state *st, bool enable)
 {
-	struct pwm_state conv_state, fetch_state;
+	struct pwm_waveform conv_wf = { }, fetch_wf = { };
 	int ret;
 
-	pwm_get_state(st->conv_trigger, &conv_state);
-	conv_state.enabled = enable;
+	pwm_get_waveform_might_sleep(st->conv_trigger, &conv_wf);
 
-	ret = pwm_apply_might_sleep(st->conv_trigger, &conv_state);
+	ret = pwm_round_waveform_might_sleep(st->conv_trigger, &conv_wf);
 	if (ret)
 		return ret;
 	if (!st->fetch_trigger)
 		return 0;
 
-	pwm_get_state(st->fetch_trigger, &fetch_state);
-	fetch_state.enabled = enable;
-	return pwm_apply_might_sleep(st->fetch_trigger, &fetch_state);
+	pwm_get_waveform_might_sleep(st->fetch_trigger, &fetch_wf);
+	return pwm_round_waveform_might_sleep(st->fetch_trigger, &fetch_wf);
 }
 
 static int ad4630_spi_transfer_update(struct ad4630_state *st)