Merge branch 'next'
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
#ifndef __FG_BATTERY_CELL_PARAMS_H_
|
||||
#define __FG_BATTERY_CELL_PARAMS_H_
|
||||
|
||||
#if defined(CONFIG_POWER_FG_MAX17042) && defined(CONFIG_TRATS)
|
||||
#if defined(CONFIG_POWER_FG_MAX17042) && defined(CONFIG_TARGET_TRATS)
|
||||
|
||||
/* Cell characteristics - Exynos4 TRATS development board */
|
||||
/* Shall be written to addr 0x80h */
|
||||
|
||||
@@ -23,12 +23,9 @@
|
||||
|
||||
/* BUCKS_MRST_CR */
|
||||
#define STPMIC1_MRST_BUCK(buck) BIT(buck)
|
||||
#define STPMIC1_MRST_BUCK_DEBUG (STPMIC1_MRST_BUCK(STPMIC1_BUCK1) | \
|
||||
STPMIC1_MRST_BUCK(STPMIC1_BUCK3))
|
||||
|
||||
/* LDOS_MRST_CR */
|
||||
#define STPMIC1_MRST_LDO(ldo) BIT(ldo)
|
||||
#define STPMIC1_MRST_LDO_DEBUG 0
|
||||
|
||||
/* BUCKx_MAIN_CR (x=1...4) */
|
||||
#define STPMIC1_BUCK_ENA BIT(0)
|
||||
|
||||
Reference in New Issue
Block a user