The Palmas device contains only a USB VID detector, so modified the
compatible type to *ti,palmas-usb-vid*.
Signed-off-by: Kishon Vijay Abraham I <[email protected]>
---
Changes from v1:
* removed the existing compatible types and changed it to *ti,palmas-usb-vid*
Documentation/devicetree/bindings/extcon/extcon-palmas.txt | 4 ++--
drivers/extcon/extcon-palmas.c | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Documentation/devicetree/bindings/extcon/extcon-palmas.txt b/Documentation/devicetree/bindings/extcon/extcon-palmas.txt
index 7dab6a8..00859f6 100644
--- a/Documentation/devicetree/bindings/extcon/extcon-palmas.txt
+++ b/Documentation/devicetree/bindings/extcon/extcon-palmas.txt
@@ -2,7 +2,7 @@ EXTCON FOR PALMAS/TWL CHIPS
PALMAS USB COMPARATOR
Required Properties:
- - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb"
+ - compatible : Should be "ti,palmas-usb-vid".
Optional Properties:
- ti,wakeup : To enable the wakeup comparator in probe
@@ -10,6 +10,6 @@ Optional Properties:
- ti,enable-vbus-detection: Perform VBUS detection.
palmas-usb {
- compatible = "ti,twl6035-usb", "ti,palmas-usb";
+ compatible = "ti,palmas-usb-vid";
ti,wakeup;
};
diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c
index 89fdd05..f3ed2d7 100644
--- a/drivers/extcon/extcon-palmas.c
+++ b/drivers/extcon/extcon-palmas.c
@@ -267,8 +267,7 @@ static const struct dev_pm_ops palmas_pm_ops = {
};
static struct of_device_id of_palmas_match_tbl[] = {
- { .compatible = "ti,palmas-usb", },
- { .compatible = "ti,twl6035-usb", },
+ { .compatible = "ti,palmas-usb-vid", },
{ /* end */ }
};
--
1.7.10.4
On 08/16/2013 04:20 AM, Kishon Vijay Abraham I wrote:
> The Palmas device contains only a USB VID detector, so modified the
> compatible type to *ti,palmas-usb-vid*.
> diff --git a/Documentation/devicetree/bindings/extcon/extcon-palmas.txt b/Documentation/devicetree/bindings/extcon/extcon-palmas.txt
> PALMAS USB COMPARATOR
> Required Properties:
> - - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb"
> + - compatible : Should be "ti,palmas-usb-vid".
Has the old value been published in a release kernel? If so, it makes
sense to document both values, but say the old one is deprecated, and ...
> diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c
> static struct of_device_id of_palmas_match_tbl[] = {
> - { .compatible = "ti,palmas-usb", },
> - { .compatible = "ti,twl6035-usb", },
> + { .compatible = "ti,palmas-usb-vid", },
... perhaps just add the new value here, and don't remove the old values?
If not, ignore this.
Hi,
On Saturday 17 August 2013 03:51 AM, Stephen Warren wrote:
> On 08/16/2013 04:20 AM, Kishon Vijay Abraham I wrote:
>> The Palmas device contains only a USB VID detector, so modified the
>> compatible type to *ti,palmas-usb-vid*.
>
>> diff --git a/Documentation/devicetree/bindings/extcon/extcon-palmas.txt b/Documentation/devicetree/bindings/extcon/extcon-palmas.txt
>
>> PALMAS USB COMPARATOR
>> Required Properties:
>> - - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb"
>> + - compatible : Should be "ti,palmas-usb-vid".
>
> Has the old value been published in a release kernel? If so, it makes
No. This was merged only in 3.11-rc1. So I think we should take this version?
Chanwoo can you take this patch?
Thanks
Kishon
On 08/19/2013 02:05 PM, Kishon Vijay Abraham I wrote:
> Hi,
>
> On Saturday 17 August 2013 03:51 AM, Stephen Warren wrote:
>> On 08/16/2013 04:20 AM, Kishon Vijay Abraham I wrote:
>>> The Palmas device contains only a USB VID detector, so modified the
>>> compatible type to *ti,palmas-usb-vid*.
>>
>>> diff --git a/Documentation/devicetree/bindings/extcon/extcon-palmas.txt b/Documentation/devicetree/bindings/extcon/extcon-palmas.txt
>>
>>> PALMAS USB COMPARATOR
>>> Required Properties:
>>> - - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb"
>>> + - compatible : Should be "ti,palmas-usb-vid".
>>
>> Has the old value been published in a release kernel? If so, it makes
>
> No. This was merged only in 3.11-rc1. So I think we should take this version?
> Chanwoo can you take this patch?
>
This patch will be included in 3.12-rc* after 3.12-rc1.
and this patch is applied on extcon-linus branch.
Thanks,
Chanwoo Choi
On Monday 19 August 2013 10:35 AM, Kishon Vijay Abraham I wrote:
> Hi,
>
> On Saturday 17 August 2013 03:51 AM, Stephen Warren wrote:
>> On 08/16/2013 04:20 AM, Kishon Vijay Abraham I wrote:
>>> The Palmas device contains only a USB VID detector, so modified the
>>> compatible type to *ti,palmas-usb-vid*.
>>
>>> diff --git a/Documentation/devicetree/bindings/extcon/extcon-palmas.txt b/Documentation/devicetree/bindings/extcon/extcon-palmas.txt
>>
>>> PALMAS USB COMPARATOR
>>> Required Properties:
>>> - - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb"
>>> + - compatible : Should be "ti,palmas-usb-vid".
>>
>> Has the old value been published in a release kernel? If so, it makes
>
> No. This was merged only in 3.11-rc1. So I think we should take this version?
> Chanwoo can you take this patch?
Ah.. the old values will be part of 3.11 kernel. So should we retain the old
values?
-Kishon
On 08/19/2013 05:47 PM, Kishon Vijay Abraham I wrote:
> On Monday 19 August 2013 10:35 AM, Kishon Vijay Abraham I wrote:
>> Hi,
>>
>> On Saturday 17 August 2013 03:51 AM, Stephen Warren wrote:
>>> On 08/16/2013 04:20 AM, Kishon Vijay Abraham I wrote:
>>>> The Palmas device contains only a USB VID detector, so modified the
>>>> compatible type to *ti,palmas-usb-vid*.
>>>
>>>> diff --git a/Documentation/devicetree/bindings/extcon/extcon-palmas.txt b/Documentation/devicetree/bindings/extcon/extcon-palmas.txt
>>>
>>>> PALMAS USB COMPARATOR
>>>> Required Properties:
>>>> - - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb"
>>>> + - compatible : Should be "ti,palmas-usb-vid".
>>>
>>> Has the old value been published in a release kernel? If so, it makes
>>
>> No. This was merged only in 3.11-rc1. So I think we should take this version?
>> Chanwoo can you take this patch?
>
> Ah.. the old values will be part of 3.11 kernel. So should we retain the old
> values?
What is the meaning of old value? previous value related to extcon-twl.txt?
The extcon-twl.txt was included in 3.11 kernel
and extcon-palmas.txt will be inclued in 3.12 kernel through char-misc repo of GregKH.
Thanks,
Chanwoo Choi
On Monday 19 August 2013 02:54 PM, Chanwoo Choi wrote:
> On 08/19/2013 05:47 PM, Kishon Vijay Abraham I wrote:
>> On Monday 19 August 2013 10:35 AM, Kishon Vijay Abraham I wrote:
>>> Hi,
>>>
>>> On Saturday 17 August 2013 03:51 AM, Stephen Warren wrote:
>>>> On 08/16/2013 04:20 AM, Kishon Vijay Abraham I wrote:
>>>>> The Palmas device contains only a USB VID detector, so modified the
>>>>> compatible type to *ti,palmas-usb-vid*.
>>>>
>>>>> diff --git a/Documentation/devicetree/bindings/extcon/extcon-palmas.txt b/Documentation/devicetree/bindings/extcon/extcon-palmas.txt
>>>>
>>>>> PALMAS USB COMPARATOR
>>>>> Required Properties:
>>>>> - - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb"
>>>>> + - compatible : Should be "ti,palmas-usb-vid".
>>>>
>>>> Has the old value been published in a release kernel? If so, it makes
>>>
>>> No. This was merged only in 3.11-rc1. So I think we should take this version?
>>> Chanwoo can you take this patch?
>>
>> Ah.. the old values will be part of 3.11 kernel. So should we retain the old
>> values?
>
> What is the meaning of old value? previous value related to extcon-twl.txt?
We were discussing on whether to have "ti,palmas-usb" or "ti,twl6035-usb" in
compatible value in addition to "ti,palmas-usb-vid". Stephen wanted the old
values ("ti,palmas-usb" or "ti,twl6035-usb") if it has been published in a
release kernel.
>
> The extcon-twl.txt was included in 3.11 kernel
Right. Since it's part of 3.11 kernel, I think we should retain the old
compatible values.
Thanks
Kishon
Hi Kishon,
On 19/08/2013 11:29, Kishon Vijay Abraham I wrote:
> On Monday 19 August 2013 02:54 PM, Chanwoo Choi wrote:
>> On 08/19/2013 05:47 PM, Kishon Vijay Abraham I wrote:
>>> On Monday 19 August 2013 10:35 AM, Kishon Vijay Abraham I wrote:
>>>> Hi,
>>>>
>>>> On Saturday 17 August 2013 03:51 AM, Stephen Warren wrote:
>>>>> On 08/16/2013 04:20 AM, Kishon Vijay Abraham I wrote:
>>>>>> The Palmas device contains only a USB VID detector, so modified the
>>>>>> compatible type to *ti,palmas-usb-vid*.
>>>>>
>>>>>> diff --git a/Documentation/devicetree/bindings/extcon/extcon-palmas.txt b/Documentation/devicetree/bindings/extcon/extcon-palmas.txt
That file is not yet in 3.11. Only the twl is there.
Is this one a rename of the twl one?
Regards,
Benoit
>>>>>
>>>>>> PALMAS USB COMPARATOR
>>>>>> Required Properties:
>>>>>> - - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb"
>>>>>> + - compatible : Should be "ti,palmas-usb-vid".
>>>>>
>>>>> Has the old value been published in a release kernel? If so, it makes
>>>>
>>>> No. This was merged only in 3.11-rc1. So I think we should take this version?
>>>> Chanwoo can you take this patch?
>>>
>>> Ah.. the old values will be part of 3.11 kernel. So should we retain the old
>>> values?
>>
>> What is the meaning of old value? previous value related to extcon-twl.txt?
>
> We were discussing on whether to have "ti,palmas-usb" or "ti,twl6035-usb" in
> compatible value in addition to "ti,palmas-usb-vid". Stephen wanted the old
> values ("ti,palmas-usb" or "ti,twl6035-usb") if it has been published in a
> release kernel.
>>
>> The extcon-twl.txt was included in 3.11 kernel
>
> Right. Since it's part of 3.11 kernel, I think we should retain the old
> compatible values.
>
> Thanks
> Kishon
>
On Monday 19 August 2013 03:51 PM, Benoit Cousson wrote:
> Hi Kishon,
>
> On 19/08/2013 11:29, Kishon Vijay Abraham I wrote:
>> On Monday 19 August 2013 02:54 PM, Chanwoo Choi wrote:
>>> On 08/19/2013 05:47 PM, Kishon Vijay Abraham I wrote:
>>>> On Monday 19 August 2013 10:35 AM, Kishon Vijay Abraham I wrote:
>>>>> Hi,
>>>>>
>>>>> On Saturday 17 August 2013 03:51 AM, Stephen Warren wrote:
>>>>>> On 08/16/2013 04:20 AM, Kishon Vijay Abraham I wrote:
>>>>>>> The Palmas device contains only a USB VID detector, so modified the
>>>>>>> compatible type to *ti,palmas-usb-vid*.
>>>>>>
>>>>>>> diff --git a/Documentation/devicetree/bindings/extcon/extcon-palmas.txt
>>>>>>> b/Documentation/devicetree/bindings/extcon/extcon-palmas.txt
>
> That file is not yet in 3.11. Only the twl is there.
> Is this one a rename of the twl one?
yes Benoit. This is the commit
http://git.kernel.org/cgit/linux/kernel/git/chanwoo/extcon.git/commit/?h=extcon-next&id=80d644b297dc26c5126858555044edef76f4ffe8
Thanks
Kishon
On 08/18/2013 11:05 PM, Kishon Vijay Abraham I wrote:
> Hi,
>
> On Saturday 17 August 2013 03:51 AM, Stephen Warren wrote:
>> On 08/16/2013 04:20 AM, Kishon Vijay Abraham I wrote:
>>> The Palmas device contains only a USB VID detector, so modified the
>>> compatible type to *ti,palmas-usb-vid*.
>>
>>> diff --git a/Documentation/devicetree/bindings/extcon/extcon-palmas.txt b/Documentation/devicetree/bindings/extcon/extcon-palmas.txt
>>
>>> PALMAS USB COMPARATOR
>>> Required Properties:
>>> - - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb"
>>> + - compatible : Should be "ti,palmas-usb-vid".
>>
>> Has the old value been published in a release kernel? If so, it makes
>
> No. This was merged only in 3.11-rc1. So I think we should take this version?
> Chanwoo can you take this patch?
So anything in 3.11-rc1 will make it into 3.11 final, and hence has
already been published, and hence should be an ABI. This current patch
is only going into 3.12, so really should be amended not to break the ABI.