]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
extcon: arizona: Update naming for micd-timeout DT to include units
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Mon, 23 Nov 2015 14:51:30 +0000 (14:51 +0000)
committerChanwoo Choi <cw00.choi@samsung.com>
Tue, 24 Nov 2015 00:00:27 +0000 (09:00 +0900)
Add time units of -ms (milliseconds) to wlf,micd-timeout.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Documentation/devicetree/bindings/extcon/extcon-arizona.txt
drivers/extcon/extcon-arizona.c

index 8aa0bd430f7b715eb66c974d61dd57fc450c86ee..238e10e86a204e10f8ce7d0c89b3f3d1c6da72e8 100644 (file)
@@ -33,7 +33,7 @@ Optional properties:
     specified as per the ARIZONA_MICD_TIME_XXX defines.
   - wlf,micd-dbtime : Microphone detection hardware debounces specified as the
     number of measurements to take, valid values being 2 and 4.
-  - wlf,micd-timeout : Timeout for microphone detection, specified in
+  - wlf,micd-timeout-ms : Timeout for microphone detection, specified in
     milliseconds.
   - wlf,micd-force-micbias : Force MICBIAS continuously on during microphone
     detection.
index c377030807c453938499584ab1cc059fc4b6eb30..86475338e51ee985f963cc6351dac24448fa8640 100644 (file)
@@ -1230,7 +1230,7 @@ static int arizona_extcon_device_get_pdata(struct arizona *arizona)
        device_property_read_u32(arizona->dev, "wlf,micd-dbtime",
                                 &pdata->micd_dbtime);
 
-       device_property_read_u32(arizona->dev, "wlf,micd-timeout",
+       device_property_read_u32(arizona->dev, "wlf,micd-timeout-ms",
                                 &pdata->micd_timeout);
 
        pdata->micd_force_micbias = device_property_read_bool(arizona->dev,