diff options
author | Krzysztof Kozlowski <krzk@kernel.org> | 2017-03-11 13:04:16 -0500 |
---|---|---|
committer | Inki Dae <inki.dae@samsung.com> | 2017-03-21 00:17:21 -0400 |
commit | 6bdc92ee4980ca10171a8de338fad612f00bb48f (patch) | |
tree | 2559cd88a34218762feeb21922d62726ed4f5a59 | |
parent | ac7ce78ba036c0f9952d9706b1941c7d80c78680 (diff) |
drm/exynos: Remove support for Exynos4415 (SoC not supported anymore)
Support for Exynos4415 is going away because there are no internal nor
external users.
Since commit 46dcf0ff0de3 ("ARM: dts: exynos: Remove exynos4415.dtsi"),
the platform cannot be instantiated so remove also the drivers.
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Kukjin Kim <kgene@kernel.org>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
4 files changed, 3 insertions, 32 deletions
diff --git a/Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt b/Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt index a78265993665..ca5204b3bc21 100644 --- a/Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt +++ b/Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt | |||
@@ -4,7 +4,6 @@ Required properties: | |||
4 | - compatible: value should be one of the following | 4 | - compatible: value should be one of the following |
5 | "samsung,exynos3250-mipi-dsi" /* for Exynos3250/3472 SoCs */ | 5 | "samsung,exynos3250-mipi-dsi" /* for Exynos3250/3472 SoCs */ |
6 | "samsung,exynos4210-mipi-dsi" /* for Exynos4 SoCs */ | 6 | "samsung,exynos4210-mipi-dsi" /* for Exynos4 SoCs */ |
7 | "samsung,exynos4415-mipi-dsi" /* for Exynos4415 SoC */ | ||
8 | "samsung,exynos5410-mipi-dsi" /* for Exynos5410/5420/5440 SoCs */ | 7 | "samsung,exynos5410-mipi-dsi" /* for Exynos5410/5420/5440 SoCs */ |
9 | "samsung,exynos5422-mipi-dsi" /* for Exynos5422/5800 SoCs */ | 8 | "samsung,exynos5422-mipi-dsi" /* for Exynos5422/5800 SoCs */ |
10 | "samsung,exynos5433-mipi-dsi" /* for Exynos5433 SoCs */ | 9 | "samsung,exynos5433-mipi-dsi" /* for Exynos5433 SoCs */ |
diff --git a/Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt b/Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt index 18645e0228b0..5837402c3ade 100644 --- a/Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt +++ b/Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt | |||
@@ -11,7 +11,6 @@ Required properties: | |||
11 | "samsung,s5pv210-fimd"; /* for S5PV210 SoC */ | 11 | "samsung,s5pv210-fimd"; /* for S5PV210 SoC */ |
12 | "samsung,exynos3250-fimd"; /* for Exynos3250/3472 SoCs */ | 12 | "samsung,exynos3250-fimd"; /* for Exynos3250/3472 SoCs */ |
13 | "samsung,exynos4210-fimd"; /* for Exynos4 SoCs */ | 13 | "samsung,exynos4210-fimd"; /* for Exynos4 SoCs */ |
14 | "samsung,exynos4415-fimd"; /* for Exynos4415 SoC */ | ||
15 | "samsung,exynos5250-fimd"; /* for Exynos5250 SoCs */ | 14 | "samsung,exynos5250-fimd"; /* for Exynos5250 SoCs */ |
16 | "samsung,exynos5420-fimd"; /* for Exynos5420/5422/5800 SoCs */ | 15 | "samsung,exynos5420-fimd"; /* for Exynos5420/5422/5800 SoCs */ |
17 | 16 | ||
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c index 812e2ec0761d..ef6f9c6de098 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c | |||
@@ -86,7 +86,7 @@ | |||
86 | #define DSIM_SYNC_INFORM (1 << 27) | 86 | #define DSIM_SYNC_INFORM (1 << 27) |
87 | #define DSIM_EOT_DISABLE (1 << 28) | 87 | #define DSIM_EOT_DISABLE (1 << 28) |
88 | #define DSIM_MFLUSH_VS (1 << 29) | 88 | #define DSIM_MFLUSH_VS (1 << 29) |
89 | /* This flag is valid only for exynos3250/3472/4415/5260/5430 */ | 89 | /* This flag is valid only for exynos3250/3472/5260/5430 */ |
90 | #define DSIM_CLKLANE_STOP (1 << 30) | 90 | #define DSIM_CLKLANE_STOP (1 << 30) |
91 | 91 | ||
92 | /* DSIM_ESCMODE */ | 92 | /* DSIM_ESCMODE */ |
@@ -473,17 +473,6 @@ static const struct exynos_dsi_driver_data exynos4_dsi_driver_data = { | |||
473 | .reg_values = reg_values, | 473 | .reg_values = reg_values, |
474 | }; | 474 | }; |
475 | 475 | ||
476 | static const struct exynos_dsi_driver_data exynos4415_dsi_driver_data = { | ||
477 | .reg_ofs = exynos_reg_ofs, | ||
478 | .plltmr_reg = 0x58, | ||
479 | .has_clklane_stop = 1, | ||
480 | .num_clks = 2, | ||
481 | .max_freq = 1000, | ||
482 | .wait_for_reset = 1, | ||
483 | .num_bits_resol = 11, | ||
484 | .reg_values = reg_values, | ||
485 | }; | ||
486 | |||
487 | static const struct exynos_dsi_driver_data exynos5_dsi_driver_data = { | 476 | static const struct exynos_dsi_driver_data exynos5_dsi_driver_data = { |
488 | .reg_ofs = exynos_reg_ofs, | 477 | .reg_ofs = exynos_reg_ofs, |
489 | .plltmr_reg = 0x58, | 478 | .plltmr_reg = 0x58, |
@@ -521,8 +510,6 @@ static const struct of_device_id exynos_dsi_of_match[] = { | |||
521 | .data = &exynos3_dsi_driver_data }, | 510 | .data = &exynos3_dsi_driver_data }, |
522 | { .compatible = "samsung,exynos4210-mipi-dsi", | 511 | { .compatible = "samsung,exynos4210-mipi-dsi", |
523 | .data = &exynos4_dsi_driver_data }, | 512 | .data = &exynos4_dsi_driver_data }, |
524 | { .compatible = "samsung,exynos4415-mipi-dsi", | ||
525 | .data = &exynos4415_dsi_driver_data }, | ||
526 | { .compatible = "samsung,exynos5410-mipi-dsi", | 513 | { .compatible = "samsung,exynos5410-mipi-dsi", |
527 | .data = &exynos5_dsi_driver_data }, | 514 | .data = &exynos5_dsi_driver_data }, |
528 | { .compatible = "samsung,exynos5422-mipi-dsi", | 515 | { .compatible = "samsung,exynos5422-mipi-dsi", |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index a9fa444c6053..661b9fe049e2 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c | |||
@@ -71,10 +71,10 @@ | |||
71 | #define TRIGCON 0x1A4 | 71 | #define TRIGCON 0x1A4 |
72 | #define TRGMODE_ENABLE (1 << 0) | 72 | #define TRGMODE_ENABLE (1 << 0) |
73 | #define SWTRGCMD_ENABLE (1 << 1) | 73 | #define SWTRGCMD_ENABLE (1 << 1) |
74 | /* Exynos3250, 3472, 4415, 5260 5410, 5420 and 5422 only supported. */ | 74 | /* Exynos3250, 3472, 5260 5410, 5420 and 5422 only supported. */ |
75 | #define HWTRGEN_ENABLE (1 << 3) | 75 | #define HWTRGEN_ENABLE (1 << 3) |
76 | #define HWTRGMASK_ENABLE (1 << 4) | 76 | #define HWTRGMASK_ENABLE (1 << 4) |
77 | /* Exynos3250, 3472, 4415, 5260, 5420 and 5422 only supported. */ | 77 | /* Exynos3250, 3472, 5260, 5420 and 5422 only supported. */ |
78 | #define HWTRIGEN_PER_ENABLE (1 << 31) | 78 | #define HWTRIGEN_PER_ENABLE (1 << 31) |
79 | 79 | ||
80 | /* display mode change control register except exynos4 */ | 80 | /* display mode change control register except exynos4 */ |
@@ -138,18 +138,6 @@ static struct fimd_driver_data exynos4_fimd_driver_data = { | |||
138 | .has_vtsel = 1, | 138 | .has_vtsel = 1, |
139 | }; | 139 | }; |
140 | 140 | ||
141 | static struct fimd_driver_data exynos4415_fimd_driver_data = { | ||
142 | .timing_base = 0x20000, | ||
143 | .lcdblk_offset = 0x210, | ||
144 | .lcdblk_vt_shift = 10, | ||
145 | .lcdblk_bypass_shift = 1, | ||
146 | .trg_type = I80_HW_TRG, | ||
147 | .has_shadowcon = 1, | ||
148 | .has_vidoutcon = 1, | ||
149 | .has_vtsel = 1, | ||
150 | .has_trigger_per_te = 1, | ||
151 | }; | ||
152 | |||
153 | static struct fimd_driver_data exynos5_fimd_driver_data = { | 141 | static struct fimd_driver_data exynos5_fimd_driver_data = { |
154 | .timing_base = 0x20000, | 142 | .timing_base = 0x20000, |
155 | .lcdblk_offset = 0x214, | 143 | .lcdblk_offset = 0x214, |
@@ -210,8 +198,6 @@ static const struct of_device_id fimd_driver_dt_match[] = { | |||
210 | .data = &exynos3_fimd_driver_data }, | 198 | .data = &exynos3_fimd_driver_data }, |
211 | { .compatible = "samsung,exynos4210-fimd", | 199 | { .compatible = "samsung,exynos4210-fimd", |
212 | .data = &exynos4_fimd_driver_data }, | 200 | .data = &exynos4_fimd_driver_data }, |
213 | { .compatible = "samsung,exynos4415-fimd", | ||
214 | .data = &exynos4415_fimd_driver_data }, | ||
215 | { .compatible = "samsung,exynos5250-fimd", | 201 | { .compatible = "samsung,exynos5250-fimd", |
216 | .data = &exynos5_fimd_driver_data }, | 202 | .data = &exynos5_fimd_driver_data }, |
217 | { .compatible = "samsung,exynos5420-fimd", | 203 | { .compatible = "samsung,exynos5420-fimd", |