Skip to content

Commit

Permalink
platform/x86: Rename silead_dmi to touchscreen_dmi
Browse files Browse the repository at this point in the history 
Not only silead touchscreens need some extra info not available in the
ACPI tables to work properly. X86 devices with a Chipone ICN8505 chip also
need some DMI based extra configuration.

There is no reason to have separate dmi config code per touchscreen
controller vendor. This commit renames silead_dmi to a more generic
touchscreen_dmi name (and Kconfig option) in preparation of adding
info for tablets with an ICN8505 based touchscreen.

Note there are no functional changes all code changes are limited to
removing references to silead where these are no longer applicable.

Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  • Loading branch information
Hans de Goede authored and Andy Shevchenko committed Jul 2, 2018
1 parent b4c8681 commit 7442178
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 47 deletions.
2 changes: 1 addition & 1 deletion MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12951,7 +12951,7 @@ L: linux-input@vger.kernel.org
L: platform-driver-x86@vger.kernel.org
S: Maintained
F: drivers/input/touchscreen/silead.c
F: drivers/platform/x86/silead_dmi.c
F: drivers/platform/x86/touchscreen_dmi.c

SILICON MOTION SM712 FRAME BUFFER DRIVER
M: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Expand Down
16 changes: 8 additions & 8 deletions drivers/platform/x86/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1196,16 +1196,16 @@ config INTEL_TURBO_MAX_3
This driver is only required when the system is not using Hardware
P-States (HWP). In HWP mode, priority can be read from ACPI tables.

config SILEAD_DMI
bool "Tablets with Silead touchscreens"
config TOUCHSCREEN_DMI
bool "DMI based touchscreen configuration info"
depends on ACPI && DMI && I2C=y && TOUCHSCREEN_SILEAD
---help---
Certain ACPI based tablets with Silead touchscreens do not have
enough data in ACPI tables for the touchscreen driver to handle
the touchscreen properly, as OEMs expected the data to be baked
into the tablet model specific version of the driver shipped
with the OS-image for the device. This option supplies the missing
information. Enable this for x86 tablets with Silead touchscreens.
Certain ACPI based tablets with e.g. Silead or Chipone touchscreens
do not have enough data in ACPI tables for the touchscreen driver to
handle the touchscreen properly, as OEMs expect the data to be baked
into the tablet model specific version of the driver shipped with the
the OS-image for the device. This option supplies the missing info.
Enable this for x86 tablets with Silead or Chipone touchscreens.

config INTEL_CHTDC_TI_PWRBTN
tristate "Intel Cherry Trail Dollar Cove TI power button driver"
Expand Down
2 changes: 1 addition & 1 deletion drivers/platform/x86/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ obj-$(CONFIG_INTEL_SMARTCONNECT) += intel-smartconnect.o
obj-$(CONFIG_PVPANIC) += pvpanic.o
obj-$(CONFIG_ALIENWARE_WMI) += alienware-wmi.o
obj-$(CONFIG_INTEL_PMC_IPC) += intel_pmc_ipc.o
obj-$(CONFIG_SILEAD_DMI) += silead_dmi.o
obj-$(CONFIG_TOUCHSCREEN_DMI) += touchscreen_dmi.o
obj-$(CONFIG_SURFACE_PRO3_BUTTON) += surfacepro3_button.o
obj-$(CONFIG_SURFACE_3_BUTTON) += surface3_button.o
obj-$(CONFIG_INTEL_PUNIT_IPC) += intel_punit_ipc.o
Expand Down
74 changes: 37 additions & 37 deletions drivers/platform/x86/silead_dmi.c → drivers/platform/x86/touchscreen_dmi.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Silead touchscreen driver DMI based configuration code
* Touchscreen driver DMI based configuration code
*
* Copyright (c) 2017 Red Hat Inc.
*
Expand All @@ -20,7 +20,7 @@
#include <linux/property.h>
#include <linux/string.h>

struct silead_ts_dmi_data {
struct ts_dmi_data {
const char *acpi_name;
const struct property_entry *properties;
};
Expand All @@ -36,7 +36,7 @@ static const struct property_entry chuwi_hi8_props[] = {
{ }
};

static const struct silead_ts_dmi_data chuwi_hi8_data = {
static const struct ts_dmi_data chuwi_hi8_data = {
.acpi_name = "MSSL0001:00",
.properties = chuwi_hi8_props,
};
Expand All @@ -50,7 +50,7 @@ static const struct property_entry chuwi_hi8_pro_props[] = {
{ }
};

static const struct silead_ts_dmi_data chuwi_hi8_pro_data = {
static const struct ts_dmi_data chuwi_hi8_pro_data = {
.acpi_name = "MSSL1680:00",
.properties = chuwi_hi8_pro_props,
};
Expand All @@ -65,7 +65,7 @@ static const struct property_entry chuwi_vi8_props[] = {
{ }
};

static const struct silead_ts_dmi_data chuwi_vi8_data = {
static const struct ts_dmi_data chuwi_vi8_data = {
.acpi_name = "MSSL1680:00",
.properties = chuwi_vi8_props,
};
Expand All @@ -81,7 +81,7 @@ static const struct property_entry chuwi_vi10_props[] = {
{ }
};

static const struct silead_ts_dmi_data chuwi_vi10_data = {
static const struct ts_dmi_data chuwi_vi10_data = {
.acpi_name = "MSSL0002:00",
.properties = chuwi_vi10_props,
};
Expand All @@ -95,7 +95,7 @@ static const struct property_entry cube_iwork8_air_props[] = {
{ }
};

static const struct silead_ts_dmi_data cube_iwork8_air_data = {
static const struct ts_dmi_data cube_iwork8_air_data = {
.acpi_name = "MSSL1680:00",
.properties = cube_iwork8_air_props,
};
Expand All @@ -109,7 +109,7 @@ static const struct property_entry dexp_ursus_7w_props[] = {
{ }
};

static const struct silead_ts_dmi_data dexp_ursus_7w_data = {
static const struct ts_dmi_data dexp_ursus_7w_data = {
.acpi_name = "MSSL1680:00",
.properties = dexp_ursus_7w_props,
};
Expand All @@ -125,7 +125,7 @@ static const struct property_entry digma_citi_e200_props[] = {
{ }
};

static const struct silead_ts_dmi_data digma_citi_e200_data = {
static const struct ts_dmi_data digma_citi_e200_data = {
.acpi_name = "MSSL1680:00",
.properties = digma_citi_e200_props,
};
Expand All @@ -140,7 +140,7 @@ static const struct property_entry gp_electronic_t701_props[] = {
{ }
};

static const struct silead_ts_dmi_data gp_electronic_t701_data = {
static const struct ts_dmi_data gp_electronic_t701_data = {
.acpi_name = "MSSL1680:00",
.properties = gp_electronic_t701_props,
};
Expand All @@ -154,7 +154,7 @@ static const struct property_entry itworks_tw891_props[] = {
{ }
};

static const struct silead_ts_dmi_data itworks_tw891_data = {
static const struct ts_dmi_data itworks_tw891_data = {
.acpi_name = "MSSL1680:00",
.properties = itworks_tw891_props,
};
Expand All @@ -168,7 +168,7 @@ static const struct property_entry jumper_ezpad_6_pro_props[] = {
{ }
};

static const struct silead_ts_dmi_data jumper_ezpad_6_pro_data = {
static const struct ts_dmi_data jumper_ezpad_6_pro_data = {
.acpi_name = "MSSL1680:00",
.properties = jumper_ezpad_6_pro_props,
};
Expand All @@ -182,7 +182,7 @@ static const struct property_entry jumper_ezpad_mini3_props[] = {
{ }
};

static const struct silead_ts_dmi_data jumper_ezpad_mini3_data = {
static const struct ts_dmi_data jumper_ezpad_mini3_data = {
.acpi_name = "MSSL1680:00",
.properties = jumper_ezpad_mini3_props,
};
Expand All @@ -199,7 +199,7 @@ static const struct property_entry onda_obook_20_plus_props[] = {
{ }
};

static const struct silead_ts_dmi_data onda_obook_20_plus_data = {
static const struct ts_dmi_data onda_obook_20_plus_data = {
.acpi_name = "MSSL1680:00",
.properties = onda_obook_20_plus_props,
};
Expand All @@ -216,7 +216,7 @@ static const struct property_entry onda_v891w_v1_props[] = {
{ }
};

static const struct silead_ts_dmi_data onda_v891w_v1_data = {
static const struct ts_dmi_data onda_v891w_v1_data = {
.acpi_name = "MSSL1680:00",
.properties = onda_v891w_v1_props,
};
Expand All @@ -231,7 +231,7 @@ static const struct property_entry pipo_w2s_props[] = {
{ }
};

static const struct silead_ts_dmi_data pipo_w2s_data = {
static const struct ts_dmi_data pipo_w2s_data = {
.acpi_name = "MSSL1680:00",
.properties = pipo_w2s_props,
};
Expand All @@ -249,7 +249,7 @@ static const struct property_entry pov_mobii_wintab_p800w_v20_props[] = {
{ }
};

static const struct silead_ts_dmi_data pov_mobii_wintab_p800w_v20_data = {
static const struct ts_dmi_data pov_mobii_wintab_p800w_v20_data = {
.acpi_name = "MSSL1680:00",
.properties = pov_mobii_wintab_p800w_v20_props,
};
Expand All @@ -264,7 +264,7 @@ static const struct property_entry pov_mobii_wintab_p800w_v21_props[] = {
{ }
};

static const struct silead_ts_dmi_data pov_mobii_wintab_p800w_v21_data = {
static const struct ts_dmi_data pov_mobii_wintab_p800w_v21_data = {
.acpi_name = "MSSL1680:00",
.properties = pov_mobii_wintab_p800w_v21_props,
};
Expand All @@ -278,7 +278,7 @@ static const struct property_entry teclast_x3_plus_props[] = {
{ }
};

static const struct silead_ts_dmi_data teclast_x3_plus_data = {
static const struct ts_dmi_data teclast_x3_plus_data = {
.acpi_name = "MSSL1680:00",
.properties = teclast_x3_plus_props,
};
Expand All @@ -294,7 +294,7 @@ static const struct property_entry teclast_x98plus2_props[] = {
{ }
};

static const struct silead_ts_dmi_data teclast_x98plus2_data = {
static const struct ts_dmi_data teclast_x98plus2_data = {
.acpi_name = "MSSL1680:00",
.properties = teclast_x98plus2_props,
};
Expand All @@ -309,7 +309,7 @@ static const struct property_entry trekstor_primebook_c13_props[] = {
{ }
};

static const struct silead_ts_dmi_data trekstor_primebook_c13_data = {
static const struct ts_dmi_data trekstor_primebook_c13_data = {
.acpi_name = "MSSL1680:00",
.properties = trekstor_primebook_c13_props,
};
Expand All @@ -324,7 +324,7 @@ static const struct property_entry trekstor_surftab_twin_10_1_props[] = {
{ }
};

static const struct silead_ts_dmi_data trekstor_surftab_twin_10_1_data = {
static const struct ts_dmi_data trekstor_surftab_twin_10_1_data = {
.acpi_name = "MSSL1680:00",
.properties = trekstor_surftab_twin_10_1_props,
};
Expand All @@ -339,13 +339,13 @@ static const struct property_entry trekstor_surftab_wintron70_props[] = {
{ }
};

static const struct silead_ts_dmi_data trekstor_surftab_wintron70_data = {
static const struct ts_dmi_data trekstor_surftab_wintron70_data = {
.acpi_name = "MSSL1680:00",
.properties = trekstor_surftab_wintron70_props,
};

/* NOTE: Please keep this table sorted alphabetically */
static const struct dmi_system_id silead_ts_dmi_table[] = {
static const struct dmi_system_id touchscreen_dmi_table[] = {
{
/* Chuwi Hi8 */
.driver_data = (void *)&chuwi_hi8_data,
Expand Down Expand Up @@ -586,22 +586,22 @@ static const struct dmi_system_id silead_ts_dmi_table[] = {
{ },
};

static const struct silead_ts_dmi_data *silead_ts_data;
static const struct ts_dmi_data *ts_data;

static void silead_ts_dmi_add_props(struct i2c_client *client)
static void ts_dmi_add_props(struct i2c_client *client)
{
struct device *dev = &client->dev;
int error;

if (has_acpi_companion(dev) &&
!strncmp(silead_ts_data->acpi_name, client->name, I2C_NAME_SIZE)) {
error = device_add_properties(dev, silead_ts_data->properties);
!strncmp(ts_data->acpi_name, client->name, I2C_NAME_SIZE)) {
error = device_add_properties(dev, ts_data->properties);
if (error)
dev_err(dev, "failed to add properties: %d\n", error);
}
}

static int silead_ts_dmi_notifier_call(struct notifier_block *nb,
static int ts_dmi_notifier_call(struct notifier_block *nb,
unsigned long action, void *data)
{
struct device *dev = data;
Expand All @@ -611,7 +611,7 @@ static int silead_ts_dmi_notifier_call(struct notifier_block *nb,
case BUS_NOTIFY_ADD_DEVICE:
client = i2c_verify_client(dev);
if (client)
silead_ts_dmi_add_props(client);
ts_dmi_add_props(client);
break;

default:
Expand All @@ -621,22 +621,22 @@ static int silead_ts_dmi_notifier_call(struct notifier_block *nb,
return 0;
}

static struct notifier_block silead_ts_dmi_notifier = {
.notifier_call = silead_ts_dmi_notifier_call,
static struct notifier_block ts_dmi_notifier = {
.notifier_call = ts_dmi_notifier_call,
};

static int __init silead_ts_dmi_init(void)
static int __init ts_dmi_init(void)
{
const struct dmi_system_id *dmi_id;
int error;

dmi_id = dmi_first_match(silead_ts_dmi_table);
dmi_id = dmi_first_match(touchscreen_dmi_table);
if (!dmi_id)
return 0; /* Not an error */

silead_ts_data = dmi_id->driver_data;
ts_data = dmi_id->driver_data;

error = bus_register_notifier(&i2c_bus_type, &silead_ts_dmi_notifier);
error = bus_register_notifier(&i2c_bus_type, &ts_dmi_notifier);
if (error)
pr_err("%s: failed to register i2c bus notifier: %d\n",
__func__, error);
Expand All @@ -649,4 +649,4 @@ static int __init silead_ts_dmi_init(void)
* itself is ready (which happens at postcore initcall level), but before
* ACPI starts enumerating devices (at subsys initcall level).
*/
arch_initcall(silead_ts_dmi_init);
arch_initcall(ts_dmi_init);

0 comments on commit 7442178

Please sign in to comment.