diff options
| author | Tom Rini <trini@konsulko.com> | 2024-09-11 19:07:53 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-09-11 19:07:53 -0600 |
| commit | 2857b983f8d0dfcf2d1659d1fd4b1ea24f37c4ec (patch) | |
| tree | b7824d825095d0259d01fe807fa4fb16e45d9a75 /drivers/pwm/pwm-imx.c | |
| parent | 78d898eec080b02059c8dc09318b8761044fea85 (diff) | |
| parent | 5748aa1e372d2db3db6bf3e863f4571bf2ffedb9 (diff) | |
Merge tag 'u-boot-imx-next-20240911' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx into next
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/22320
- Improve i.MX8M boot time by enabling MMU and D-cache very early.
- Don't drop the enable bit once set on the i.MX PWM driver.
- Enable DM_RNG so that the kaslr-seed property is set in the dt
allowing Linux KASLR.
Diffstat (limited to 'drivers/pwm/pwm-imx.c')
| -rw-r--r-- | drivers/pwm/pwm-imx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c index 320ea7c4239..bb37b39fa0e 100644 --- a/drivers/pwm/pwm-imx.c +++ b/drivers/pwm/pwm-imx.c @@ -20,10 +20,11 @@ int pwm_config_internal(struct pwm_regs *pwm, unsigned long period_cycles, u32 cr; writel(0, &pwm->ir); - cr = PWMCR_PRESCALER(prescale) | + + cr = readl(&pwm->cr) & PWMCR_EN; + cr |= PWMCR_PRESCALER(prescale) | PWMCR_DOZEEN | PWMCR_WAITEN | PWMCR_DBGEN | PWMCR_CLKSRC_IPG_HIGH; - writel(cr, &pwm->cr); /* set duty cycles */ writel(duty_cycles, &pwm->sar); |