diff options
| author | Liviu Dudau <Liviu.Dudau@arm.com> | 2019-01-15 11:06:31 +0100 |
|---|---|---|
| committer | Liviu Dudau <Liviu.Dudau@arm.com> | 2019-01-18 11:44:10 +0100 |
| commit | 874cf192964e05dc6f8103aa8bbcd090a7541312 (patch) | |
| tree | 4c9332f7b39ce1f70caac384c59c76cf1c848396 /drivers/gpu/drm/arm | |
| parent | MAINTAINERS: Add maintainer for Arm komeda driver (diff) | |
| download | linux-874cf192964e05dc6f8103aa8bbcd090a7541312.tar.xz linux-874cf192964e05dc6f8103aa8bbcd090a7541312.zip | |
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: James Qian Wang (Arm Technology China) <james.qian.wang@arm.com>
Signed-off-by: Liviu Dudau <liviu.dudau@arm.com>
Diffstat (limited to 'drivers/gpu/drm/arm')
| -rw-r--r-- | drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 4 |
3 files changed, 1 insertions, 12 deletions
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c index 84fdf707f210..0fe6954fbbf4 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c @@ -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) { - struct platform_device *pdev = to_platform_device(dev); struct device_node *child, *np = dev->of_node; struct clk *clk; int ret; @@ -59,11 +58,6 @@ static int komeda_parse_dt(struct device *dev, struct komeda_dev *mdev) return PTR_ERR(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) { if (of_node_cmp(child->name, "pipeline") == 0) { diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.h b/drivers/gpu/drm/arm/display/komeda/komeda_dev.h index a0bf7050037a..0f77dead6a23 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.h +++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.h @@ -81,9 +81,6 @@ struct komeda_dev { /** @mck: HW main engine clk */ struct clk *mclk; - /** @irq: irq number */ - u32 irq; - int n_pipelines; struct komeda_pipeline *pipelines[KOMEDA_MAX_PIPELINES]; diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c index f41b20235130..3fc096d3883e 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c @@ -142,12 +142,10 @@ struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev) err = drm_dev_register(drm, 0); if (err) - goto uninstall_irq; + goto cleanup_mode_config; return kms; -uninstall_irq: - drm_irq_uninstall(drm); cleanup_mode_config: drm_mode_config_cleanup(drm); free_kms: |