leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: drm/imx: Use SRC to reset IPU

Browse Source 
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:
Philipp Zabel 2013-03-28 17:35:21 +01:00 committed by Shawn Guo
parent 02985b9463
commit 6c64155de9
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt
View File

@ -8,6 +8,8 @@ Required properties:
- interrupts: Should contain sync interrupt and error interrupt, - interrupts: Should contain sync interrupt and error interrupt,
in this order. in this order.
- #crtc-cells: 1, See below - #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: example:
@ -16,6 +18,7 @@ ipu: ipu@18000000 {
compatible = "fsl,imx53-ipu"; compatible = "fsl,imx53-ipu";
reg = <0x18000000 0x080000000>; reg = <0x18000000 0x080000000>;
interrupts = <11 10>; interrupts = <11 10>;
resets = <&src 2>;
}; };
Parallel display support Parallel display support

12
drivers/staging/imx-drm/ipu-v3/ipu-common.c
View File

@ -16,6 +16,7 @@
#include <linux/export.h> #include <linux/export.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/reset.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/spinlock.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); 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; unsigned long timeout;
@ -1104,7 +1105,12 @@ static int ipu_probe(struct platform_device *pdev)
if (ret) if (ret)
goto out_failed_irq; 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) if (ret)
goto out_failed_reset; goto out_failed_reset;
@ -1130,8 +1136,8 @@ static int ipu_probe(struct platform_device *pdev)
failed_add_clients: failed_add_clients:
ipu_submodules_exit(ipu); ipu_submodules_exit(ipu);
failed_submodules_init: failed_submodules_init:
ipu_irq_exit(ipu);
out_failed_reset: out_failed_reset:
ipu_irq_exit(ipu);
out_failed_irq: out_failed_irq:
clk_disable_unprepare(ipu->clk); clk_disable_unprepare(ipu->clk);
failed_clk_get: failed_clk_get: