Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0828c100 authored by Jeffrey Hugo's avatar Jeffrey Hugo Committed by Dmitry Torokhov
Browse files

Input: elan_i2c - export the device id whitelist 



Elan_i2c and hid-quirks work in conjunction to decide which devices each
driver will handle.  Elan_i2c has a whitelist of devices that should be
consumed by hid-quirks so that there is one master list of devices to
handoff between the drivers.  Put the ids in a header file so that
hid-quirks can consume it instead of duplicating the list.

Signed-off-by: default avatarJeffrey Hugo <jeffrey.l.hugo@gmail.com>
Acked-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 1b9c698c

drivers/input/mouse/elan_i2c_core.c

+1 −49
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/completion.h>

#include <linux/of.h>

#include <linux/property.h>

#include <linux/input/elan-i2c-ids.h>

#include <linux/regulator/consumer.h>

#include <asm/unaligned.h>
@@ -1375,55 +1376,6 @@ static const struct i2c_device_id elan_id[] = { 
MODULE_DEVICE_TABLE(i2c, elan_id);



#ifdef CONFIG_ACPI

static const struct acpi_device_id elan_acpi_id[] = {

	{ "ELAN0000", 0 },

	{ "ELAN0100", 0 },

	{ "ELAN0600", 0 },

	{ "ELAN0601", 0 },

	{ "ELAN0602", 0 },

	{ "ELAN0603", 0 },

	{ "ELAN0604", 0 },

	{ "ELAN0605", 0 },

	{ "ELAN0606", 0 },

	{ "ELAN0607", 0 },

	{ "ELAN0608", 0 },

	{ "ELAN0609", 0 },

	{ "ELAN060B", 0 },

	{ "ELAN060C", 0 },

	{ "ELAN060F", 0 },

	{ "ELAN0610", 0 },

	{ "ELAN0611", 0 },

	{ "ELAN0612", 0 },

	{ "ELAN0615", 0 },

	{ "ELAN0616", 0 },

	{ "ELAN0617", 0 },

	{ "ELAN0618", 0 },

	{ "ELAN0619", 0 },

	{ "ELAN061A", 0 },

	{ "ELAN061B", 0 },

	{ "ELAN061C", 0 },

	{ "ELAN061D", 0 },

	{ "ELAN061E", 0 },

	{ "ELAN061F", 0 },

	{ "ELAN0620", 0 },

	{ "ELAN0621", 0 },

	{ "ELAN0622", 0 },

	{ "ELAN0623", 0 },

	{ "ELAN0624", 0 },

	{ "ELAN0625", 0 },

	{ "ELAN0626", 0 },

	{ "ELAN0627", 0 },

	{ "ELAN0628", 0 },

	{ "ELAN0629", 0 },

	{ "ELAN062A", 0 },

	{ "ELAN062B", 0 },

	{ "ELAN062C", 0 },

	{ "ELAN062D", 0 },

	{ "ELAN0631", 0 },

	{ "ELAN0632", 0 },

	{ "ELAN1000", 0 },

	{ }

};

MODULE_DEVICE_TABLE(acpi, elan_acpi_id);

#endif

include/linux/input/elan-i2c-ids.h

0 → 100644
+76 −0
Original line number Diff line number Diff line 
/*

 * Elan I2C/SMBus Touchpad device whitelist

 *

 * Copyright (c) 2013 ELAN Microelectronics Corp.

 *

 * Author: æ維 (Duson Lin) <dusonlin@emc.com.tw>

 * Author: KT Liao <kt.liao@emc.com.tw>

 * Version: 1.6.3

 *

 * Based on cyapa driver:

 * copyright (c) 2011-2012 Cypress Semiconductor, Inc.

 * copyright (c) 2011-2012 Google, Inc.

 *

 * 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.

 *

 * Trademarks are the property of their respective owners.

 */



#ifndef __ELAN_I2C_IDS_H

#define __ELAN_I2C_IDS_H



#include <linux/mod_devicetable.h>



static const struct acpi_device_id elan_acpi_id[] = {

	{ "ELAN0000", 0 },

	{ "ELAN0100", 0 },

	{ "ELAN0600", 0 },

	{ "ELAN0601", 0 },

	{ "ELAN0602", 0 },

	{ "ELAN0603", 0 },

	{ "ELAN0604", 0 },

	{ "ELAN0605", 0 },

	{ "ELAN0606", 0 },

	{ "ELAN0607", 0 },

	{ "ELAN0608", 0 },

	{ "ELAN0609", 0 },

	{ "ELAN060B", 0 },

	{ "ELAN060C", 0 },

	{ "ELAN060F", 0 },

	{ "ELAN0610", 0 },

	{ "ELAN0611", 0 },

	{ "ELAN0612", 0 },

	{ "ELAN0615", 0 },

	{ "ELAN0616", 0 },

	{ "ELAN0617", 0 },

	{ "ELAN0618", 0 },

	{ "ELAN0619", 0 },

	{ "ELAN061A", 0 },

	{ "ELAN061B", 0 },

	{ "ELAN061C", 0 },

	{ "ELAN061D", 0 },

	{ "ELAN061E", 0 },

	{ "ELAN061F", 0 },

	{ "ELAN0620", 0 },

	{ "ELAN0621", 0 },

	{ "ELAN0622", 0 },

	{ "ELAN0623", 0 },

	{ "ELAN0624", 0 },

	{ "ELAN0625", 0 },

	{ "ELAN0626", 0 },

	{ "ELAN0627", 0 },

	{ "ELAN0628", 0 },

	{ "ELAN0629", 0 },

	{ "ELAN062A", 0 },

	{ "ELAN062B", 0 },

	{ "ELAN062C", 0 },

	{ "ELAN062D", 0 },

	{ "ELAN0631", 0 },

	{ "ELAN0632", 0 },

	{ "ELAN1000", 0 },

	{ }

};



#endif /* __ELAN_I2C_IDS_H */