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

Commit 53bdcf5f authored by Benjamin Gaignard's avatar Benjamin Gaignard
Browse files

drm: sti: fix sub-components bind 



Fix misunderstanding in how use component framework.
drm_platform_init() is now call only when all the
sub-components are register themselves instead of the
previous broken two stages mechanism.

Update bindings documentation.

Signed-off-by: default avatarBenjamin Gaignard <benjamin.gaignard@linaro.org>
parent dcd14dd9

Documentation/devicetree/bindings/gpu/st,stih4xx.txt

+35 −37
Original line number Diff line number Diff line
@@ -52,10 +52,9 @@ STMicroelectronics stih4xx platforms 
    See ../reset/reset.txt for details.

  - reset-names: names of the resets listed in resets property in the same

    order.

  - ranges: to allow probing of subdevices



- sti-hdmi: hdmi output block

  must be a child of sti-tvout

  must be a child of sti-display-subsystem

  Required properties:

  - compatible: "st,stih<chip>-hdmi";

  - reg: Physical base address of the IP registers and length of memory mapped region.
@@ -72,7 +71,7 @@ STMicroelectronics stih4xx platforms 


sti-hda:

  Required properties:

  must be a child of sti-tvout

  must be a child of sti-display-subsystem

  - compatible: "st,stih<chip>-hda"

  - reg: Physical base address of the IP registers and length of memory mapped region.

  - reg-names: names of the mapped memory regions listed in regs property in
@@ -85,7 +84,7 @@ sti-hda: 


sti-dvo:

  Required properties:

  must be a child of sti-tvout

  must be a child of sti-display-subsystem

  - compatible: "st,stih<chip>-dvo"

  - reg: Physical base address of the IP registers and length of memory mapped region.

  - reg-names: names of the mapped memory regions listed in regs property in
@@ -195,7 +194,7 @@ Example: 
			reg-names	= "tvout-reg", "hda-reg", "syscfg";

			reset-names     = "tvout";

			resets          = <&softreset STIH416_HDTVOUT_SOFTRESET>;

			ranges;

		};



		sti-hdmi@fe85c000 {

			compatible	= "st,stih416-hdmi";
@@ -227,7 +226,6 @@ Example: 
			pinctrl-0	= <&pinctrl_dvo>;

			sti,panel	= <&panel_dvo>;

		};

		};



		sti-hqvdp@9c000000 {

				compatible	= "st,stih407-hqvdp";

drivers/gpu/drm/sti/sti_drm_drv.c

+6 −39
Original line number Diff line number Diff line
@@ -242,15 +242,17 @@ static const struct component_master_ops sti_drm_ops = { 
	.unbind = sti_drm_unbind,

};



static int sti_drm_master_probe(struct platform_device *pdev)

static int sti_drm_platform_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct device_node *node = dev->parent->of_node;

	struct device_node *node = dev->of_node;

	struct device_node *child_np;

	struct component_match *match = NULL;



	dma_set_coherent_mask(dev, DMA_BIT_MASK(32));



	of_platform_populate(node, NULL, NULL, dev);



	child_np = of_get_next_available_child(node, NULL);



	while (child_np) {
@@ -262,46 +264,11 @@ static int sti_drm_master_probe(struct platform_device *pdev) 
	return component_master_add_with_match(dev, &sti_drm_ops, match);

}



static int sti_drm_master_remove(struct platform_device *pdev)

{

	component_master_del(&pdev->dev, &sti_drm_ops);

	return 0;

}



static struct platform_driver sti_drm_master_driver = {

	.probe = sti_drm_master_probe,

	.remove = sti_drm_master_remove,

	.driver = {

		.name = DRIVER_NAME "__master",

	},

};



static int sti_drm_platform_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct device_node *node = dev->of_node;

	struct platform_device *master;



	of_platform_populate(node, NULL, NULL, dev);



	platform_driver_register(&sti_drm_master_driver);

	master = platform_device_register_resndata(dev,

			DRIVER_NAME "__master", -1,

			NULL, 0, NULL, 0);

	if (IS_ERR(master))

               return PTR_ERR(master);



	platform_set_drvdata(pdev, master);

	return 0;

}



static int sti_drm_platform_remove(struct platform_device *pdev)

{

	struct platform_device *master = platform_get_drvdata(pdev);



	component_master_del(&pdev->dev, &sti_drm_ops);

	of_platform_depopulate(&pdev->dev);

	platform_device_unregister(master);

	platform_driver_unregister(&sti_drm_master_driver);



	return 0;

}

drivers/gpu/drm/sti/sti_hdmi.c

+12 −13
Original line number Diff line number Diff line
@@ -693,21 +693,8 @@ static int sti_hdmi_bind(struct device *dev, struct device *master, void *data) 
	struct sti_hdmi_connector *connector;

	struct drm_connector *drm_connector;

	struct drm_bridge *bridge;

	struct device_node *ddc;

	int err;



	ddc = of_parse_phandle(dev->of_node, "ddc", 0);

	if (ddc) {

		hdmi->ddc_adapt = of_find_i2c_adapter_by_node(ddc);

		if (!hdmi->ddc_adapt) {

			err = -EPROBE_DEFER;

			of_node_put(ddc);

			return err;

		}



		of_node_put(ddc);

	}



	/* Set the drm device handle */

	hdmi->drm_dev = drm_dev;
@@ -796,6 +783,7 @@ static int sti_hdmi_probe(struct platform_device *pdev) 
	struct sti_hdmi *hdmi;

	struct device_node *np = dev->of_node;

	struct resource *res;

	struct device_node *ddc;

	int ret;



	DRM_INFO("%s\n", __func__);
@@ -804,6 +792,17 @@ static int sti_hdmi_probe(struct platform_device *pdev) 
	if (!hdmi)

		return -ENOMEM;



	ddc = of_parse_phandle(pdev->dev.of_node, "ddc", 0);

	if (ddc) {

		hdmi->ddc_adapt = of_find_i2c_adapter_by_node(ddc);

		if (!hdmi->ddc_adapt) {

			of_node_put(ddc);

			return -EPROBE_DEFER;

		}



		of_node_put(ddc);

	}



	hdmi->dev = pdev->dev;



	/* Get resources */

drivers/gpu/drm/sti/sti_tvout.c

+4 −42
Original line number Diff line number Diff line
@@ -644,7 +644,6 @@ static int sti_tvout_bind(struct device *dev, struct device *master, void *data) 
	struct sti_tvout *tvout = dev_get_drvdata(dev);

	struct drm_device *drm_dev = data;

	unsigned int i;

	int ret;



	tvout->drm_dev = drm_dev;
@@ -658,17 +657,15 @@ static int sti_tvout_bind(struct device *dev, struct device *master, void *data) 


	sti_tvout_create_encoders(drm_dev, tvout);



	ret = component_bind_all(dev, drm_dev);

	if (ret)

		sti_tvout_destroy_encoders(tvout);



	return ret;

	return 0;

}



static void sti_tvout_unbind(struct device *dev, struct device *master,

	void *data)

{

	/* do nothing */

	struct sti_tvout *tvout = dev_get_drvdata(dev);



	sti_tvout_destroy_encoders(tvout);

}



static const struct component_ops sti_tvout_ops = {
@@ -676,34 +673,12 @@ static const struct component_ops sti_tvout_ops = { 
	.unbind	= sti_tvout_unbind,

};



static int compare_of(struct device *dev, void *data)

{

	return dev->of_node == data;

}



static int sti_tvout_master_bind(struct device *dev)

{

	return 0;

}



static void sti_tvout_master_unbind(struct device *dev)

{

	/* do nothing */

}



static const struct component_master_ops sti_tvout_master_ops = {

	.bind = sti_tvout_master_bind,

	.unbind = sti_tvout_master_unbind,

};



static int sti_tvout_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct device_node *node = dev->of_node;

	struct sti_tvout *tvout;

	struct resource *res;

	struct device_node *child_np;

	struct component_match *match = NULL;



	DRM_INFO("%s\n", __func__);
@@ -734,24 +709,11 @@ static int sti_tvout_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, tvout);



	of_platform_populate(node, NULL, NULL, dev);



	child_np = of_get_next_available_child(node, NULL);



	while (child_np) {

		component_match_add(dev, &match, compare_of, child_np);

		of_node_put(child_np);

		child_np = of_get_next_available_child(node, child_np);

	}



	component_master_add_with_match(dev, &sti_tvout_master_ops, match);



	return component_add(dev, &sti_tvout_ops);

}



static int sti_tvout_remove(struct platform_device *pdev)

{

	component_master_del(&pdev->dev, &sti_tvout_master_ops);

	component_del(&pdev->dev, &sti_tvout_ops);

	return 0;

}