mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 23:27:06 +00:00
Code Issues Releases Wiki Activity

input: clps711x-keypad: Changing the compatibility string to match with the smallest supported chip

Browse source 
This patch changes the compatibility string to match with the smallest
supported chip (EP7209). Since the DT-support for this CPU is not yet
announced, this change is safe.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Alexander Shiyan 2016-06-04 10:10:01 +03:00 committed by Arnd Bergmann
parent ba60ae1dc0
commit e7c38f221f
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Documentation/devicetree/bindings/input/clps711x-keypad.txt
View file

@ -1,7 +1,7 @@
* Cirrus Logic CLPS711X matrix keypad device tree bindings * Cirrus Logic CLPS711X matrix keypad device tree bindings
Required Properties: Required Properties:
- compatible: Shall contain "cirrus,clps711x-keypad". - compatible: Shall contain "cirrus,ep7209-keypad".
- row-gpios: List of GPIOs used as row lines. - row-gpios: List of GPIOs used as row lines.
- poll-interval: Poll interval time in milliseconds. - poll-interval: Poll interval time in milliseconds.
- linux,keymap: The definition can be found at - linux,keymap: The definition can be found at
@ -12,7 +12,7 @@ Optional Properties:
Example: Example:
keypad { keypad {
compatible = "cirrus,ep7312-keypad", "cirrus,clps711x-keypad"; compatible = "cirrus,ep7312-keypad", "cirrus,ep7209-keypad";
autorepeat; autorepeat;
poll-interval = <120>; poll-interval = <120>;
row-gpios = <&porta 0 0>, row-gpios = <&porta 0 0>,

4
drivers/input/keyboard/clps711x-keypad.c
View file

@ -101,7 +101,7 @@ static int clps711x_keypad_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
priv->syscon = priv->syscon =
syscon_regmap_lookup_by_compatible("cirrus,clps711x-syscon1"); syscon_regmap_lookup_by_compatible("cirrus,ep7209-syscon1");
if (IS_ERR(priv->syscon)) if (IS_ERR(priv->syscon))
return PTR_ERR(priv->syscon); return PTR_ERR(priv->syscon);
@ -181,7 +181,7 @@ static int clps711x_keypad_remove(struct platform_device *pdev)
} }
static const struct of_device_id clps711x_keypad_of_match[] = { static const struct of_device_id clps711x_keypad_of_match[] = {
{ .compatible = "cirrus,clps711x-keypad", }, { .compatible = "cirrus,ep7209-keypad", },
{ } { }
}; };
MODULE_DEVICE_TABLE(of, clps711x_keypad_of_match); MODULE_DEVICE_TABLE(of, clps711x_keypad_of_match);