From: Uwe Kleine-König Date: Mon, 10 May 2021 14:06:39 +0000 (+0200) Subject: pwm: Autodetect default value for of_pwm_n_cells from device tree X-Git-Tag: v5.14-rc1~42^2~47 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=69230cfac3d02c1b8d78aa7bdb29a1710147d49b;p=thirdparty%2Flinux.git pwm: Autodetect default value for of_pwm_n_cells from device tree This allows to simplify all drivers that use three pwm-cells. The only ugly side effect is that if a driver specified of_pwm_n_cells = 2 it suddenly supports device trees that use #pwm-cells = <3>. This however isn't a bad thing because the driver doesn't need explicit support for three cells as the core handles all the details. Also there is no such in-tree driver. Signed-off-by: Uwe Kleine-König Signed-off-by: Thierry Reding --- diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index 821ee19598166..c165c5822703e 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -158,8 +158,14 @@ static void of_pwmchip_add(struct pwm_chip *chip) return; if (!chip->of_xlate) { + u32 pwm_cells; + + if (of_property_read_u32(chip->dev->of_node, "#pwm-cells", + &pwm_cells)) + pwm_cells = 2; + chip->of_xlate = of_pwm_xlate_with_flags; - chip->of_pwm_n_cells = 2; + chip->of_pwm_n_cells = pwm_cells; } of_node_get(chip->dev->of_node);