aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2017-11-22 19:56:39 -0500
committerDave Airlie <airlied@redhat.com>2017-11-22 19:56:39 -0500
commit1cee3bce71e916c6213ec5566bd9666ffd202de0 (patch)
treeda4cd8ee5c40e6f0a5178b9056613748315ad8f0
parent9cae7751dc6896fb0c11ac858d3cbd9d6a8c022f (diff)
parent739acd85ffdb725a8ef206737875f4b2c1dad02a (diff)
Merge tag 'tilcdc-4.15-fixes' of https://github.com/jsarha/linux into drm-next
tilcdc fixes for v4.15 * tag 'tilcdc-4.15-fixes' of https://github.com/jsarha/linux: drm/tilcdc: Remove obsolete "ti,tilcdc,slave" dts binding support
Diffstat
-rw-r--r--drivers/gpu/drm/tilcdc/Kconfig11
-rw-r--r--drivers/gpu/drm/tilcdc/Makefile3
-rw-r--r--drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c269
-rw-r--r--drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dts72
-rw-r--r--drivers/gpu/drm/tilcdc/tilcdc_slave_compat.h25
5 files changed, 0 insertions, 380 deletions
diff --git a/drivers/gpu/drm/tilcdc/Kconfig b/drivers/gpu/drm/tilcdc/Kconfig
index 28fed7e206d0..81ac82455ce4 100644
--- a/drivers/gpu/drm/tilcdc/Kconfig
+++ b/drivers/gpu/drm/tilcdc/Kconfig
@@ -12,14 +12,3 @@ config DRM_TILCDC
12 controller, for example AM33xx in beagle-bone, DA8xx, or 12 controller, for example AM33xx in beagle-bone, DA8xx, or
13 OMAP-L1xx. This driver replaces the FB_DA8XX fbdev driver. 13 OMAP-L1xx. This driver replaces the FB_DA8XX fbdev driver.
14 14
15config DRM_TILCDC_SLAVE_COMPAT
16 bool "Support device tree blobs using TI LCDC Slave binding"
17 depends on DRM_TILCDC
18 default y
19 select OF_RESOLVE
20 select OF_OVERLAY
21 help
22 Choose this option if you need a kernel that is compatible
23 with device tree blobs using the obsolete "ti,tilcdc,slave"
24 binding. If you find "ti,tilcdc,slave"-string from your DTB,
25 you probably need this. Otherwise you do not.
diff --git a/drivers/gpu/drm/tilcdc/Makefile b/drivers/gpu/drm/tilcdc/Makefile
index 55ebd516728f..efc2c4f00daa 100644
--- a/drivers/gpu/drm/tilcdc/Makefile
+++ b/drivers/gpu/drm/tilcdc/Makefile
@@ -2,9 +2,6 @@ ifeq (, $(findstring -W,$(EXTRA_CFLAGS)))
2 ccflags-y += -Werror 2 ccflags-y += -Werror
3endif 3endif
4 4
5obj-$(CONFIG_DRM_TILCDC_SLAVE_COMPAT) += tilcdc_slave_compat.o \
6 tilcdc_slave_compat.dtb.o
7
8tilcdc-y := \ 5tilcdc-y := \
9 tilcdc_plane.o \ 6 tilcdc_plane.o \
10 tilcdc_crtc.o \ 7 tilcdc_crtc.o \
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c b/drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c
deleted file mode 100644
index 482299a6f3b0..000000000000
--- a/drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c
+++ /dev/null
@@ -1,269 +0,0 @@
1/*
2 * Copyright (C) 2015 Texas Instruments
3 * Author: Jyri Sarha <jsarha@ti.com>
4 *
5 * This program is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 as published by
7 * the Free Software Foundation.
8 *
9 */
10
11/*
12 * To support the old "ti,tilcdc,slave" binding the binding has to be
13 * transformed to the new external encoder binding.
14 */
15
16#include <linux/kernel.h>
17#include <linux/of.h>
18#include <linux/of_graph.h>
19#include <linux/of_fdt.h>
20#include <linux/slab.h>
21#include <linux/list.h>
22
23#include "tilcdc_slave_compat.h"
24
25struct kfree_table {
26 int total;
27 int num;
28 void **table;
29};
30
31static int __init kfree_table_init(struct kfree_table *kft)
32{
33 kft->total = 32;
34 kft->num = 0;
35 kft->table = kmalloc(kft->total * sizeof(*kft->table),
36 GFP_KERNEL);
37 if (!kft->table)
38 return -ENOMEM;
39
40 return 0;
41}
42
43static int __init kfree_table_add(struct kfree_table *kft, void *p)
44{
45 if (kft->num == kft->total) {
46 void **old = kft->table;
47
48 kft->total *= 2;
49 kft->table = krealloc(old, kft->total * sizeof(*kft->table),
50 GFP_KERNEL);
51 if (!kft->table) {
52 kft->table = old;
53 kfree(p);
54 return -ENOMEM;
55 }
56 }
57 kft->table[kft->num++] = p;
58 return 0;
59}
60
61static void __init kfree_table_free(struct kfree_table *kft)
62{
63 int i;
64
65 for (i = 0; i < kft->num; i++)
66 kfree(kft->table[i]);
67
68 kfree(kft->table);
69}
70
71static
72struct property * __init tilcdc_prop_dup(const struct property *prop,
73 struct kfree_table *kft)
74{
75 struct property *nprop;
76
77 nprop = kzalloc(sizeof(*nprop), GFP_KERNEL);
78 if (!nprop || kfree_table_add(kft, nprop))
79 return NULL;
80
81 nprop->name = kstrdup(prop->name, GFP_KERNEL);
82 if (!nprop->name || kfree_table_add(kft, nprop->name))
83 return NULL;
84
85 nprop->value = kmemdup(prop->value, prop->length, GFP_KERNEL);
86 if (!nprop->value || kfree_table_add(kft, nprop->value))
87 return NULL;
88
89 nprop->length = prop->length;
90
91 return nprop;
92}
93
94static void __init tilcdc_copy_props(struct device_node *from,
95 struct device_node *to,
96 const char * const props[],
97 struct kfree_table *kft)
98{
99 struct property *prop;
100 int i;
101
102 for (i = 0; props[i]; i++) {
103 prop = of_find_property(from, props[i], NULL);
104 if (!prop)
105 continue;
106
107 prop = tilcdc_prop_dup(prop, kft);
108 if (!prop)
109 continue;
110
111 prop->next = to->properties;
112 to->properties = prop;
113 }
114}
115
116static int __init tilcdc_prop_str_update(struct property *prop,
117 const char *str,
118 struct kfree_table *kft)
119{
120 prop->value = kstrdup(str, GFP_KERNEL);
121 if (kfree_table_add(kft, prop->value) || !prop->value)
122 return -ENOMEM;
123 prop->length = strlen(str)+1;
124 return 0;
125}
126
127static void __init tilcdc_node_disable(struct device_node *node)
128{
129 struct property *prop;
130
131 prop = kzalloc(sizeof(*prop), GFP_KERNEL);
132 if (!prop)
133 return;
134
135 prop->name = "status";
136 prop->value = "disabled";
137 prop->length = strlen((char *)prop->value)+1;
138
139 of_update_property(node, prop);
140}
141
142static struct device_node * __init tilcdc_get_overlay(struct kfree_table *kft)
143{
144 const int size = __dtb_tilcdc_slave_compat_end -
145 __dtb_tilcdc_slave_compat_begin;
146 static void *overlay_data;
147 struct device_node *overlay;
148 int ret;
149
150 if (!size) {
151 pr_warn("%s: No overlay data\n", __func__);
152 return NULL;
153 }
154
155 overlay_data = kmemdup(__dtb_tilcdc_slave_compat_begin,
156 size, GFP_KERNEL);
157 if (!overlay_data || kfree_table_add(kft, overlay_data))
158 return NULL;
159
160 of_fdt_unflatten_tree(overlay_data, NULL, &overlay);
161 if (!overlay) {
162 pr_warn("%s: Unfattening overlay tree failed\n", __func__);
163 return NULL;
164 }
165
166 ret = of_resolve_phandles(overlay);
167 if (ret) {
168 pr_err("%s: Failed to resolve phandles: %d\n", __func__, ret);
169 return NULL;
170 }
171
172 return overlay;
173}
174
175static const struct of_device_id tilcdc_slave_of_match[] __initconst = {
176 { .compatible = "ti,tilcdc,slave", },
177 {},
178};
179
180static const struct of_device_id tilcdc_of_match[] __initconst = {
181 { .compatible = "ti,am33xx-tilcdc", },
182 {},
183};
184
185static const struct of_device_id tilcdc_tda998x_of_match[] __initconst = {
186 { .compatible = "nxp,tda998x", },
187 {},
188};
189
190static const char * const tilcdc_slave_props[] __initconst = {
191 "pinctrl-names",
192 "pinctrl-0",
193 "pinctrl-1",
194 NULL
195};
196
197static void __init tilcdc_convert_slave_node(void)
198{
199 struct device_node *slave = NULL, *lcdc = NULL;
200 struct device_node *i2c = NULL, *fragment = NULL;
201 struct device_node *overlay, *encoder;
202 struct property *prop;
203 /* For all memory needed for the overlay tree. This memory can
204 be freed after the overlay has been applied. */
205 struct kfree_table kft;
206 int ret;
207
208 if (kfree_table_init(&kft))
209 return;
210
211 lcdc = of_find_matching_node(NULL, tilcdc_of_match);
212 slave = of_find_matching_node(NULL, tilcdc_slave_of_match);
213
214 if (!slave || !of_device_is_available(lcdc))
215 goto out;
216
217 i2c = of_parse_phandle(slave, "i2c", 0);
218 if (!i2c) {
219 pr_err("%s: Can't find i2c node trough phandle\n", __func__);
220 goto out;
221 }
222
223 overlay = tilcdc_get_overlay(&kft);
224 if (!overlay)
225 goto out;
226
227 encoder = of_find_matching_node(overlay, tilcdc_tda998x_of_match);
228 if (!encoder) {
229 pr_err("%s: Failed to find tda998x node\n", __func__);
230 goto out;
231 }
232
233 tilcdc_copy_props(slave, encoder, tilcdc_slave_props, &kft);
234
235 for_each_child_of_node(overlay, fragment) {
236 prop = of_find_property(fragment, "target-path", NULL);
237 if (!prop)
238 continue;
239 if (!strncmp("i2c", (char *)prop->value, prop->length))
240 if (tilcdc_prop_str_update(prop, i2c->full_name, &kft))
241 goto out;
242 if (!strncmp("lcdc", (char *)prop->value, prop->length))
243 if (tilcdc_prop_str_update(prop, lcdc->full_name, &kft))
244 goto out;
245 }
246
247 tilcdc_node_disable(slave);
248
249 ret = of_overlay_create(overlay);
250 if (ret)
251 pr_err("%s: Creating overlay failed: %d\n", __func__, ret);
252 else
253 pr_info("%s: ti,tilcdc,slave node successfully converted\n",
254 __func__);
255out:
256 kfree_table_free(&kft);
257 of_node_put(i2c);
258 of_node_put(slave);
259 of_node_put(lcdc);
260 of_node_put(fragment);
261}
262
263static int __init tilcdc_slave_compat_init(void)
264{
265 tilcdc_convert_slave_node();
266 return 0;
267}
268
269subsys_initcall(tilcdc_slave_compat_init);
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dts b/drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dts
deleted file mode 100644
index 693f8b0aea2d..000000000000
--- a/drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dts
+++ /dev/null
@@ -1,72 +0,0 @@
1/*
2 * DTS overlay for converting ti,tilcdc,slave binding to new binding.
3 *
4 * Copyright (C) 2015 Texas Instruments Inc.
5 * Author: Jyri Sarha <jsarha@ti.com>
6 *
7 * This program is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU General Public License
9 * version 2 as published by the Free Software Foundation.
10 */
11
12/*
13 * target-path property values are simple tags that are replaced with
14 * correct values in tildcdc_slave_compat.c. Some properties are also
15 * copied over from the ti,tilcdc,slave node.
16 */
17
18/dts-v1/;
19/ {
20 fragment@0 {
21 target-path = "i2c";
22 __overlay__ {
23 #address-cells = <1>;
24 #size-cells = <0>;
25 tda19988 {
26 compatible = "nxp,tda998x";
27 reg = <0x70>;
28 status = "okay";
29
30 port {
31 hdmi_0: endpoint@0 {
32 remote-endpoint = <&lcd_0>;
33 };
34 };
35 };
36 };
37 };
38
39 fragment@1 {
40 target-path = "lcdc";
41 __overlay__ {
42 port {
43 lcd_0: endpoint@0 {
44 remote-endpoint = <&hdmi_0>;
45 };
46 };
47 };
48 };
49
50 __local_fixups__ {
51 fragment@0 {
52 __overlay__ {
53 tda19988 {
54 port {
55 endpoint@0 {
56 remote-endpoint = <0>;
57 };
58 };
59 };
60 };
61 };
62 fragment@1 {
63 __overlay__ {
64 port {
65 endpoint@0 {
66 remote-endpoint = <0>;
67 };
68 };
69 };
70 };
71 };
72};
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_slave_compat.h b/drivers/gpu/drm/tilcdc/tilcdc_slave_compat.h
deleted file mode 100644
index 403d35d87d0b..000000000000
--- a/drivers/gpu/drm/tilcdc/tilcdc_slave_compat.h
+++ /dev/null
@@ -1,25 +0,0 @@
1/*
2 * Copyright (C) 2015 Texas Instruments
3 * Author: Jyri Sarha <jsarha@ti.com>
4 *
5 * This program is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 as published by
7 * the Free Software Foundation.
8 *
9 * This program is distributed in the hope that it will be useful, but WITHOUT
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
12 * more details.
13 *
14 * You should have received a copy of the GNU General Public License along with
15 * this program. If not, see <http://www.gnu.org/licenses/>.
16 */
17/* This header declares the symbols defined in tilcdc_slave_compat.dts */
18
19#ifndef __TILCDC_SLAVE_COMPAT_H__
20#define __TILCDC_SLAVE_COMPAT_H__
21
22extern uint8_t __dtb_tilcdc_slave_compat_begin[];
23extern uint8_t __dtb_tilcdc_slave_compat_end[];
24
25#endif /* __TILCDC_SLAVE_COMPAT_H__ */
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-13 14:08:13 -0400