diff --git a/drivers/pwm/pwm-pio-rp1.c b/drivers/pwm/pwm-pio-rp1.c
index 8ea7f0270c86..5304c7287f3e 100644
--- a/drivers/pwm/pwm-pio-rp1.c
+++ b/drivers/pwm/pwm-pio-rp1.c
@@ -101,15 +101,12 @@ static int pwm_pio_rp1_apply(struct pwm_chip *chip, struct pwm_device *pwm,
 	uint32_t new_duty_cycle;
 	uint32_t new_period;
 
-	if (state->duty_cycle && state->duty_cycle < pwm_pio_resolution)
-		return -EINVAL;
-
-	if (state->duty_cycle != state->period &&
-	    (state->period - state->duty_cycle < pwm_pio_resolution))
-		return -EINVAL;
-
-	new_period = state->period / pwm_pio_resolution;
-	new_duty_cycle = state->duty_cycle / pwm_pio_resolution;
+	new_period = DIV_ROUND_CLOSEST(state->period, pwm_pio_resolution);
+	if (new_period < 2)
+		new_period = 2;
+	new_duty_cycle = DIV_ROUND_CLOSEST(state->duty_cycle, pwm_pio_resolution);
+	if (new_duty_cycle > new_period - 1)
+		new_duty_cycle = new_period - 1;
 
 	mutex_lock(&ppwm->mutex);
 
@@ -145,8 +142,22 @@ static int pwm_pio_rp1_apply(struct pwm_chip *chip, struct pwm_device *pwm,
 	return 0;
 }
 
+static int pwm_pio_rp1_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
+				 struct pwm_state *state)
+{
+	struct pwm_pio_rp1 *ppwm = pwmchip_get_drvdata(chip);
+
+	state->enabled = ppwm->enabled;
+	state->polarity = ppwm->polarity;
+	state->period = ppwm->period * pwm_pio_resolution;
+	state->duty_cycle = ppwm->duty_cycle * pwm_pio_resolution;
+
+	return 0;
+}
+
 static const struct pwm_ops pwm_pio_rp1_ops = {
 	.apply = pwm_pio_rp1_apply,
+	.get_state = pwm_pio_rp1_get_state,
 };
 
 static int pwm_pio_rp1_probe(struct platform_device *pdev)