Unverified Commit 8129d25e authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Arnd Bergmann
Browse files

bus: ts-nbus: Convert to atomic pwm API 



With this change the PWM hardware is only configured once (instead of
three times).

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent f0379bd1

drivers/bus/ts-nbus.c

+7 −10
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ EXPORT_SYMBOL_GPL(ts_nbus_write); 
static int ts_nbus_probe(struct platform_device *pdev)

{

	struct pwm_device *pwm;

	struct pwm_args pargs;

	struct pwm_state state;

	struct device *dev = &pdev->dev;

	struct ts_nbus *ts_nbus;

	int ret;
@@ -296,25 +296,22 @@ static int ts_nbus_probe(struct platform_device *pdev) 
		return ret;

	}



	pwm_get_args(pwm, &pargs);

	if (!pargs.period) {

	pwm_init_state(pwm, &state);

	if (!state.period) {

		dev_err(&pdev->dev, "invalid PWM period\n");

		return -EINVAL;

	}



	/*

	 * FIXME: pwm_apply_args() should be removed when switching to

	 * the atomic PWM API.

	 */

	pwm_apply_args(pwm);

	ret = pwm_config(pwm, pargs.period, pargs.period);

	state.duty_cycle = state.period;

	state.enabled = true;



	ret = pwm_apply_state(pwm, &state);

	if (ret < 0)

		return ret;



	/*

	 * we can now start the FPGA and populate the peripherals.

	 */

	pwm_enable(pwm);

	ts_nbus->pwm = pwm;



	/*