diff --git a/build/buildsetup/ioreg/io_register_list.csv b/build/buildsetup/ioreg/io_register_list.csv
index a12dfb1..f8f8e65 100644
--- a/build/buildsetup/ioreg/io_register_list.csv
+++ b/build/buildsetup/ioreg/io_register_list.csv
@@ -8,7 +8,7 @@
 0x400a,,TWL_EX,16,rw,CFG,volatile,CFG_E,15,1,WRAM,9,0,MC_B,8,1,DSP,2,1,CAM,1,1,DMA4,0,1
 #twl p39,,,,,,,,,,,,,,,,,,,,,,,,
 0x4010,,MC_DET,8,rw,MI,volatile,MODE2,6,2,DET2,4,1,MODE1,2,2,DET1,0,1,,,,,,
-0x4011,,MC_SWP,8,rw,MI,volatile,SWP,7,1,,,,,,,,,,,,,,,
+0x4011,,MC_SWP,8,rw,MI,volatile,E,7,1,,,,,,,,,,,,,,,
 0x4012,,MC_CHT,16,rw,MI,volatile,,,,,,,,,,,,,,,,,,
 0x4040,,WRAM_A0,8,rw,MI,volatile,E,7,1,OFS,2,2,MST,0,1,,,,,,,,,
 0x4041,,WRAM_A1,8,rw,MI,volatile,E,7,1,OFS,2,2,MST,0,1,,,,,,,,,
diff --git a/build/buildsetup/ioreg_sp/io_register_list.csv b/build/buildsetup/ioreg_sp/io_register_list.csv
index 5c7a84e..ec22616 100644
--- a/build/buildsetup/ioreg_sp/io_register_list.csv
+++ b/build/buildsetup/ioreg_sp/io_register_list.csv
@@ -13,7 +13,7 @@
 0x4024,,BONDING,8,rw,CFG,volatile,CHIP_TYPE,0,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 #twl p125,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 0x4010,,MC_DET,8,rw,MI,volatile,MODE2,6,2,DET2,4,1,MODE1,2,2,DET1,0,1,,,,,,,,,,,,,,,,,,,,,,,,
-0x4011,,MC_SWP,8,rw,MI,volatile,SWP,7,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x4011,,MC_SWP,8,rw,MI,volatile,E,7,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 0x4012,,MC_CHT,16,rw,MI,volatile,,,,,,,,,
 0x4040,,WRAM_A0,8,rw,MI,volatile,E,7,1,OFS,2,2,MST,0,1
 0x4041,,WRAM_A1,8,rw,MI,volatile,E,7,1,OFS,2,2,MST,0,1
diff --git a/include/twl/pm/common/pm_reg_ex.h b/include/twl/pm/common/pm_reg_ex.h
index f42882b..ab1b63f 100644
--- a/include/twl/pm/common/pm_reg_ex.h
+++ b/include/twl/pm/common/pm_reg_ex.h
@@ -211,16 +211,6 @@ typedef enum
 }
 PMBatteryLevel;
 
-//---- PMIC_GPIO_CTL
-typedef enum
-{
-    PMIC_GPIO_CTL_AO_NONE = (0x0 << PMIC_GPIO_CTL_AO_SHIFT),  // default
-    PMIC_GPIO_CTL_AO_VLT  = (0x1 << PMIC_GPIO_CTL_AO_SHIFT),
-    PMIC_GPIO_CTL_AO_AMPR = (0x2 << PMIC_GPIO_CTL_AO_SHIFT),
-    PMIC_GPIO_CTL_AO_TEMP = (0x3 << PMIC_GPIO_CTL_AO_SHIFT)
-}
-PMAnalogOut;
-
 //---- PMIC_TIME_CTL
 typedef enum
 {