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

Commit 874cf192 authored by Liviu Dudau's avatar Liviu Dudau
Browse files

drm: arm/komeda: Remove IRQ parsing from initial series 



The initial series is only introducing the basic components and not
implementing IRQ handling. Remove the left over code that touches
IRQs until the proper implementation is introduced in a later series.

Reviewed-by: default avatarJames Qian Wang (Arm Technology China) <james.qian.wang@arm.com>
Signed-off-by: default avatarLiviu Dudau <liviu.dudau@arm.com>
parent ab6911b7

drivers/gpu/drm/arm/display/komeda/komeda_dev.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -49,7 +49,6 @@ static int komeda_parse_pipe_dt(struct komeda_dev *mdev, struct device_node *np) 




static int komeda_parse_dt(struct device *dev, struct komeda_dev *mdev)

static int komeda_parse_dt(struct device *dev, struct komeda_dev *mdev)

{

{

	struct platform_device *pdev = to_platform_device(dev);

	struct device_node *child, *np = dev->of_node;

	struct device_node *child, *np = dev->of_node;

	struct clk *clk;

	struct clk *clk;

	int ret;

	int ret;
@@ -59,11 +58,6 @@ static int komeda_parse_dt(struct device *dev, struct komeda_dev *mdev) 
		return PTR_ERR(clk);

		return PTR_ERR(clk);





	mdev->mclk = clk;

	mdev->mclk = clk;

	mdev->irq  = platform_get_irq(pdev, 0);

	if (mdev->irq < 0) {

		DRM_ERROR("could not get IRQ number.\n");

		return mdev->irq;

	}





	for_each_available_child_of_node(np, child) {

	for_each_available_child_of_node(np, child) {

		if (of_node_cmp(child->name, "pipeline") == 0) {

		if (of_node_cmp(child->name, "pipeline") == 0) {

drivers/gpu/drm/arm/display/komeda/komeda_dev.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -81,9 +81,6 @@ struct komeda_dev { 
	/** @mck: HW main engine clk */

	/** @mck: HW main engine clk */

	struct clk *mclk;

	struct clk *mclk;





	/** @irq: irq number */

	u32 irq;



	int n_pipelines;

	int n_pipelines;

	struct komeda_pipeline *pipelines[KOMEDA_MAX_PIPELINES];

	struct komeda_pipeline *pipelines[KOMEDA_MAX_PIPELINES];

drivers/gpu/drm/arm/display/komeda/komeda_kms.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -142,12 +142,10 @@ struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev) 




	err = drm_dev_register(drm, 0);

	err = drm_dev_register(drm, 0);

	if (err)

	if (err)

		goto uninstall_irq;

		goto cleanup_mode_config;





	return kms;

	return kms;





uninstall_irq:

	drm_irq_uninstall(drm);

cleanup_mode_config:

cleanup_mode_config:

	drm_mode_config_cleanup(drm);

	drm_mode_config_cleanup(drm);

free_kms:

free_kms: