tilcdc fixes for v4.15
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJaEs0+AAoJEJA2s1DX1hlBXWAQAJpQzNTbP8VvySHbI89FBnjk Pinr2infrJGZyUdT3HpOgcJ55/nWUOFiKVx1D8CeAG57PPc0UVHga09sH/JOURu/ n5aypde7X5Dt7rW7zajhTUT/R8VB7DR1TKsbSGYrM7Zh4KMFuKPewqn2nUHxahgU rKJuxSUdRKaC0teBS6AM/OWJyvs+iM8lR4XzvC4uZ9bPdFfHkZ2obek+0hF9AgnU oUrTnntBhVdVK9M5mSOtLi6RexRkC7QtqEdG568L3a3zLYlxbRVCD2u8tNJyUbKi snLnHgP4Bhw1biUWiB+7pDdMygCJX1BUmHSfGcBBHI+fPr+7WnU4yCep1iHct+cr ZbVO5SeR/DA8LXoUpRBODA5+CEY85uISlQb5EssEh5iuBJBIKNS30C+2vOa0/X8b us8yTNWHJ7ziVQ4IhEJ0GFjwTFHjKirLoRXX58WdUqkBrTh2WapQcaA+ESqq4Ara MMYoduhkagyt+TckhYwjTHOHvPz+POW6QnbG9lN6pVNgxGnlstYc9EMSECxlUfWf K1qDzT0YZMqj4Wra4lFOlOcrP6ZXkVF6zDtxCK7KAvEImpWerXwsYpSaVDfSM+vp NtSL3GgMEHF+Z8Scx64Gb/qakDK9F3va+447EL/xeUHKwxsEXW/zLiUNYRoZC2TO r7zSB9i8vHa/nNTHu42E =tJSq -----END PGP SIGNATURE----- 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
This commit is contained in:
Dave Airlie
commit
1cee3bce71
|
|
@ -12,14 +12,3 @@ config DRM_TILCDC
|
||||||
controller, for example AM33xx in beagle-bone, DA8xx, or
|
controller, for example AM33xx in beagle-bone, DA8xx, or
|
||||||
OMAP-L1xx. This driver replaces the FB_DA8XX fbdev driver.
|
OMAP-L1xx. This driver replaces the FB_DA8XX fbdev driver.
|
||||||
|
|
||||||
config DRM_TILCDC_SLAVE_COMPAT
|
|
||||||
bool "Support device tree blobs using TI LCDC Slave binding"
|
|
||||||
depends on DRM_TILCDC
|
|
||||||
default y
|
|
||||||
select OF_RESOLVE
|
|
||||||
select OF_OVERLAY
|
|
||||||
help
|
|
||||||
Choose this option if you need a kernel that is compatible
|
|
||||||
with device tree blobs using the obsolete "ti,tilcdc,slave"
|
|
||||||
binding. If you find "ti,tilcdc,slave"-string from your DTB,
|
|
||||||
you probably need this. Otherwise you do not.
|
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,6 @@ ifeq (, $(findstring -W,$(EXTRA_CFLAGS)))
|
||||||
ccflags-y += -Werror
|
ccflags-y += -Werror
|
||||||
endif
|
endif
|
||||||
|
|
||||||
obj-$(CONFIG_DRM_TILCDC_SLAVE_COMPAT) += tilcdc_slave_compat.o \
|
|
||||||
tilcdc_slave_compat.dtb.o
|
|
||||||
|
|
||||||
tilcdc-y := \
|
tilcdc-y := \
|
||||||
tilcdc_plane.o \
|
tilcdc_plane.o \
|
||||||
tilcdc_crtc.o \
|
tilcdc_crtc.o \
|
||||||
|
|
|
||||||
|
|
@ -1,269 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2015 Texas Instruments
|
|
||||||
* Author: Jyri Sarha <jsarha@ti.com>
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify it
|
|
||||||
* under the terms of the GNU General Public License version 2 as published by
|
|
||||||
* the Free Software Foundation.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* To support the old "ti,tilcdc,slave" binding the binding has to be
|
|
||||||
* transformed to the new external encoder binding.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <linux/kernel.h>
|
|
||||||
#include <linux/of.h>
|
|
||||||
#include <linux/of_graph.h>
|
|
||||||
#include <linux/of_fdt.h>
|
|
||||||
#include <linux/slab.h>
|
|
||||||
#include <linux/list.h>
|
|
||||||
|
|
||||||
#include "tilcdc_slave_compat.h"
|
|
||||||
|
|
||||||
struct kfree_table {
|
|
||||||
int total;
|
|
||||||
int num;
|
|
||||||
void **table;
|
|
||||||
};
|
|
||||||
|
|
||||||
static int __init kfree_table_init(struct kfree_table *kft)
|
|
||||||
{
|
|
||||||
kft->total = 32;
|
|
||||||
kft->num = 0;
|
|
||||||
kft->table = kmalloc(kft->total * sizeof(*kft->table),
|
|
||||||
GFP_KERNEL);
|
|
||||||
if (!kft->table)
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int __init kfree_table_add(struct kfree_table *kft, void *p)
|
|
||||||
{
|
|
||||||
if (kft->num == kft->total) {
|
|
||||||
void **old = kft->table;
|
|
||||||
|
|
||||||
kft->total *= 2;
|
|
||||||
kft->table = krealloc(old, kft->total * sizeof(*kft->table),
|
|
||||||
GFP_KERNEL);
|
|
||||||
if (!kft->table) {
|
|
||||||
kft->table = old;
|
|
||||||
kfree(p);
|
|
||||||
return -ENOMEM;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
kft->table[kft->num++] = p;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void __init kfree_table_free(struct kfree_table *kft)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
|
|
||||||
for (i = 0; i < kft->num; i++)
|
|
||||||
kfree(kft->table[i]);
|
|
||||||
|
|
||||||
kfree(kft->table);
|
|
||||||
}
|
|
||||||
|
|
||||||
static
|
|
||||||
struct property * __init tilcdc_prop_dup(const struct property *prop,
|
|
||||||
struct kfree_table *kft)
|
|
||||||
{
|
|
||||||
struct property *nprop;
|
|
||||||
|
|
||||||
nprop = kzalloc(sizeof(*nprop), GFP_KERNEL);
|
|
||||||
if (!nprop || kfree_table_add(kft, nprop))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
nprop->name = kstrdup(prop->name, GFP_KERNEL);
|
|
||||||
if (!nprop->name || kfree_table_add(kft, nprop->name))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
nprop->value = kmemdup(prop->value, prop->length, GFP_KERNEL);
|
|
||||||
if (!nprop->value || kfree_table_add(kft, nprop->value))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
nprop->length = prop->length;
|
|
||||||
|
|
||||||
return nprop;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void __init tilcdc_copy_props(struct device_node *from,
|
|
||||||
struct device_node *to,
|
|
||||||
const char * const props[],
|
|
||||||
struct kfree_table *kft)
|
|
||||||
{
|
|
||||||
struct property *prop;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
for (i = 0; props[i]; i++) {
|
|
||||||
prop = of_find_property(from, props[i], NULL);
|
|
||||||
if (!prop)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
prop = tilcdc_prop_dup(prop, kft);
|
|
||||||
if (!prop)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
prop->next = to->properties;
|
|
||||||
to->properties = prop;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static int __init tilcdc_prop_str_update(struct property *prop,
|
|
||||||
const char *str,
|
|
||||||
struct kfree_table *kft)
|
|
||||||
{
|
|
||||||
prop->value = kstrdup(str, GFP_KERNEL);
|
|
||||||
if (kfree_table_add(kft, prop->value) || !prop->value)
|
|
||||||
return -ENOMEM;
|
|
||||||
prop->length = strlen(str)+1;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void __init tilcdc_node_disable(struct device_node *node)
|
|
||||||
{
|
|
||||||
struct property *prop;
|
|
||||||
|
|
||||||
prop = kzalloc(sizeof(*prop), GFP_KERNEL);
|
|
||||||
if (!prop)
|
|
||||||
return;
|
|
||||||
|
|
||||||
prop->name = "status";
|
|
||||||
prop->value = "disabled";
|
|
||||||
prop->length = strlen((char *)prop->value)+1;
|
|
||||||
|
|
||||||
of_update_property(node, prop);
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct device_node * __init tilcdc_get_overlay(struct kfree_table *kft)
|
|
||||||
{
|
|
||||||
const int size = __dtb_tilcdc_slave_compat_end -
|
|
||||||
__dtb_tilcdc_slave_compat_begin;
|
|
||||||
static void *overlay_data;
|
|
||||||
struct device_node *overlay;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
if (!size) {
|
|
||||||
pr_warn("%s: No overlay data\n", __func__);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
overlay_data = kmemdup(__dtb_tilcdc_slave_compat_begin,
|
|
||||||
size, GFP_KERNEL);
|
|
||||||
if (!overlay_data || kfree_table_add(kft, overlay_data))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
of_fdt_unflatten_tree(overlay_data, NULL, &overlay);
|
|
||||||
if (!overlay) {
|
|
||||||
pr_warn("%s: Unfattening overlay tree failed\n", __func__);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = of_resolve_phandles(overlay);
|
|
||||||
if (ret) {
|
|
||||||
pr_err("%s: Failed to resolve phandles: %d\n", __func__, ret);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
return overlay;
|
|
||||||
}
|
|
||||||
|
|
||||||
static const struct of_device_id tilcdc_slave_of_match[] __initconst = {
|
|
||||||
{ .compatible = "ti,tilcdc,slave", },
|
|
||||||
{},
|
|
||||||
};
|
|
||||||
|
|
||||||
static const struct of_device_id tilcdc_of_match[] __initconst = {
|
|
||||||
{ .compatible = "ti,am33xx-tilcdc", },
|
|
||||||
{},
|
|
||||||
};
|
|
||||||
|
|
||||||
static const struct of_device_id tilcdc_tda998x_of_match[] __initconst = {
|
|
||||||
{ .compatible = "nxp,tda998x", },
|
|
||||||
{},
|
|
||||||
};
|
|
||||||
|
|
||||||
static const char * const tilcdc_slave_props[] __initconst = {
|
|
||||||
"pinctrl-names",
|
|
||||||
"pinctrl-0",
|
|
||||||
"pinctrl-1",
|
|
||||||
NULL
|
|
||||||
};
|
|
||||||
|
|
||||||
static void __init tilcdc_convert_slave_node(void)
|
|
||||||
{
|
|
||||||
struct device_node *slave = NULL, *lcdc = NULL;
|
|
||||||
struct device_node *i2c = NULL, *fragment = NULL;
|
|
||||||
struct device_node *overlay, *encoder;
|
|
||||||
struct property *prop;
|
|
||||||
/* For all memory needed for the overlay tree. This memory can
|
|
||||||
be freed after the overlay has been applied. */
|
|
||||||
struct kfree_table kft;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
if (kfree_table_init(&kft))
|
|
||||||
return;
|
|
||||||
|
|
||||||
lcdc = of_find_matching_node(NULL, tilcdc_of_match);
|
|
||||||
slave = of_find_matching_node(NULL, tilcdc_slave_of_match);
|
|
||||||
|
|
||||||
if (!slave || !of_device_is_available(lcdc))
|
|
||||||
goto out;
|
|
||||||
|
|
||||||
i2c = of_parse_phandle(slave, "i2c", 0);
|
|
||||||
if (!i2c) {
|
|
||||||
pr_err("%s: Can't find i2c node trough phandle\n", __func__);
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
overlay = tilcdc_get_overlay(&kft);
|
|
||||||
if (!overlay)
|
|
||||||
goto out;
|
|
||||||
|
|
||||||
encoder = of_find_matching_node(overlay, tilcdc_tda998x_of_match);
|
|
||||||
if (!encoder) {
|
|
||||||
pr_err("%s: Failed to find tda998x node\n", __func__);
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
tilcdc_copy_props(slave, encoder, tilcdc_slave_props, &kft);
|
|
||||||
|
|
||||||
for_each_child_of_node(overlay, fragment) {
|
|
||||||
prop = of_find_property(fragment, "target-path", NULL);
|
|
||||||
if (!prop)
|
|
||||||
continue;
|
|
||||||
if (!strncmp("i2c", (char *)prop->value, prop->length))
|
|
||||||
if (tilcdc_prop_str_update(prop, i2c->full_name, &kft))
|
|
||||||
goto out;
|
|
||||||
if (!strncmp("lcdc", (char *)prop->value, prop->length))
|
|
||||||
if (tilcdc_prop_str_update(prop, lcdc->full_name, &kft))
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
tilcdc_node_disable(slave);
|
|
||||||
|
|
||||||
ret = of_overlay_create(overlay);
|
|
||||||
if (ret)
|
|
||||||
pr_err("%s: Creating overlay failed: %d\n", __func__, ret);
|
|
||||||
else
|
|
||||||
pr_info("%s: ti,tilcdc,slave node successfully converted\n",
|
|
||||||
__func__);
|
|
||||||
out:
|
|
||||||
kfree_table_free(&kft);
|
|
||||||
of_node_put(i2c);
|
|
||||||
of_node_put(slave);
|
|
||||||
of_node_put(lcdc);
|
|
||||||
of_node_put(fragment);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int __init tilcdc_slave_compat_init(void)
|
|
||||||
{
|
|
||||||
tilcdc_convert_slave_node();
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
subsys_initcall(tilcdc_slave_compat_init);
|
|
||||||
|
|
@ -1,72 +0,0 @@
|
||||||
/*
|
|
||||||
* DTS overlay for converting ti,tilcdc,slave binding to new binding.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2015 Texas Instruments Inc.
|
|
||||||
* Author: Jyri Sarha <jsarha@ti.com>
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU General Public License
|
|
||||||
* version 2 as published by the Free Software Foundation.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* target-path property values are simple tags that are replaced with
|
|
||||||
* correct values in tildcdc_slave_compat.c. Some properties are also
|
|
||||||
* copied over from the ti,tilcdc,slave node.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/dts-v1/;
|
|
||||||
/ {
|
|
||||||
fragment@0 {
|
|
||||||
target-path = "i2c";
|
|
||||||
__overlay__ {
|
|
||||||
#address-cells = <1>;
|
|
||||||
#size-cells = <0>;
|
|
||||||
tda19988 {
|
|
||||||
compatible = "nxp,tda998x";
|
|
||||||
reg = <0x70>;
|
|
||||||
status = "okay";
|
|
||||||
|
|
||||||
port {
|
|
||||||
hdmi_0: endpoint@0 {
|
|
||||||
remote-endpoint = <&lcd_0>;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
fragment@1 {
|
|
||||||
target-path = "lcdc";
|
|
||||||
__overlay__ {
|
|
||||||
port {
|
|
||||||
lcd_0: endpoint@0 {
|
|
||||||
remote-endpoint = <&hdmi_0>;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
__local_fixups__ {
|
|
||||||
fragment@0 {
|
|
||||||
__overlay__ {
|
|
||||||
tda19988 {
|
|
||||||
port {
|
|
||||||
endpoint@0 {
|
|
||||||
remote-endpoint = <0>;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
fragment@1 {
|
|
||||||
__overlay__ {
|
|
||||||
port {
|
|
||||||
endpoint@0 {
|
|
||||||
remote-endpoint = <0>;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2015 Texas Instruments
|
|
||||||
* Author: Jyri Sarha <jsarha@ti.com>
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify it
|
|
||||||
* under the terms of the GNU General Public License version 2 as published by
|
|
||||||
* the Free Software Foundation.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
||||||
* more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License along with
|
|
||||||
* this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
/* This header declares the symbols defined in tilcdc_slave_compat.dts */
|
|
||||||
|
|
||||||
#ifndef __TILCDC_SLAVE_COMPAT_H__
|
|
||||||
#define __TILCDC_SLAVE_COMPAT_H__
|
|
||||||
|
|
||||||
extern uint8_t __dtb_tilcdc_slave_compat_begin[];
|
|
||||||
extern uint8_t __dtb_tilcdc_slave_compat_end[];
|
|
||||||
|
|
||||||
#endif /* __TILCDC_SLAVE_COMPAT_H__ */
|
|
||||||
Loading…
Reference in New Issue