Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'pwm/for-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux
Pull pwm updates from Uwe Kleine-König:
"Just two minor fixes, a device tree binding addition to support a few
more SoCs (without the need for driver adaptions), a driver include
cleanup and the addition of the #linux-pwm irc channel to MAINTAINERS"
* tag 'pwm/for-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux:
pwm: th1520: fix `CLIPPY=1` warning
pwm: jz4740: Drop unused include
MAINTAINERS: Add #linux-pwm irc channel to pwm entry
dt-bindings: pwm: amlogic: Document A4 A5 and T7 PWM
pwm: imx-tpm: Count the number of enabled channels in probe
+13
-6
+3
Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml
+3
Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml
+1
MAINTAINERS
+1
MAINTAINERS
···
21450
21450
L: linux-pwm@vger.kernel.org
21451
21451
S: Maintained
21452
21452
Q: https://patchwork.ozlabs.org/project/linux-pwm/list/
21453
+
C: irc://irc.libera.chat/linux-pwm
21453
21454
T: git https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git
21454
21455
F: Documentation/devicetree/bindings/pwm/
21455
21456
F: Documentation/driver-api/pwm.rst
+8
-1
drivers/pwm/pwm-imx-tpm.c
+8
-1
drivers/pwm/pwm-imx-tpm.c
···
352
352
struct clk *clk;
353
353
void __iomem *base;
354
354
int ret;
355
-
unsigned int npwm;
355
+
unsigned int i, npwm;
356
356
u32 val;
357
357
358
358
base = devm_platform_ioremap_resource(pdev, 0);
···
381
381
chip->ops = &imx_tpm_pwm_ops;
382
382
383
383
mutex_init(&tpm->lock);
384
+
385
+
/* count the enabled channels */
386
+
for (i = 0; i < npwm; ++i) {
387
+
val = readl(base + PWM_IMX_TPM_CnSC(i));
388
+
if (FIELD_GET(PWM_IMX_TPM_CnSC_ELS, val))
389
+
++tpm->enable_count;
390
+
}
384
391
385
392
ret = devm_pwmchip_add(&pdev->dev, chip);
386
393
if (ret)
-1
drivers/pwm/pwm-jz4740.c
-1
drivers/pwm/pwm-jz4740.c
+1
-4
drivers/pwm/pwm_th1520.rs
+1
-4
drivers/pwm/pwm_th1520.rs
···
64
64
fn ns_to_cycles(ns: u64, rate_hz: u64) -> u64 {
65
65
const NSEC_PER_SEC_U64: u64 = time::NSEC_PER_SEC as u64;
66
66
67
-
(match ns.checked_mul(rate_hz) {
68
-
Some(product) => product,
69
-
None => u64::MAX,
70
-
}) / NSEC_PER_SEC_U64
67
+
ns.saturating_mul(rate_hz) / NSEC_PER_SEC_U64
71
68
}
72
69
73
70
fn cycles_to_ns(cycles: u64, rate_hz: u64) -> u64 {