From: cw00.choi@samsung•com (Chanwoo Choi)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 1/2] extcon: palmas: Added a new compatible type *ti,palmas-usb-vid*
Date: Tue, 13 Aug 2013 18:54:31 +0900 [thread overview]
Message-ID: <520A0257.1080903@samsung.com> (raw)
In-Reply-To: <1376372241-15573-1-git-send-email-kishon@ti.com>
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
next prev parent reply other threads:[~2013-08-13 9:54 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-16 12:50 [PATCH v2 0/5] ARM: OMAP: DTS/HWMOD/defconfig changes for USB3 Felipe Balbi
2013-07-16 12:50 ` [PATCH v2 1/5] arm: omap5: dts: fix reg property size Felipe Balbi
2013-07-16 12:50 ` [PATCH v2 2/5] arm: omap5: dts: fix ocp2scp DTS data Felipe Balbi
2013-07-16 12:50 ` [PATCH v2 3/5] arm: omap5: dts: add palmas-usb node Felipe Balbi
2013-07-16 12:50 ` [PATCH v2 4/5] arm: omap5: hwmod: add missing ocp2scp hwmod data Felipe Balbi
2013-07-16 12:50 ` [PATCH v2 5/5] arm: omap2plus_defconfig: enable dwc3 and dependencies Felipe Balbi
2013-08-21 12:53 ` Tony Lindgren
2013-08-12 10:17 ` [PATCH v3] arm: omap5: dts: add palmas-usb node Kishon Vijay Abraham I
2013-08-12 23:09 ` Stephen Warren
2013-08-13 5:37 ` [PATCH 1/2] extcon: palmas: Added a new compatible type *ti, palmas-usb-vid* Kishon Vijay Abraham I
2013-08-13 5:37 ` [PATCH v4 2/2] arm: omap5: dts: add palmas-usb node Kishon Vijay Abraham I
2013-08-13 9:54 ` Chanwoo Choi [this message]
2013-08-13 9:58 ` [PATCH 1/2] extcon: palmas: Added a new compatible type *ti, palmas-usb-vid* Kishon Vijay Abraham I
2013-08-13 19:13 ` Stephen Warren
2013-08-14 5:24 ` Kishon Vijay Abraham I
2013-08-14 16:08 ` Stephen Warren
2013-08-15 16:09 ` Benoit Cousson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=520A0257.1080903@samsung.com \
--to=cw00.choi@samsung$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox