diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-02-23 12:10:42 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-02-23 12:10:42 +1000 |
| commit | 43f86c9470b8a4c2c26ae678843465aac3831145 (patch) | |
| tree | 6737fdb70dd6d7c27d80a18d37533749d9c178fb /drivers/gpu/ipu-v3/ipu-common.c | |
| parent | 94000cc32988a0674923309d35ab9c2405c4b39b (diff) | |
| parent | 0e47b0275bdb40a9dab7a86535b1fcd85d874007 (diff) | |
| download | op-kernel-dev-43f86c9470b8a4c2c26ae678843465aac3831145.zip op-kernel-dev-43f86c9470b8a4c2c26ae678843465aac3831145.tar.gz | |
Merge tag 'imx-drm-fixes-2017-02-17' of https://git.pengutronix.de/git/pza/linux into drm-next
imx-drm: TVE regulator, fb size limit, and ipu-v3 module fixes
- Fix i.MX5 TV encoder probing in case no dac-supply regulator
is set in the device tree.
- Remove 64 pixel min_width/height limit, which unnecessarily
prohibits creation of small frame buffers.
- Add missing ipu_csi_set_downsize export, for media drivers
built as modules.
- Stop modifying pdev->dev.of_node for IPU client devices that
do not have an OF modalias to fix module autoloading.
* tag 'imx-drm-fixes-2017-02-17' of https://git.pengutronix.de/git/pza/linux:
gpu: ipu-v3: Stop overwriting pdev->dev.of_node of child devices
gpu: ipu-v3: export ipu_csi_set_downsize
drm/imx: lift 64x64 pixel minimum framebuffer size requirement
drm/imx: imx-tve: Do not set the regulator voltage
Diffstat (limited to 'drivers/gpu/ipu-v3/ipu-common.c')
| -rw-r--r-- | drivers/gpu/ipu-v3/ipu-common.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c index 97218af..8368e6f 100644 --- a/drivers/gpu/ipu-v3/ipu-common.c +++ b/drivers/gpu/ipu-v3/ipu-common.c @@ -1238,12 +1238,6 @@ static int ipu_add_client_devices(struct ipu_soc *ipu, unsigned long ipu_base) platform_device_put(pdev); goto err_register; } - - /* - * Set of_node only after calling platform_device_add. Otherwise - * the platform:imx-ipuv3-crtc modalias won't be used. - */ - pdev->dev.of_node = of_node; } return 0; |
