diff --git a/build/libraries/spi/ARM7/pm/pm_ds.c b/build/libraries/spi/ARM7/pm/pm_ds.c index 692c4e4..755c7c4 100644 --- a/build/libraries/spi/ARM7/pm/pm_ds.c +++ b/build/libraries/spi/ARM7/pm/pm_ds.c @@ -34,19 +34,19 @@ void PM_GoDsMode( void ) // LED PMi_ResetFlags( REG_PMIC_LED_CTL_ADDR, PMIC_LED_CTL_L12_AT_BLK | PMIC_LED_CTL_L12_BLK_BY_SLP ); PMi_SetParams( REG_PMIC_LED12_B4_ADDR, - PMIC_LED12_B4_L1_OFF | PMIC_LED12_B4_L2_OFF, + PMIC_LED12_B4_L1_LOW | PMIC_LED12_B4_L2_LOW, PMIC_LED12_B4_L1_MASK | PMIC_LED12_B4_L2_MASK ); PMi_SetParams( REG_PMIC_LED12_B3_ADDR, - PMIC_LED12_B3_L1_100 | PMIC_LED12_B3_L2_OFF, + PMIC_LED12_B3_L1_HIGH | PMIC_LED12_B3_L2_LOW, PMIC_LED12_B3_L1_MASK | PMIC_LED12_B3_L2_MASK ); PMi_SetParams( REG_PMIC_LED12_B2_ADDR, - PMIC_LED12_B2_L1_OFF | PMIC_LED12_B2_L2_100, + PMIC_LED12_B2_L1_LOW | PMIC_LED12_B2_L2_HIGH, PMIC_LED12_B2_L1_MASK | PMIC_LED12_B2_L2_MASK ); PMi_SetParams( REG_PMIC_LED12_B1_ADDR, - PMIC_LED12_B1_L1_100 | PMIC_LED12_B1_L2_100, + PMIC_LED12_B1_L1_HIGH | PMIC_LED12_B1_L2_HIGH, PMIC_LED12_B1_L1_MASK | PMIC_LED12_B1_L2_MASK ); @@ -54,8 +54,8 @@ void PM_GoDsMode( void ) PMi_SetFlags( REG_PMIC_CTL2_ADDR, PMIC_CTL2_LCD_PWR ); // back light ON - PMi_SetParams( REG_PMIC_BL1_BRT_ADDR, 0x16 << PMIC_BL1_BRT_SHIFT, PMIC_BL1_BRT_MASK ); - PMi_SetParams( REG_PMIC_BL2_BRT_ADDR, 0x16 << PMIC_BL2_BRT_SHIFT, PMIC_BL2_BRT_MASK ); + PMi_SetParams( REG_PMIC_BL1_BRT_ADDR, PMIC_BL_BRT_DEFAULT, PMIC_BL1_BRT_MASK ); + PMi_SetParams( REG_PMIC_BL2_BRT_ADDR, PMIC_BL_BRT_DEFAULT, PMIC_BL2_BRT_MASK ); OS_SpinWait( OS_MSEC_TO_CPUCYC( 17*2 ) ); PMi_SetFlags( REG_PMIC_CTL2_ADDR, PMIC_CTL2_BKLT1 | PMIC_CTL2_BKLT2 ); diff --git a/include/twl/pm/common/pm_reg_ex.h b/include/twl/pm/common/pm_reg_ex.h index a216de7..969fc71 100644 --- a/include/twl/pm/common/pm_reg_ex.h +++ b/include/twl/pm/common/pm_reg_ex.h @@ -356,120 +356,67 @@ typedef enum PMPfmPwmV33; //---- PMIC_LED12_B4 / PMIC_LED12_B3 / PMIC_LED12_B2 / PMIC_LED12_B1 +// send to MCU typedef enum { - PMIC_LED_BRT_OFF = 0, // default - PMIC_LED_BRT_14 = 1, - PMIC_LED_BRT_28 = 2, - PMIC_LED_BRT_43 = 3, - PMIC_LED_BRT_57 = 4, - PMIC_LED_BRT_71 = 5, - PMIC_LED_BRT_85 = 6, - PMIC_LED_BRT_100 = 7 + PMIC_LED_BRT_LOW = 0, // default + PMIC_LED_BRT_HIGH = 7 } PMLedBrightCommon; typedef enum { - PMIC_LED12_B4_L1_OFF = (0 << PMIC_LED12_B4_L1_SHIFT), // default - PMIC_LED12_B4_L1_14 = (1 << PMIC_LED12_B4_L1_SHIFT), - PMIC_LED12_B4_L1_28 = (2 << PMIC_LED12_B4_L1_SHIFT), - PMIC_LED12_B4_L1_43 = (3 << PMIC_LED12_B4_L1_SHIFT), - PMIC_LED12_B4_L1_57 = (4 << PMIC_LED12_B4_L1_SHIFT), - PMIC_LED12_B4_L1_71 = (5 << PMIC_LED12_B4_L1_SHIFT), - PMIC_LED12_B4_L1_85 = (6 << PMIC_LED12_B4_L1_SHIFT), - PMIC_LED12_B4_L1_100 = (7 << PMIC_LED12_B4_L1_SHIFT) + PMIC_LED12_B4_L1_LOW = (0 << PMIC_LED12_B4_L1_SHIFT), // default + PMIC_LED12_B4_L1_HIGH = (7 << PMIC_LED12_B4_L1_SHIFT) } PMLed1Bright4; typedef enum { - PMIC_LED12_B4_L2_OFF = (0 << PMIC_LED12_B4_L2_SHIFT), // default - PMIC_LED12_B4_L2_14 = (1 << PMIC_LED12_B4_L2_SHIFT), - PMIC_LED12_B4_L2_28 = (2 << PMIC_LED12_B4_L2_SHIFT), - PMIC_LED12_B4_L2_43 = (3 << PMIC_LED12_B4_L2_SHIFT), - PMIC_LED12_B4_L2_57 = (4 << PMIC_LED12_B4_L2_SHIFT), - PMIC_LED12_B4_L2_71 = (5 << PMIC_LED12_B4_L2_SHIFT), - PMIC_LED12_B4_L2_85 = (6 << PMIC_LED12_B4_L2_SHIFT), - PMIC_LED12_B4_L2_100 = (7 << PMIC_LED12_B4_L2_SHIFT) + PMIC_LED12_B4_L2_LOW = (0 << PMIC_LED12_B4_L2_SHIFT), // default + PMIC_LED12_B4_L2_HIGH = (7 << PMIC_LED12_B4_L2_SHIFT) } PMLed2Bright4; typedef enum { - PMIC_LED12_B3_L1_OFF = (0 << PMIC_LED12_B3_L1_SHIFT), // default - PMIC_LED12_B3_L1_14 = (1 << PMIC_LED12_B3_L1_SHIFT), - PMIC_LED12_B3_L1_28 = (2 << PMIC_LED12_B3_L1_SHIFT), - PMIC_LED12_B3_L1_43 = (3 << PMIC_LED12_B3_L1_SHIFT), - PMIC_LED12_B3_L1_57 = (4 << PMIC_LED12_B3_L1_SHIFT), - PMIC_LED12_B3_L1_71 = (5 << PMIC_LED12_B3_L1_SHIFT), - PMIC_LED12_B3_L1_85 = (6 << PMIC_LED12_B3_L1_SHIFT), - PMIC_LED12_B3_L1_100 = (7 << PMIC_LED12_B3_L1_SHIFT) + PMIC_LED12_B3_L1_LOW = (0 << PMIC_LED12_B3_L1_SHIFT), // default + PMIC_LED12_B3_L1_HIGH = (7 << PMIC_LED12_B3_L1_SHIFT) } PMLed1Bright3; typedef enum { - PMIC_LED12_B3_L2_OFF = (0 << PMIC_LED12_B3_L2_SHIFT), // default - PMIC_LED12_B3_L2_14 = (1 << PMIC_LED12_B3_L2_SHIFT), - PMIC_LED12_B3_L2_28 = (2 << PMIC_LED12_B3_L2_SHIFT), - PMIC_LED12_B3_L2_43 = (3 << PMIC_LED12_B3_L2_SHIFT), - PMIC_LED12_B3_L2_57 = (4 << PMIC_LED12_B3_L2_SHIFT), - PMIC_LED12_B3_L2_71 = (5 << PMIC_LED12_B3_L2_SHIFT), - PMIC_LED12_B3_L2_85 = (6 << PMIC_LED12_B3_L2_SHIFT), - PMIC_LED12_B3_L2_100 = (7 << PMIC_LED12_B3_L2_SHIFT) + PMIC_LED12_B3_L2_LOW = (0 << PMIC_LED12_B3_L2_SHIFT), // default + PMIC_LED12_B3_L2_HIGH = (7 << PMIC_LED12_B3_L2_SHIFT) } PMLed2Bright3; typedef enum { - PMIC_LED12_B2_L1_OFF = (0 << PMIC_LED12_B2_L1_SHIFT), // default - PMIC_LED12_B2_L1_14 = (1 << PMIC_LED12_B2_L1_SHIFT), - PMIC_LED12_B2_L1_28 = (2 << PMIC_LED12_B2_L1_SHIFT), - PMIC_LED12_B2_L1_43 = (3 << PMIC_LED12_B2_L1_SHIFT), - PMIC_LED12_B2_L1_57 = (4 << PMIC_LED12_B2_L1_SHIFT), - PMIC_LED12_B2_L1_71 = (5 << PMIC_LED12_B2_L1_SHIFT), - PMIC_LED12_B2_L1_85 = (6 << PMIC_LED12_B2_L1_SHIFT), - PMIC_LED12_B2_L1_100 = (7 << PMIC_LED12_B2_L1_SHIFT) + PMIC_LED12_B2_L1_LOW = (0 << PMIC_LED12_B2_L1_SHIFT), // default + PMIC_LED12_B2_L1_HIGH = (7 << PMIC_LED12_B2_L1_SHIFT) } PMLed1Bright2; typedef enum { - PMIC_LED12_B2_L2_OFF = (0 << PMIC_LED12_B2_L2_SHIFT), // default - PMIC_LED12_B2_L2_14 = (1 << PMIC_LED12_B2_L2_SHIFT), - PMIC_LED12_B2_L2_28 = (2 << PMIC_LED12_B2_L2_SHIFT), - PMIC_LED12_B2_L2_43 = (3 << PMIC_LED12_B2_L2_SHIFT), - PMIC_LED12_B2_L2_57 = (4 << PMIC_LED12_B2_L2_SHIFT), - PMIC_LED12_B2_L2_71 = (5 << PMIC_LED12_B2_L2_SHIFT), - PMIC_LED12_B2_L2_85 = (6 << PMIC_LED12_B2_L2_SHIFT), - PMIC_LED12_B2_L2_100 = (7 << PMIC_LED12_B2_L2_SHIFT) + PMIC_LED12_B2_L2_LOW = (0 << PMIC_LED12_B2_L2_SHIFT), // default + PMIC_LED12_B2_L2_HIGH = (7 << PMIC_LED12_B2_L2_SHIFT) } PMLed2Bright2; typedef enum { - PMIC_LED12_B1_L1_OFF = (0 << PMIC_LED12_B1_L1_SHIFT), // default - PMIC_LED12_B1_L1_14 = (1 << PMIC_LED12_B1_L1_SHIFT), - PMIC_LED12_B1_L1_28 = (2 << PMIC_LED12_B1_L1_SHIFT), - PMIC_LED12_B1_L1_43 = (3 << PMIC_LED12_B1_L1_SHIFT), - PMIC_LED12_B1_L1_57 = (4 << PMIC_LED12_B1_L1_SHIFT), - PMIC_LED12_B1_L1_71 = (5 << PMIC_LED12_B1_L1_SHIFT), - PMIC_LED12_B1_L1_85 = (6 << PMIC_LED12_B1_L1_SHIFT), - PMIC_LED12_B1_L1_100 = (7 << PMIC_LED12_B1_L1_SHIFT) + PMIC_LED12_B1_L1_LOW = (0 << PMIC_LED12_B1_L1_SHIFT), // default + PMIC_LED12_B1_L1_HIGH = (7 << PMIC_LED12_B1_L1_SHIFT) } PMLed1Bright5; typedef enum { - PMIC_LED12_B1_L2_OFF = (0 << PMIC_LED12_B1_L2_SHIFT), // default - PMIC_LED12_B1_L2_14 = (1 << PMIC_LED12_B1_L2_SHIFT), - PMIC_LED12_B1_L2_28 = (2 << PMIC_LED12_B1_L2_SHIFT), - PMIC_LED12_B1_L2_43 = (3 << PMIC_LED12_B1_L2_SHIFT), - PMIC_LED12_B1_L2_57 = (4 << PMIC_LED12_B1_L2_SHIFT), - PMIC_LED12_B1_L2_71 = (5 << PMIC_LED12_B1_L2_SHIFT), - PMIC_LED12_B1_L2_85 = (6 << PMIC_LED12_B1_L2_SHIFT), - PMIC_LED12_B1_L2_100 = (7 << PMIC_LED12_B1_L2_SHIFT) + PMIC_LED12_B1_L2_LOW = (0 << PMIC_LED12_B1_L2_SHIFT), // default + PMIC_LED12_B1_L2_HIGH = (7 << PMIC_LED12_B1_L2_SHIFT) } PMLed2Bright1; @@ -525,7 +472,7 @@ typedef enum { PMIC_BL_BRT_MIN = 0, // default PMIC_BL_BRT_MAX = 0x1f, - PMIC_BL_BRT_DEFAULT = 0x08 + PMIC_BL_BRT_DEFAULT = 0x16 } PMBackLightBrightness;