diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-24 08:42:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-24 08:42:06 -0400 |
| commit | 7208396bbf1df1c7a85d263b7ff054e6b45d8240 (patch) | |
| tree | 41b20866e0a94e34ca76e54a2745ca7a5ba0889b /drivers/pwm | |
| parent | 5d3a21df6694ebd66d5c34c9d62a26edc7456fc7 (diff) | |
| download | u-boot-7208396bbf1df1c7a85d263b7ff054e6b45d8240.tar.gz | |
Revert "Merge tag 'dm-pull-20jul20' of git://git.denx.de/u-boot-dm"
This reverts commit 5d3a21df6694ebd66d5c34c9d62a26edc7456fc7, reversing
changes made to 56d37f1c564107e27d873181d838571b7d7860e7.
Unfortunately this is causing CI failures:
https://travis-ci.org/github/trini/u-boot/jobs/711313649
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/pwm')
| -rw-r--r-- | drivers/pwm/exynos_pwm.c | 2 | ||||
| -rw-r--r-- | drivers/pwm/pwm-imx.c | 2 | ||||
| -rw-r--r-- | drivers/pwm/pwm-mtk.c | 2 | ||||
| -rw-r--r-- | drivers/pwm/sunxi_pwm.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pwm/exynos_pwm.c b/drivers/pwm/exynos_pwm.c index e55fcceafd..fed1583796 100644 --- a/drivers/pwm/exynos_pwm.c +++ b/drivers/pwm/exynos_pwm.c @@ -92,7 +92,7 @@ static int exynos_pwm_ofdata_to_platdata(struct udevice *dev) { struct exynos_pwm_priv *priv = dev_get_priv(dev); - priv->regs = dev_read_addr_ptr(dev); + priv->regs = (struct s5p_timer *)devfdt_get_addr(dev); return 0; } diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c index 77a1907fd3..f5b9544cb8 100644 --- a/drivers/pwm/pwm-imx.c +++ b/drivers/pwm/pwm-imx.c @@ -130,7 +130,7 @@ static int imx_pwm_ofdata_to_platdata(struct udevice *dev) { struct imx_pwm_priv *priv = dev_get_priv(dev); - priv->regs = dev_read_addr_ptr(dev); + priv->regs = (struct pwm_regs *)devfdt_get_addr(dev); return 0; } diff --git a/drivers/pwm/pwm-mtk.c b/drivers/pwm/pwm-mtk.c index 7bd82518d6..97ed477025 100644 --- a/drivers/pwm/pwm-mtk.c +++ b/drivers/pwm/pwm-mtk.c @@ -130,7 +130,7 @@ static int mtk_pwm_probe(struct udevice *dev) int i; priv->soc = (struct mtk_pwm_soc *)dev_get_driver_data(dev); - priv->base = dev_read_addr_ptr(dev); + priv->base = (void __iomem *)devfdt_get_addr(dev); if (!priv->base) return -EINVAL; ret = clk_get_by_name(dev, "top", &priv->top_clk); diff --git a/drivers/pwm/sunxi_pwm.c b/drivers/pwm/sunxi_pwm.c index e2ae1a8009..56215dbf6c 100644 --- a/drivers/pwm/sunxi_pwm.c +++ b/drivers/pwm/sunxi_pwm.c @@ -152,7 +152,7 @@ static int sunxi_pwm_ofdata_to_platdata(struct udevice *dev) { struct sunxi_pwm_priv *priv = dev_get_priv(dev); - priv->regs = dev_read_addr_ptr(dev); + priv->regs = (struct sunxi_pwm *)devfdt_get_addr(dev); return 0; } |