|
@@ -1050,6 +1050,17 @@ static int ipu_add_client_devices(struct ipu_soc *ipu, unsigned long ipu_base)
|
|
|
for (i = 0; i < ARRAY_SIZE(client_reg); i++) {
|
|
|
const struct ipu_platform_reg *reg = &client_reg[i];
|
|
|
struct platform_device *pdev;
|
|
|
+ struct device_node *of_node;
|
|
|
+
|
|
|
+ /* Associate subdevice with the corresponding port node */
|
|
|
+ of_node = of_graph_get_port_by_id(dev->of_node, i);
|
|
|
+ if (!of_node) {
|
|
|
+ dev_info(dev,
|
|
|
+ "no port@%d node in %s, not using %s%d\n",
|
|
|
+ i, dev->of_node->full_name,
|
|
|
+ (i / 2) ? "DI" : "CSI", i % 2);
|
|
|
+ continue;
|
|
|
+ }
|
|
|
|
|
|
pdev = platform_device_alloc(reg->name, id++);
|
|
|
if (!pdev) {
|
|
@@ -1057,17 +1068,9 @@ 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;
|
|
|
|
|
|
- /* Associate subdevice with the corresponding port node */
|
|
|
- pdev->dev.of_node = of_graph_get_port_by_id(dev->of_node, i);
|
|
|
- if (!pdev->dev.of_node) {
|
|
|
- dev_err(dev, "missing port@%d node in %s\n", i,
|
|
|
- dev->of_node->full_name);
|
|
|
- ret = -ENODEV;
|
|
|
- goto err_register;
|
|
|
- }
|
|
|
-
|
|
|
ret = platform_device_add_data(pdev, ®->pdata,
|
|
|
sizeof(reg->pdata));
|
|
|
if (!ret)
|