staging: drm/imx: Use SRC to reset IPU
Request the System Reset Controller to reset the IPU if specified via device tree phandle. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Reviewed-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Marek Vasut <marex@denx.de> Reviewed-by: Pavel Machek <pavel@ucw.cz> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
This commit is contained in:
Родитель
02985b9463
Коммит
6c64155de9
|
@ -8,6 +8,8 @@ Required properties:
|
|||
- interrupts: Should contain sync interrupt and error interrupt,
|
||||
in this order.
|
||||
- #crtc-cells: 1, See below
|
||||
- resets: phandle pointing to the system reset controller and
|
||||
reset line index, see reset/fsl,imx-src.txt for details
|
||||
|
||||
example:
|
||||
|
||||
|
@ -16,6 +18,7 @@ ipu: ipu@18000000 {
|
|||
compatible = "fsl,imx53-ipu";
|
||||
reg = <0x18000000 0x080000000>;
|
||||
interrupts = <11 10>;
|
||||
resets = <&src 2>;
|
||||
};
|
||||
|
||||
Parallel display support
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
#include <linux/export.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/reset.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/err.h>
|
||||
#include <linux/spinlock.h>
|
||||
|
@ -660,7 +661,7 @@ int ipu_idmac_disable_channel(struct ipuv3_channel *channel)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(ipu_idmac_disable_channel);
|
||||
|
||||
static int ipu_reset(struct ipu_soc *ipu)
|
||||
static int ipu_memory_reset(struct ipu_soc *ipu)
|
||||
{
|
||||
unsigned long timeout;
|
||||
|
||||
|
@ -1104,7 +1105,12 @@ static int ipu_probe(struct platform_device *pdev)
|
|||
if (ret)
|
||||
goto out_failed_irq;
|
||||
|
||||
ret = ipu_reset(ipu);
|
||||
ret = device_reset(&pdev->dev);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "failed to reset: %d\n", ret);
|
||||
goto out_failed_reset;
|
||||
}
|
||||
ret = ipu_memory_reset(ipu);
|
||||
if (ret)
|
||||
goto out_failed_reset;
|
||||
|
||||
|
@ -1130,8 +1136,8 @@ static int ipu_probe(struct platform_device *pdev)
|
|||
failed_add_clients:
|
||||
ipu_submodules_exit(ipu);
|
||||
failed_submodules_init:
|
||||
ipu_irq_exit(ipu);
|
||||
out_failed_reset:
|
||||
ipu_irq_exit(ipu);
|
||||
out_failed_irq:
|
||||
clk_disable_unprepare(ipu->clk);
|
||||
failed_clk_get:
|
||||
|
|
Загрузка…
Ссылка в новой задаче