aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/arm
diff options
context:
space:
mode:
authorLiviu Dudau <Liviu.Dudau@arm.com>2019-01-15 05:06:31 -0500
committerLiviu Dudau <Liviu.Dudau@arm.com>2019-01-18 05:44:10 -0500
commit874cf192964e05dc6f8103aa8bbcd090a7541312 (patch)
tree4c9332f7b39ce1f70caac384c59c76cf1c848396 /drivers/gpu/drm/arm
parentab6911b73493fac9cdcc3b2c77ddca6b1016e057 (diff)
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.c6
-rw-r--r--drivers/gpu/drm/arm/display/komeda/komeda_dev.h3
-rw-r--r--drivers/gpu/drm/arm/display/komeda/komeda_kms.c4
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)
49 49
50static int komeda_parse_dt(struct device *dev, struct komeda_dev *mdev) 50static int komeda_parse_dt(struct device *dev, struct komeda_dev *mdev)
51{ 51{
52 struct platform_device *pdev = to_platform_device(dev);
53 struct device_node *child, *np = dev->of_node; 52 struct device_node *child, *np = dev->of_node;
54 struct clk *clk; 53 struct clk *clk;
55 int ret; 54 int ret;
@@ -59,11 +58,6 @@ static int komeda_parse_dt(struct device *dev, struct komeda_dev *mdev)
59 return PTR_ERR(clk); 58 return PTR_ERR(clk);
60 59
61 mdev->mclk = clk; 60 mdev->mclk = clk;
62 mdev->irq = platform_get_irq(pdev, 0);
63 if (mdev->irq < 0) {
64 DRM_ERROR("could not get IRQ number.\n");
65 return mdev->irq;
66 }
67 61
68 for_each_available_child_of_node(np, child) { 62 for_each_available_child_of_node(np, child) {
69 if (of_node_cmp(child->name, "pipeline") == 0) { 63 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 {
81 /** @mck: HW main engine clk */ 81 /** @mck: HW main engine clk */
82 struct clk *mclk; 82 struct clk *mclk;
83 83
84 /** @irq: irq number */
85 u32 irq;
86
87 int n_pipelines; 84 int n_pipelines;
88 struct komeda_pipeline *pipelines[KOMEDA_MAX_PIPELINES]; 85 struct komeda_pipeline *pipelines[KOMEDA_MAX_PIPELINES];
89 86
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)
142 142
143 err = drm_dev_register(drm, 0); 143 err = drm_dev_register(drm, 0);
144 if (err) 144 if (err)
145 goto uninstall_irq; 145 goto cleanup_mode_config;
146 146
147 return kms; 147 return kms;
148 148
149uninstall_irq:
150 drm_irq_uninstall(drm);
151cleanup_mode_config: 149cleanup_mode_config:
152 drm_mode_config_cleanup(drm); 150 drm_mode_config_cleanup(drm);
153free_kms: 151free_kms: