diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-05-25 04:36:20 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-05-25 04:36:20 +0200 |
| commit | e411295e3ec0b470795a860ec3cc51edf64407c4 (patch) | |
| tree | 4b11ca203f8a64205eff9559255431abae97a707 /include/video | |
| parent | headers_check: don't warn about c++ guards (diff) | |
| parent | drm/imx: Match imx-ipuv3-crtc components using device node in platform data (diff) | |
| download | linux-e411295e3ec0b470795a860ec3cc51edf64407c4.tar.xz linux-e411295e3ec0b470795a860ec3cc51edf64407c4.zip | |
Merge tag 'imx-drm-fixes-2016-05-24' of git://git.pengutronix.de/git/pza/linux into drm-next
imx-drm probing fix
Commit 950b410dd1ab ("gpu: ipu-v3: Fix imx-ipuv3-crtc module autoloading")
broke probing of the imx-drm driver in the non-modular case because the
unset dev->of_node during probing of imx-ipuv3-crtc would cause the
component matching to fail. This patch patch instead matches against
an of_node pointer stored in platform data, allowing dev->of_node to
be left unset for the platform probed imx-ipuv3-crtc devices.
* tag 'imx-drm-fixes-2016-05-24' of git://git.pengutronix.de/git/pza/linux:
drm/imx: Match imx-ipuv3-crtc components using device node in platform data
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/imx-ipu-v3.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/video/imx-ipu-v3.h b/include/video/imx-ipu-v3.h index ad66589f2ae6..3a2a79401789 100644 --- a/include/video/imx-ipu-v3.h +++ b/include/video/imx-ipu-v3.h @@ -16,6 +16,7 @@ #include <linux/videodev2.h> #include <linux/bitmap.h> #include <linux/fb.h> +#include <linux/of.h> #include <media/v4l2-mediabus.h> #include <video/videomode.h> @@ -345,6 +346,7 @@ struct ipu_client_platformdata { int dc; int dp; int dma[2]; + struct device_node *of_node; }; #endif /* __DRM_IPU_H__ */ |