diff options
| -rw-r--r-- | drivers/media/platform/soc_camera/tegra_camera/common.c | 12 | ||||
| -rw-r--r-- | drivers/media/platform/soc_camera/tegra_camera/vi2.c | 17 |
2 files changed, 20 insertions, 9 deletions
diff --git a/drivers/media/platform/soc_camera/tegra_camera/common.c b/drivers/media/platform/soc_camera/tegra_camera/common.c index 2db4627c07a8..9f1e23343e17 100644 --- a/drivers/media/platform/soc_camera/tegra_camera/common.c +++ b/drivers/media/platform/soc_camera/tegra_camera/common.c @@ -821,7 +821,7 @@ static int tegra_camera_probe(struct platform_device *pdev) cam->ici.priv = cam; cam->ici.v4l2_dev.dev = &pdev->dev; - cam->ici.nr = pdev->id; + cam->ici.nr = pdev->dev.id; cam->ici.drv_name = dev_name(&pdev->dev); cam->ici.ops = &tegra_soc_camera_host_ops; @@ -871,6 +871,14 @@ static int tegra_camera_probe(struct platform_device *pdev) goto exit_deinit_clk; } + cam->reg_base = ndata->aperture[0]; + if (!cam->reg_base) { + dev_err(&pdev->dev, "%s: failed to map register base\n", + __func__); + err = -ENXIO; + goto exit_deinit_clk; + } + err = nvhost_client_device_init(pdev); if (err) { dev_err(&pdev->dev, "%s: nvhost init failed %d\n", @@ -878,8 +886,6 @@ static int tegra_camera_probe(struct platform_device *pdev) goto exit_deinit_clk; } - cam->reg_base = ndata->aperture[0]; - tegra_pd_add_device(&pdev->dev); pm_runtime_use_autosuspend(&pdev->dev); pm_runtime_set_autosuspend_delay(&pdev->dev, ndata->clockgate_delay); diff --git a/drivers/media/platform/soc_camera/tegra_camera/vi2.c b/drivers/media/platform/soc_camera/tegra_camera/vi2.c index 754a4bef9a71..f58c03bff8a5 100644 --- a/drivers/media/platform/soc_camera/tegra_camera/vi2.c +++ b/drivers/media/platform/soc_camera/tegra_camera/vi2.c @@ -330,14 +330,19 @@ static int vi2_clks_init(struct tegra_camera_dev *cam) { struct platform_device *pdev = cam->ndev; char devname[MAX_DEVID_LENGTH]; + const char *pdev_name; struct tegra_camera_clk *clks; - int i; + int i, dev_id, ret; - snprintf(devname, MAX_DEVID_LENGTH, - (pdev->id <= 0) ? "tegra_%s" : "tegra_%s.%d", - pdev->name, pdev->id); + pdev_name = dev_name(&pdev->dev); + ret = sscanf(pdev_name, "vi.%1d", &dev_id); + if (ret != 1) { + dev_err(&pdev->dev, "Read dev_id failed!\n"); + return -ENODEV; + } + snprintf(devname, MAX_DEVID_LENGTH, "tegra_%s", pdev_name); - switch (pdev->id) { + switch (dev_id) { case 0: cam->num_clks = ARRAY_SIZE(vi2_clks0); cam->clks = vi2_clks0; @@ -347,7 +352,7 @@ static int vi2_clks_init(struct tegra_camera_dev *cam) cam->clks = vi2_clks1; break; default: - dev_err(&pdev->dev, "Wrong device ID %d\n", pdev->id); + dev_err(&pdev->dev, "Wrong device ID %d\n", dev_id); return -ENODEV; } |