Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
gpu
/
ipu-v3
/
ipu-common.c
diff --git
a/kernel/drivers/gpu/ipu-v3/ipu-common.c
b/kernel/drivers/gpu/ipu-v3/ipu-common.c
index
a0e28f3
..
5030cba
100644
(file)
--- a/
kernel/drivers/gpu/ipu-v3/ipu-common.c
+++ b/
kernel/drivers/gpu/ipu-v3/ipu-common.c
@@
-997,7
+997,7
@@
struct ipu_platform_reg {
};
/* These must be in the order of the corresponding device tree port nodes */
};
/* These must be in the order of the corresponding device tree port nodes */
-static
const
struct ipu_platform_reg client_reg[] = {
+static struct ipu_platform_reg client_reg[] = {
{
.pdata = {
.csi = 0,
{
.pdata = {
.csi = 0,
@@
-1048,7
+1048,7
@@
static int ipu_add_client_devices(struct ipu_soc *ipu, unsigned long ipu_base)
mutex_unlock(&ipu_client_id_mutex);
for (i = 0; i < ARRAY_SIZE(client_reg); i++) {
mutex_unlock(&ipu_client_id_mutex);
for (i = 0; i < ARRAY_SIZE(client_reg); i++) {
-
const
struct ipu_platform_reg *reg = &client_reg[i];
+ struct ipu_platform_reg *reg = &client_reg[i];
struct platform_device *pdev;
struct device_node *of_node;
struct platform_device *pdev;
struct device_node *of_node;
@@
-1068,9
+1068,9
@@
static int ipu_add_client_devices(struct ipu_soc *ipu, unsigned long ipu_base)
goto err_register;
}
goto err_register;
}
- pdev->dev.of_node = of_node;
pdev->dev.parent = dev;
pdev->dev.parent = dev;
+ reg->pdata.of_node = of_node;
ret = platform_device_add_data(pdev, ®->pdata,
sizeof(reg->pdata));
if (!ret)
ret = platform_device_add_data(pdev, ®->pdata,
sizeof(reg->pdata));
if (!ret)
@@
-1079,6
+1079,12
@@
static int ipu_add_client_devices(struct ipu_soc *ipu, unsigned long ipu_base)
platform_device_put(pdev);
goto err_register;
}
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;
}
return 0;