| From foo@baz Mon Sep 17 12:33:31 CEST 2018 |
| From: Philipp Zabel <p.zabel@pengutronix.de> |
| Date: Thu, 21 Jun 2018 21:13:38 +0200 |
| Subject: gpu: ipu-v3: default to id 0 on missing OF alias |
| |
| From: Philipp Zabel <p.zabel@pengutronix.de> |
| |
| [ Upstream commit 2d87e6c1b99c402360fdfe19ce4f579ab2f96adf ] |
| |
| This is better than storing -ENODEV in the id number. This fixes SoCs |
| with only one IPU that don't specify an IPU alias in the device tree. |
| |
| Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/gpu/ipu-v3/ipu-common.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/drivers/gpu/ipu-v3/ipu-common.c |
| +++ b/drivers/gpu/ipu-v3/ipu-common.c |
| @@ -1401,6 +1401,8 @@ static int ipu_probe(struct platform_dev |
| return -ENODEV; |
| |
| ipu->id = of_alias_get_id(np, "ipu"); |
| + if (ipu->id < 0) |
| + ipu->id = 0; |
| |
| if (of_device_is_compatible(np, "fsl,imx6qp-ipu") && |
| IS_ENABLED(CONFIG_DRM)) { |
