| Message ID | 1376372241-15573-1-git-send-email-kishon@ti.com (mailing list archive) |
|---|---|
| State | Under Review |
| Headers | show |
Hi Kishon, On 08/13/2013 02:37 PM, Kishon Vijay Abraham I wrote: > The Palmas device contains only a USB VID detector, so added a > compatible type *ti,palmas-usb-vid*. Dint remove the existing compatible > types for backward compatibility. > > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > --- > Documentation/devicetree/bindings/extcon/extcon-twl.txt | 3 ++- > drivers/extcon/extcon-palmas.c | 1 + > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/extcon/extcon-twl.txt b/Documentation/devicetree/bindings/extcon/extcon-twl.txt > index 58f531a..5be4afc 100644 > --- a/Documentation/devicetree/bindings/extcon/extcon-twl.txt > +++ b/Documentation/devicetree/bindings/extcon/extcon-twl.txt > @@ -2,7 +2,8 @@ EXTCON FOR TWL CHIPS > > PALMAS USB COMPARATOR > Required Properties: > - - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb" > + - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb" or > + "ti,palmas-usb-vid". > - vbus-supply : phandle to the regulator device tree node. > > Optional Properties: > diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c > index b752a0a..4f83fae 100644 > --- a/drivers/extcon/extcon-palmas.c > +++ b/drivers/extcon/extcon-palmas.c > @@ -223,6 +223,7 @@ static int palmas_usb_remove(struct platform_device *pdev) > > static struct of_device_id of_palmas_match_tbl[] = { > { .compatible = "ti,palmas-usb", }, > + { .compatible = "ti,palmas-usb-vid", }, > { .compatible = "ti,twl6035-usb", }, > { /* end */ } > }; > This patch has a conflict. You have to always implement patch on extcon branch including latest patch. You need to resend v2 patch based on extcon-next branch. 'extcon-twl.txt' is renamed as 'extcon-palmas.txt' on following patch: http://git.kernel.org/cgit/linux/kernel/git/chanwoo/extcon.git/commit/?h=extcon-next&id=80d644b297dc26c5126858555044edef76f4ffe8 And, 'vbus-supply' phandle was removed on following patch: http://git.kernel.org/cgit/linux/kernel/git/chanwoo/extcon.git/commit/?h=extcon-next&id=26ece4f0b7d2264282d9077d1843ff1e98189b6c Thanks, Chanwoo Choi -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tuesday 13 August 2013 03:24 PM, Chanwoo Choi wrote: > Hi Kishon, > > On 08/13/2013 02:37 PM, Kishon Vijay Abraham I wrote: >> The Palmas device contains only a USB VID detector, so added a >> compatible type *ti,palmas-usb-vid*. Dint remove the existing compatible >> types for backward compatibility. >> >> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> >> --- >> Documentation/devicetree/bindings/extcon/extcon-twl.txt | 3 ++- >> drivers/extcon/extcon-palmas.c | 1 + >> 2 files changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/Documentation/devicetree/bindings/extcon/extcon-twl.txt b/Documentation/devicetree/bindings/extcon/extcon-twl.txt >> index 58f531a..5be4afc 100644 >> --- a/Documentation/devicetree/bindings/extcon/extcon-twl.txt >> +++ b/Documentation/devicetree/bindings/extcon/extcon-twl.txt >> @@ -2,7 +2,8 @@ EXTCON FOR TWL CHIPS >> >> PALMAS USB COMPARATOR >> Required Properties: >> - - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb" >> + - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb" or >> + "ti,palmas-usb-vid". >> - vbus-supply : phandle to the regulator device tree node. >> >> Optional Properties: >> diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c >> index b752a0a..4f83fae 100644 >> --- a/drivers/extcon/extcon-palmas.c >> +++ b/drivers/extcon/extcon-palmas.c >> @@ -223,6 +223,7 @@ static int palmas_usb_remove(struct platform_device *pdev) >> >> static struct of_device_id of_palmas_match_tbl[] = { >> { .compatible = "ti,palmas-usb", }, >> + { .compatible = "ti,palmas-usb-vid", }, >> { .compatible = "ti,twl6035-usb", }, >> { /* end */ } >> }; >> > > This patch has a conflict. You have to always implement patch on extcon branch > including latest patch. You need to resend v2 patch based on extcon-next branch. > > 'extcon-twl.txt' is renamed as 'extcon-palmas.txt' on following patch: > http://git.kernel.org/cgit/linux/kernel/git/chanwoo/extcon.git/commit/?h=extcon-next&id=80d644b297dc26c5126858555044edef76f4ffe8 > > And, 'vbus-supply' phandle was removed on following patch: > http://git.kernel.org/cgit/linux/kernel/git/chanwoo/extcon.git/commit/?h=extcon-next&id=26ece4f0b7d2264282d9077d1843ff1e98189b6c Alright. I'll send the patch shortly. Thanks Kishon -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 08/12/2013 11:37 PM, Kishon Vijay Abraham I wrote: > The Palmas device contains only a USB VID detector, so added a > compatible type *ti,palmas-usb-vid*. Dint remove the existing compatible s/Dint/Didn't/ > diff --git a/Documentation/devicetree/bindings/extcon/extcon-twl.txt b/Documentation/devicetree/bindings/extcon/extcon-twl.txt > PALMAS USB COMPARATOR > Required Properties: > - - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb" > + - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb" or > + "ti,palmas-usb-vid". So are ti,palmas-usb and ti,twl6035-usb full EHCI controllers then? -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On Wednesday 14 August 2013 12:43 AM, Stephen Warren wrote: > On 08/12/2013 11:37 PM, Kishon Vijay Abraham I wrote: >> The Palmas device contains only a USB VID detector, so added a >> compatible type *ti,palmas-usb-vid*. Dint remove the existing compatible > > s/Dint/Didn't/ > >> diff --git a/Documentation/devicetree/bindings/extcon/extcon-twl.txt b/Documentation/devicetree/bindings/extcon/extcon-twl.txt > >> PALMAS USB COMPARATOR >> Required Properties: >> - - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb" >> + - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb" or >> + "ti,palmas-usb-vid". > > So are ti,palmas-usb and ti,twl6035-usb full EHCI controllers then? No. I thought I shouldn't remove those if someone is already using those compatible value. Thanks Kishon -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 08/13/2013 11:24 PM, Kishon Vijay Abraham I wrote: > Hi, > > On Wednesday 14 August 2013 12:43 AM, Stephen Warren wrote: >> On 08/12/2013 11:37 PM, Kishon Vijay Abraham I wrote: >>> The Palmas device contains only a USB VID detector, so added a >>> compatible type *ti,palmas-usb-vid*. Dint remove the existing compatible >> >> s/Dint/Didn't/ >> >>> diff --git a/Documentation/devicetree/bindings/extcon/extcon-twl.txt b/Documentation/devicetree/bindings/extcon/extcon-twl.txt >> >>> PALMAS USB COMPARATOR >>> Required Properties: >>> - - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb" >>> + - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb" or >>> + "ti,palmas-usb-vid". >> >> So are ti,palmas-usb and ti,twl6035-usb full EHCI controllers then? > > No. I thought I shouldn't remove those if someone is already using those > compatible value. Sigh. Perhaps it's best to be consistent with the existing bad naming then:-( -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Kishon, On 14/08/2013 07:24, Kishon Vijay Abraham I wrote: > Hi, > > On Wednesday 14 August 2013 12:43 AM, Stephen Warren wrote: >> On 08/12/2013 11:37 PM, Kishon Vijay Abraham I wrote: >>> The Palmas device contains only a USB VID detector, so added a >>> compatible type *ti,palmas-usb-vid*. Dint remove the existing compatible >> >> s/Dint/Didn't/ >> >>> diff --git a/Documentation/devicetree/bindings/extcon/extcon-twl.txt b/Documentation/devicetree/bindings/extcon/extcon-twl.txt >> >>> PALMAS USB COMPARATOR >>> Required Properties: >>> - - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb" >>> + - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb" or >>> + "ti,palmas-usb-vid". >> >> So are ti,palmas-usb and ti,twl6035-usb full EHCI controllers then? > > No. I thought I shouldn't remove those if someone is already using those > compatible value. Well, I think we still have a short period of time where we can clean some badly defined bindings before it is really too late. Both kernel and DTS are still in sync for the moment, so changing both at the same time should be safe. Regards, Benoit -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/extcon/extcon-twl.txt b/Documentation/devicetree/bindings/extcon/extcon-twl.txt index 58f531a..5be4afc 100644 --- a/Documentation/devicetree/bindings/extcon/extcon-twl.txt +++ b/Documentation/devicetree/bindings/extcon/extcon-twl.txt @@ -2,7 +2,8 @@ EXTCON FOR TWL CHIPS PALMAS USB COMPARATOR Required Properties: - - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb" + - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb" or + "ti,palmas-usb-vid". - vbus-supply : phandle to the regulator device tree node. Optional Properties: diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c index b752a0a..4f83fae 100644 --- a/drivers/extcon/extcon-palmas.c +++ b/drivers/extcon/extcon-palmas.c @@ -223,6 +223,7 @@ static int palmas_usb_remove(struct platform_device *pdev) static struct of_device_id of_palmas_match_tbl[] = { { .compatible = "ti,palmas-usb", }, + { .compatible = "ti,palmas-usb-vid", }, { .compatible = "ti,twl6035-usb", }, { /* end */ } };
The Palmas device contains only a USB VID detector, so added a compatible type *ti,palmas-usb-vid*. Dint remove the existing compatible types for backward compatibility. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- Documentation/devicetree/bindings/extcon/extcon-twl.txt | 3 ++- drivers/extcon/extcon-palmas.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)