Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85f28e98 authored by Sowjanya Komatineni's avatar Sowjanya Komatineni Committed by Sasha Levin
Browse files

gpu: host1x: mipi: Update tegra_mipi_request() to be node based 



[ Upstream commit 767598d447aa46411289c5808b0e45e20a1823b4 ]

Tegra CSI driver need a separate MIPI device for each channel as
calibration of corresponding MIPI pads for each channel should
happen independently.

So, this patch updates tegra_mipi_request() API to add a device_node
pointer argument to allow creating mipi device for specific device
node rather than a device.

Signed-off-by: default avatarSowjanya Komatineni <skomatineni@nvidia.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Stable-dep-of: 830c1ded3563 ("drm/tegra: dsi: Fix some error handling paths in tegra_dsi_probe()")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f05631a8

drivers/gpu/drm/tegra/dsi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1542,7 +1542,7 @@ static int tegra_dsi_probe(struct platform_device *pdev) 
	if (IS_ERR(dsi->regs))

	if (IS_ERR(dsi->regs))

		return PTR_ERR(dsi->regs);

		return PTR_ERR(dsi->regs);





	dsi->mipi = tegra_mipi_request(&pdev->dev);

	dsi->mipi = tegra_mipi_request(&pdev->dev, pdev->dev.of_node);

	if (IS_ERR(dsi->mipi))

	if (IS_ERR(dsi->mipi))

		return PTR_ERR(dsi->mipi);

		return PTR_ERR(dsi->mipi);

drivers/gpu/host1x/mipi.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -206,9 +206,9 @@ static int tegra_mipi_power_down(struct tegra_mipi *mipi) 
	return 0;

	return 0;

}

}





struct tegra_mipi_device *tegra_mipi_request(struct device *device)

struct tegra_mipi_device *tegra_mipi_request(struct device *device,

					     struct device_node *np)

{

{

	struct device_node *np = device->of_node;

	struct tegra_mipi_device *dev;

	struct tegra_mipi_device *dev;

	struct of_phandle_args args;

	struct of_phandle_args args;

	int err;

	int err;

include/linux/host1x.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -314,7 +314,8 @@ int host1x_client_unregister(struct host1x_client *client); 




struct tegra_mipi_device;

struct tegra_mipi_device;





struct tegra_mipi_device *tegra_mipi_request(struct device *device);

struct tegra_mipi_device *tegra_mipi_request(struct device *device,

					     struct device_node *np);

void tegra_mipi_free(struct tegra_mipi_device *device);

void tegra_mipi_free(struct tegra_mipi_device *device);

int tegra_mipi_enable(struct tegra_mipi_device *device);

int tegra_mipi_enable(struct tegra_mipi_device *device);

int tegra_mipi_disable(struct tegra_mipi_device *device);

int tegra_mipi_disable(struct tegra_mipi_device *device);