diff options
| author | Kishon Vijay Abraham I <kishon@ti.com> | 2013-10-10 18:07:27 +0530 |
|---|---|---|
| committer | Chanwoo Choi <cw00.choi@samsung.com> | 2014-01-07 11:54:27 +0900 |
| commit | 5fbc77d6ebd0ab801273085bbf98fdaa66054ad8 (patch) | |
| tree | 35db9ca8dd5dd29d2cfca9c430fdd69ab35cfdeb | |
| parent | 81df63a9a5f98edbfaae70729147a33a3b7690a4 (diff) | |
| download | linux-stable-5fbc77d6ebd0ab801273085bbf98fdaa66054ad8.tar.gz linux-stable-5fbc77d6ebd0ab801273085bbf98fdaa66054ad8.tar.bz2 linux-stable-5fbc77d6ebd0ab801273085bbf98fdaa66054ad8.zip | |
extcon: palmas: Added a new compatible type *ti,palmas-usb-vid*
The Palmas device contains only a USB VBUS-ID detector, so added a
compatible type *ti,palmas-usb-vid*. Didn't remove the existing compatible
types for backward compatibility.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
| -rw-r--r-- | Documentation/devicetree/bindings/extcon/extcon-palmas.txt | 6 | ||||
| -rw-r--r-- | drivers/extcon/extcon-palmas.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/extcon/extcon-palmas.txt b/Documentation/devicetree/bindings/extcon/extcon-palmas.txt index 7dab6a8f4a0e..45414bbcd945 100644 --- a/Documentation/devicetree/bindings/extcon/extcon-palmas.txt +++ b/Documentation/devicetree/bindings/extcon/extcon-palmas.txt @@ -2,7 +2,11 @@ EXTCON FOR PALMAS/TWL CHIPS PALMAS USB COMPARATOR Required Properties: - - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb" + - compatible: should contain one of: + * "ti,palmas-usb-vid". + * "ti,twl6035-usb-vid". + * "ti,palmas-usb" (DEPRECATED - use "ti,palmas-usb-vid"). + * "ti,twl6035-usb" (DEPRECATED - use "ti,twl6035-usb-vid"). Optional Properties: - ti,wakeup : To enable the wakeup comparator in probe diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c index 6c91976dd823..6e83e9a43d12 100644 --- a/drivers/extcon/extcon-palmas.c +++ b/drivers/extcon/extcon-palmas.c @@ -269,7 +269,9 @@ static const struct dev_pm_ops palmas_pm_ops = { static struct of_device_id of_palmas_match_tbl[] = { { .compatible = "ti,palmas-usb", }, + { .compatible = "ti,palmas-usb-vid", }, { .compatible = "ti,twl6035-usb", }, + { .compatible = "ti,twl6035-usb-vid", }, { /* end */ } }; |