diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-12 07:40:52 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-12 07:40:52 +0200 |
| commit | bbf4dc18e80ea0592cf7a6c6fe78c78b83ee9478 (patch) | |
| tree | 144dc0e704208232bafb7f967b4c659fda569a0b /0001-gpu-ipu-v3-Fix-imx-ipuv3-crtc-module-autoloading.patch | |
| parent | ccf4768e4692813db62c18b884c791b842fc82ed (diff) | |
| parent | 8cbd263769db321c097cbbff1e6c234febf016d9 (diff) | |
| download | kernel-4.5.4-300.vanilla.knurd.1.fc24.tar.gz kernel-4.5.4-300.vanilla.knurd.1.fc24.tar.xz kernel-4.5.4-300.vanilla.knurd.1.fc24.zip | |
Merge remote-tracking branch 'origin/f24' into f24-user-thl-vanilla-fedorakernel-4.5.4-300.vanilla.knurd.1.fc24
Diffstat (limited to '0001-gpu-ipu-v3-Fix-imx-ipuv3-crtc-module-autoloading.patch')
| -rw-r--r-- | 0001-gpu-ipu-v3-Fix-imx-ipuv3-crtc-module-autoloading.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/0001-gpu-ipu-v3-Fix-imx-ipuv3-crtc-module-autoloading.patch b/0001-gpu-ipu-v3-Fix-imx-ipuv3-crtc-module-autoloading.patch deleted file mode 100644 index d26c5d52d..000000000 --- a/0001-gpu-ipu-v3-Fix-imx-ipuv3-crtc-module-autoloading.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 88fd0f33c3cc5aa6a26f56902241941ac717e9f8 Mon Sep 17 00:00:00 2001 -From: Peter Robinson <pbrobinson@gmail.com> -Date: Wed, 27 Apr 2016 13:44:05 +0100 -Subject: [PATCH] gpu: ipu-v3: Fix imx-ipuv3-crtc module autoloading - ---- - drivers/gpu/ipu-v3/ipu-common.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c -index e00db3f..abb98c7 100644 ---- a/drivers/gpu/ipu-v3/ipu-common.c -+++ b/drivers/gpu/ipu-v3/ipu-common.c -@@ -1068,7 +1068,6 @@ static int ipu_add_client_devices(struct ipu_soc *ipu, unsigned long ipu_base) - goto err_register; - } - -- pdev->dev.of_node = of_node; - pdev->dev.parent = dev; - - ret = platform_device_add_data(pdev, ®->pdata, -@@ -1079,6 +1078,12 @@ 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; --- -2.7.4 - |