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

Commit 36d07e3a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-3.17-rc2-sti-fixes' of... 

Merge branch 'drm-3.17-rc2-sti-fixes' of git://git.linaro.org/people/benjamin.gaignard/kernel into drm-fixes

I have tested the 6 patches send on mailing list since you merge the sti driver.
I haven't seen issue with those patches except for the missing
dependency on Kconfig
where I have change "depends on" to "select".

* 'drm-3.17-rc2-sti-fixes' of git://git.linaro.org/people/benjamin.gaignard/kernel:
  drm: sti: Add missing dependency on RESET_CONTROLLER
  drm: sti: Make of_device_id array const
  drm: sti: Fix return value check in sti_drm_platform_probe()
  drm: sti: hda: fix return value check in sti_hda_probe()
  drm: sti: hdmi: fix return value check in sti_hdmi_probe()
  drm: sti: tvout: fix return value check in sti_tvout_probe()
parents 5fa9be63 f5ec6c4b

drivers/gpu/drm/sti/Kconfig

+1 −0
Original line number Diff line number Diff line 
config DRM_STI

	tristate "DRM Support for STMicroelectronics SoC stiH41x Series"

	depends on DRM && (SOC_STIH415 || SOC_STIH416 || ARCH_MULTIPLATFORM)

	select RESET_CONTROLLER

	select DRM_KMS_HELPER

	select DRM_GEM_CMA_HELPER

	select DRM_KMS_CMA_HELPER

drivers/gpu/drm/sti/sti_drm_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -201,8 +201,8 @@ static int sti_drm_platform_probe(struct platform_device *pdev) 
	master = platform_device_register_resndata(dev,

			DRIVER_NAME "__master", -1,

			NULL, 0, NULL, 0);

	if (!master)

		return -EINVAL;

	if (IS_ERR(master))

               return PTR_ERR(master);



	platform_set_drvdata(pdev, master);

	return 0;

drivers/gpu/drm/sti/sti_hda.c

+5 −5
Original line number Diff line number Diff line
@@ -730,16 +730,16 @@ static int sti_hda_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}

	hda->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));

	if (IS_ERR(hda->regs))

		return PTR_ERR(hda->regs);

	if (!hda->regs)

		return -ENOMEM;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

			"video-dacs-ctrl");

	if (res) {

		hda->video_dacs_ctrl = devm_ioremap_nocache(dev, res->start,

				resource_size(res));

		if (IS_ERR(hda->video_dacs_ctrl))

			return PTR_ERR(hda->video_dacs_ctrl);

		if (!hda->video_dacs_ctrl)

			return -ENOMEM;

	} else {

		/* If no existing video-dacs-ctrl resource continue the probe */

		DRM_DEBUG_DRIVER("No video-dacs-ctrl resource\n");
@@ -770,7 +770,7 @@ static int sti_hda_remove(struct platform_device *pdev) 
	return 0;

}



static struct of_device_id hda_of_match[] = {

static const struct of_device_id hda_of_match[] = {

	{ .compatible = "st,stih416-hda", },

	{ .compatible = "st,stih407-hda", },

	{ /* end node */ }

drivers/gpu/drm/sti/sti_hdmi.c

+5 −5
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ static const struct component_ops sti_hdmi_ops = { 
	.unbind = sti_hdmi_unbind,

};



static struct of_device_id hdmi_of_match[] = {

static const struct of_device_id hdmi_of_match[] = {

	{

		.compatible = "st,stih416-hdmi",

		.data = &tx3g0c55phy_ops,
@@ -713,8 +713,8 @@ static int sti_hdmi_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}

	hdmi->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));

	if (IS_ERR(hdmi->regs))

		return PTR_ERR(hdmi->regs);

	if (!hdmi->regs)

		return -ENOMEM;



	if (of_device_is_compatible(np, "st,stih416-hdmi")) {

		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
@@ -725,8 +725,8 @@ static int sti_hdmi_probe(struct platform_device *pdev) 
		}

		hdmi->syscfg = devm_ioremap_nocache(dev, res->start,

						    resource_size(res));

		if (IS_ERR(hdmi->syscfg))

			return PTR_ERR(hdmi->syscfg);

		if (!hdmi->syscfg)

			return -ENOMEM;



	}

drivers/gpu/drm/sti/sti_tvout.c

+3 −3
Original line number Diff line number Diff line
@@ -591,8 +591,8 @@ static int sti_tvout_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}

	tvout->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));

	if (IS_ERR(tvout->regs))

		return PTR_ERR(tvout->regs);

	if (!tvout->regs)

		return -ENOMEM;



	/* get reset resources */

	tvout->reset = devm_reset_control_get(dev, "tvout");
@@ -624,7 +624,7 @@ static int sti_tvout_remove(struct platform_device *pdev) 
	return 0;

}



static struct of_device_id tvout_of_match[] = {

static const struct of_device_id tvout_of_match[] = {

	{ .compatible = "st,stih416-tvout", },

	{ .compatible = "st,stih407-tvout", },

	{ /* end node */ }