瀏覽代碼

mfd: arizona: Change fast_start pdata name to better reflect functionality

The bit in the register enables MICBIAS fast startup when clear not when
set. This patch changes the name of this pdata option to soft_start to
better match the functionality. We rename rather than invert the
handling to keep the same default functionality, which is fast start
active.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Charles Keepax 12 年之前
父節點
當前提交
f773fc6dca
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      drivers/mfd/arizona-core.c
  2. 1 1
      include/linux/mfd/arizona/pdata.h

+ 1 - 1
drivers/mfd/arizona-core.c

@@ -860,7 +860,7 @@ int arizona_dev_init(struct arizona *arizona)
 		if (arizona->pdata.micbias[i].discharge)
 		if (arizona->pdata.micbias[i].discharge)
 			val |= ARIZONA_MICB1_DISCH;
 			val |= ARIZONA_MICB1_DISCH;
 
 
-		if (arizona->pdata.micbias[i].fast_start)
+		if (arizona->pdata.micbias[i].soft_start)
 			val |= ARIZONA_MICB1_RATE;
 			val |= ARIZONA_MICB1_RATE;
 
 
 		if (arizona->pdata.micbias[i].bypass)
 		if (arizona->pdata.micbias[i].bypass)

+ 1 - 1
include/linux/mfd/arizona/pdata.h

@@ -77,7 +77,7 @@ struct arizona_micbias {
 	int mV;                    /** Regulated voltage */
 	int mV;                    /** Regulated voltage */
 	unsigned int ext_cap:1;    /** External capacitor fitted */
 	unsigned int ext_cap:1;    /** External capacitor fitted */
 	unsigned int discharge:1;  /** Actively discharge */
 	unsigned int discharge:1;  /** Actively discharge */
-	unsigned int fast_start:1; /** Enable aggressive startup ramp rate */
+	unsigned int soft_start:1; /** Disable aggressive startup ramp rate */
 	unsigned int bypass:1;     /** Use bypass mode */
 	unsigned int bypass:1;     /** Use bypass mode */
 };
 };