aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>2015-11-20 03:53:59 -0500
committerChanwoo Choi <cw00.choi@samsung.com>2015-11-23 18:59:11 -0500
commit832df9e8ecabec271a0c418bdbb94da826dc5b6d (patch)
tree859c241127899949e9123e3cf6eb8ac4b5187d03
parent36a86872964609f2596d22f323070b60b17e08ef (diff)
extcon: arizona: Update naming for second jack detection DT binding
Update the name for the second jack detection pin binding to be a little less confusing. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
-rw-r--r--Documentation/devicetree/bindings/extcon/extcon-arizona.txt4
-rw-r--r--drivers/extcon/extcon-arizona.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/extcon/extcon-arizona.txt b/Documentation/devicetree/bindings/extcon/extcon-arizona.txt
index 7640a3502c67..8aa0bd430f7b 100644
--- a/Documentation/devicetree/bindings/extcon/extcon-arizona.txt
+++ b/Documentation/devicetree/bindings/extcon/extcon-arizona.txt
@@ -14,9 +14,9 @@ Optional properties:
14 If this node is not mentioned or if the value is unknown, then 14 If this node is not mentioned or if the value is unknown, then
15 headphone detection mode is set to HPDETL. 15 headphone detection mode is set to HPDETL.
16 16
17 - wlf,use-jd-gpio : Use GPIO input along with JD1 for dual pin jack 17 - wlf,use-jd2 : Use the additional JD input along with JD1 for dual pin jack
18 detection. 18 detection.
19 - wlf,use-jd-gpio-nopull : Internal pull on GPIO is disabled when used for 19 - wlf,use-jd2-nopull : Internal pull on JD2 is disabled when used for
20 jack detection. 20 jack detection.
21 - wlf,jd-invert : Invert the polarity of the jack detection switch 21 - wlf,jd-invert : Invert the polarity of the jack detection switch
22 22
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index 7c9598db318d..c377030807c4 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -1245,9 +1245,9 @@ static int arizona_extcon_device_get_pdata(struct arizona *arizona)
1245 device_property_read_u32(arizona->dev, "wlf,gpsw", &pdata->gpsw); 1245 device_property_read_u32(arizona->dev, "wlf,gpsw", &pdata->gpsw);
1246 1246
1247 pdata->jd_gpio5 = device_property_read_bool(arizona->dev, 1247 pdata->jd_gpio5 = device_property_read_bool(arizona->dev,
1248 "wlf,use-jd-gpio"); 1248 "wlf,use-jd2");
1249 pdata->jd_gpio5_nopull = device_property_read_bool(arizona->dev, 1249 pdata->jd_gpio5_nopull = device_property_read_bool(arizona->dev,
1250 "wlf,use-jd-gpio-nopull"); 1250 "wlf,use-jd2-nopull");
1251 1251
1252 return 0; 1252 return 0;
1253} 1253}