projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mmc: sdhci: remove the SDHCI_QUIRK_NO_CD
[oweals/u-boot.git]
/
drivers
/
pwm
/
pwm-imx.c
diff --git
a/drivers/pwm/pwm-imx.c
b/drivers/pwm/pwm-imx.c
index 40bf0275437fefbd4deaecd6934e2b4ccb2392aa..3f808f925bbdb0fae683392db85bb81fde8eb0c8 100644
(file)
--- a/
drivers/pwm/pwm-imx.c
+++ b/
drivers/pwm/pwm-imx.c
@@
-2,7
+2,7
@@
* (C) Copyright 2014
* Heiko Schocher, DENX Software Engineering, hs@denx.de.
*
* (C) Copyright 2014
* Heiko Schocher, DENX Software Engineering, hs@denx.de.
*
- * Basic support for the pwm modul on imx6.
+ * Basic support for the pwm modul
e
on imx6.
*
* SPDX-License-Identifier: GPL-2.0+
*/
*
* SPDX-License-Identifier: GPL-2.0+
*/
@@
-18,6
+18,9
@@
int pwm_init(int pwm_id, int div, int invert)
{
struct pwm_regs *pwm = (struct pwm_regs *)pwm_id_to_reg(pwm_id);
{
struct pwm_regs *pwm = (struct pwm_regs *)pwm_id_to_reg(pwm_id);
+ if (!pwm)
+ return -1;
+
writel(0, &pwm->ir);
return 0;
}
writel(0, &pwm->ir);
return 0;
}
@@
-28,6
+31,9
@@
int pwm_config(int pwm_id, int duty_ns, int period_ns)
unsigned long period_cycles, duty_cycles, prescale;
u32 cr;
unsigned long period_cycles, duty_cycles, prescale;
u32 cr;
+ if (!pwm)
+ return -1;
+
pwm_imx_get_parms(period_ns, duty_ns, &period_cycles, &duty_cycles,
&prescale);
pwm_imx_get_parms(period_ns, duty_ns, &period_cycles, &duty_cycles,
&prescale);
@@
-47,6
+53,9
@@
int pwm_enable(int pwm_id)
{
struct pwm_regs *pwm = (struct pwm_regs *)pwm_id_to_reg(pwm_id);
{
struct pwm_regs *pwm = (struct pwm_regs *)pwm_id_to_reg(pwm_id);
+ if (!pwm)
+ return -1;
+
setbits_le32(&pwm->cr, PWMCR_EN);
return 0;
}
setbits_le32(&pwm->cr, PWMCR_EN);
return 0;
}
@@
-55,5
+64,8
@@
void pwm_disable(int pwm_id)
{
struct pwm_regs *pwm = (struct pwm_regs *)pwm_id_to_reg(pwm_id);
{
struct pwm_regs *pwm = (struct pwm_regs *)pwm_id_to_reg(pwm_id);
+ if (!pwm)
+ return;
+
clrbits_le32(&pwm->cr, PWMCR_EN);
}
clrbits_le32(&pwm->cr, PWMCR_EN);
}