On Fri, Nov 20, 2015 at 08:53:59AM +0000, Charles Keepax wrote: > Update the name for the second jack detection pin binding to be a little > less confusing. This breaks compatibility with old dtbs. Either the driver needs to support both names or you just have to live with the old name. > > Signed-off-by: Charles Keepax <ckeepax@xxxxxxxxxxxxxxxxxxxxxxxxxxx> > --- > .../devicetree/bindings/extcon/extcon-arizona.txt | 4 ++-- > drivers/extcon/extcon-arizona.c | 4 ++-- > 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 03fa7b7..da9813b 100644 > --- a/Documentation/devicetree/bindings/extcon/extcon-arizona.txt > +++ b/Documentation/devicetree/bindings/extcon/extcon-arizona.txt > @@ -14,9 +14,9 @@ Optional properties: > If this node is not mentioned or if the value is unknown, then > headphone detection mode is set to HPDETL. > > - - wlf,use-jd-gpio : Use GPIO input along with JD1 for dual pin jack > + - wlf,use-jd2 : Use the additional JD input along with JD1 for dual pin jack > detection. > - - wlf,use-jd-gpio-nopull : Internal pull on GPIO is disabled when used for > + - wlf,use-jd2-nopull : Internal pull on JD2 is disabled when used for > jack detection. > - wlf,jd-invert : Invert the polarity of the jack detection switch > > diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c > index 7c9598d..c377030 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) > device_property_read_u32(arizona->dev, "wlf,gpsw", &pdata->gpsw); > > pdata->jd_gpio5 = device_property_read_bool(arizona->dev, > - "wlf,use-jd-gpio"); > + "wlf,use-jd2"); > pdata->jd_gpio5_nopull = device_property_read_bool(arizona->dev, > - "wlf,use-jd-gpio-nopull"); > + "wlf,use-jd2-nopull"); > > return 0; > } > -- > 1.7.2.5 > > -- > To unsubscribe from this list: send the line "unsubscribe devicetree" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
