firmware: cpcap: Support uC control of SW2

Update the CPCAP firmware to add support to control SW2.  VDD_CORE is
connected to SW2, and therefore SW2 needs to be controlled by CORE_PWR_REQ.

Change-Id: I9526c7c14bd9c4d41d40800392ae814adae49c08
Signed-off-by: Greg Meiste <w30289@motorola.com>

diff --git a/drivers/mfd/cpcap-uc.c b/drivers/mfd/cpcap-uc.c
index d014f04552fad969fd23e92da66fed7c696d5c6f..813bf8adb6815253c1c98bfcd7dd025812137edf 100644 (file)
--- a/drivers/mfd/cpcap-uc.c
+++ b/drivers/mfd/cpcap-uc.c
@@ -611,7 +611,7 @@ int cpcap_uc_start(struct cpcap_device *cpcap, enum cpcap_macro macro)
            (data->uc_reset == 0)) {
                if ((macro == CPCAP_MACRO_4) ||
                    ((cpcap->vendor == CPCAP_VENDOR_ST) &&
-                    (macro == CPCAP_MACRO_12))) {
+                    ((macro == CPCAP_MACRO_12) || (macro == CPCAP_MACRO_14)))) {
                        retval = cpcap_regacc_write(cpcap, CPCAP_REG_MI2,
                                                    (1 << macro),
                                                    (1 << macro));
@@ -632,7 +632,7 @@ int cpcap_uc_stop(struct cpcap_device *cpcap, enum cpcap_macro macro)
        if ((macro > CPCAP_MACRO_4) &&
            (macro < CPCAP_MACRO__END)) {
                if ((cpcap->vendor == CPCAP_VENDOR_ST) &&
-                    (macro == CPCAP_MACRO_12)) {
+                   ((macro == CPCAP_MACRO_12) || (macro == CPCAP_MACRO_14))) {
                        retval = cpcap_regacc_write(cpcap, CPCAP_REG_MI2,
                                                    0, (1 << macro));
                } else {
@@ -654,7 +654,7 @@ unsigned char cpcap_uc_status(struct cpcap_device *cpcap,
        if (macro < CPCAP_MACRO__END) {
                if ((macro <= CPCAP_MACRO_4) ||
                    ((cpcap->vendor == CPCAP_VENDOR_ST) &&
-                    (macro == CPCAP_MACRO_12))) {
+                    ((macro == CPCAP_MACRO_12) || (macro == CPCAP_MACRO_14)))) {
                        cpcap_regacc_read(cpcap, CPCAP_REG_MI2, &regval);
 
                        if (regval & (1 << macro))

diff --git a/firmware/cpcap/firmware_0_2x.HEX b/firmware/cpcap/firmware_0_2x.HEX
index 70645a9ed56f7502a0cefe369a9eff0020af2eb1..abe78b6cb2392c21098f9e04bedd19e2fdc1ac05 100644 (file)
--- a/firmware/cpcap/firmware_0_2x.HEX
+++ b/firmware/cpcap/firmware_0_2x.HEX
@@ -1,67 +1,69 @@
 :20001800017C0000000000000000000000000000000000000000000000000000000000004B
-:200038000000000000000000000000000000000001EC0000000000000000000000000000BB
+:200038000000000000000000000000000000000001EC0000000000000000000002080000B1
 :20005800000000000000000000000000000000000000000000000000000000000000000088
 :20007800000000000000000000000000000000000000000000000000000000000000000068
 :20009800000000000000000000000000000000000000000000000000000000000000000048
 :0800B800000000000000000040
 :20012000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDF
 :20014000FFFFFFFF00000000000000000000000000000000000000000000000000000000A3
-:2001600000000000000000000000000000000000000000000000000000000000030F00006D
+:2001600000000000000000000000000000000000000000000000000000000000031D00005F
 :2001800000000000000000000000000000000000000000000000000000000000000000005F
 :2001A00000000000000000000000000000000000000000000000000000000000000000003F
 :2001C00000000000000000000000000000000000000000000000000000000000000000001F
-:2001E000000000000000000000000000055805F304000100000000000000000000000000A5
-:080200000000000000000000F6
-:1002080000000000000000000000000000000200E4
-:200226009EA00C955BBFE2AB0997CD083F5BBFE2AB0597CD083F5BBFE2AB0197CD083FC60E
-:20024600450DCE450C6B0C72EF0B4F6B0A6B095BBFE2AB0997A610CD07F33FEB3FEA5BBFDB
-:20026600E2AB0997CD0748C6450BCE450ACD07675BBFE2AB0997CD07CA5BBFE2AB0997CDC8
-:20028600083F350200E2AE08CD081C5BBFE2AB0597CD07487B052A095BBFE2AB0597CD0728
-:2002A6009D350100E2AE28A610CD07F33FEB3FEA5BBFE2AB0197CD0748350100E2AE28CDC7
-:2002C600083FA610CD07393FE93FE85BBFE2AB0197CD07CA5BBFE2AB0597CD083F5BBFE28F
-:2002E600AB0197CD077025187B0CC7020B7B0BC7020A7B0AC702097B09C70208A60120010C
-:200306004F6B0C9EAB0B958481A640C7831B725F831AC78327725F832648C78329725F8370
-:2003260028A620C7832B725F832AC7832D725F832C4FC70218C70219C7021AC7021BC7023D
-:200346001CC7021DC7021EC7021FC70220C70221C70222C70223C70224C70225356901237F
-:20036600725F012235590125725F012435510127725F01263520012B35A1012A350701294B
-:2003860035000128720A410303CD04A3720C410322725C021B2604725C021AC6021BC0023A
-:2003A60011C6021AC20210250ACD04E94FC7021AC7021B720E410320725C021D2604725CA8
-:2003C600021CC6021DCA021C2715C64101CE4100AA80C74101CF41004FC7021CC7021D720A
-:2003E60000410224725C021F2604725C021EC6021FA00AC6021EA2002515CE4101C641001F
-:20040600AA01CF4101C741004FC7021EC7021F7202410224725C02212604725C0220C60246
-:2004260021A014C60220A2002515CE4101C64100AA02CF4101C741004FC70220C7022172AD
-:2004460004410224725C02232604725C0222C60223A03CC60222A2002515CE4101C6410078
-:20046600AA04CF4101C741004FC70222C702237206410217C6020F2712725F020FCE4101B5
-:20048600C64100AA08CF4101C74100720A410203CD0702A6CCAE0CCDF009CC038A88888809
-:2004A60088C640106B01C640116B02C640126B03C640136B047B01A50427067B03A50826F7
-:2004C60009350102128484848481C6021227F6725F0212C64101CE4100AA20C74101CF415C
-:2004E6000020E2C602132632C64807CE4806AA01C74807CF4806C64809CE4808AA01C748C3
-:2005060009CF4808C6480BCE480AAA01C7480BCF480A35010213A6032030C64807CE480619
-:20052600A4FEC74807CF4806C64809CE4808A4FEC74809CF4808C6480BCE480AA4FEC748E8
-:200546000BCF480A725F0213A612C70211725F021081A6CCAE0CCDF009725C02152604721A
-:200566005C0214C60215A058C60214A202253DCE4601C64600AA90CF4601C74600CE4009B7
-:20058600C64008A4FECF4009C74008C64603CE4602AA7341AAD1CF4603C74602A6CCAE0C2D
-:2005A600CDF0004FC70214C70215201CC60215A1572615CE0214A302260ECE4603C6460240
-:2005C600AA40CF4603C74602CD02264D27847207410203CC05583501020FCC0558000000BF
-:2005E6000000000000000000000000000088899EA010955BBFE2AB0197350500E590AEE382
-:20060600A610CD085ECE4009C64008AA01CF4009C74008CE4001C64000AA01CF4001C7401D
-:2006260000CE4603C64602A4BFCF4603C74602CE4605C64604A40372EF026B01CE4607C685
-:200646004606A40372EF046B03CE4609C64608A40372EF066B05CE460BC6460AA40372EFE2
-:20066600086B07CE460DC6460CA40372EF0A6B09CE460FC6460EA40372EF0C6B0BCE46114F
-:20068600C64610A40372EF0E6B0DCE4613C64612A40372EF106B0F7B02C7020E7B01C7023A
-:2006A6000DC60127C0020EC60126C2020D2504A6022014C60125C0020EC60124C2020D2509
-:2006C6000BC6020C26064CC7020C201BC60123C0020EC60122C2020D240DC6020C27087293
-:2006E6005F020C3501020FC6020C27043501020F7B12AE01CDF2B69EAB1295818888C640C2
-:2007060011C64010A402974F6B0272EF01C1021726069FC1021627187B02C702177B01C7F4
-:200726000216CE4101C64100AA20CF4101C741008484814D270B34E836E936EA36EB4A26AD
-:20074600F581BFE388B6E892C7E2AE01B6E992D7E25CB6EA92D7E25CB6EB92D7E284BEE3CD
-:2007660081B7EBBFEA3FE93FE8813FE3B6E892D1E226233CE3B6E992D1E226123CE3B6EA8F
-:2007860092D1E226093CE3B6EB92D1E227082404A6FF2002A60181BFE3723300E2AE01724A
-:2007A6006300E25C726300E25C726000E226125A726C00E2260B5A726C00E22604723C0056
-:2007C600E2BEE381CD07D0CC074ABFE3B6E892CAE2B7E8B6E9AE0192DAE2B7E9B6EA5C9267
-:2007E600DAE2B7EAB6EB5C92DAE2B7EB81CD083F2003CD080A4D270B38EB39EA39E939E80A
-:200806004A26F58188F6B7E8E601B7E9E602B7EAE603B7EB8481BFE3AE03B6EB92D0E2B740
-:20082600EBB6EA5A92D2E2B7EAB6E95A92D2E2B7E9B6E892C2E2B7E881BFE38892C6E2B7F8
-:20084600E8AE0192D6E2B7E95C92D6E2B7EA5C92D6E2B7EB84BEE381BFE390BFE6975A9282
-:0B086600D6E592D7E25D26F6BEE381E6
+:2001E000000000000000000000000000056E06090400010000000000000000000000000078
+:160200000000000000000000074F076000400000000000000000EB
+:1002160000000000000000000000000000000200D6
+:200234009EA00C955BBFE2AB0997CD08915BBFE2AB0597CD08915BBFE2AB0197CD0891C60A
+:20025400450DCE450C6B0C72EF0B4F6B0A6B095BBFE2AB0997A610CD08453FEB3FEA5BBF7A
+:20027400E2AB0997CD079AC6450BCE450ACD07B95BBFE2AB0997CD081C5BBFE2AB0997CDC3
+:200294000891350200E2AE16CD086E5BBFE2AB0597CD079A7B052A095BBFE2AB0597CD0716
+:2002B400EF350100E2AE28A610CD08453FEB3FEA5BBFE2AB0197CD079A350100E2AE28CDC2
+:2002D4000891A610CD078B3FE93FE85BBFE2AB0197CD081C5BBFE2AB0597CD08915BBFE238
+:2002F400AB0197CD07C225187B0CC702197B0BC702187B0AC702177B09C70216A601200174
+:200314004F6B0C9EAB0B958481C6012DCA012C2728A640C7831B725F831AC78327725F835D
+:200334002648C78329725F8328A620C7832B725F832AC7832D725F832C4FC70226C702276E
+:20035400C70228C70229C7022AC7022BC7022CC7022DC7022EC7022FC70230C70231C70229
+:2003740032C7023335690123725F012235590125725F012435510127725F01263520012BB4
+:2003940035A1012A3507012935000128720A410303CD04B9720C410322725C0229260472BE
+:2003B4005C0228C60229C0021FC60228C2021E250ACD04FF4FC70228C70229720E410320EA
+:2003D400725C022B2604725C022AC6022BCA022A2715C64101CE4100AA80C74101CF41006B
+:2003F4004FC7022AC7022B7200410224725C022D2604725C022CC6022DA00AC6022CA20082
+:200414002515CE4101C64100AA01CF4101C741004FC7022CC7022D7202410224725C022F9F
+:200434002604725C022EC6022FA014C6022EA2002515CE4101C64100AA02CF4101C7410027
+:200454004FC7022EC7022F7204410224725C02312604725C0230C60231A03CC60230A200D3
+:200474002515CE4101C64100AA04CF4101C741004FC70230C702317206410217C6021D2730
+:2004940012725F021DCE4101C64100AA08CF4101C74100720A410203CD0718A6CCAE0CCDBD
+:2004B400F009CC03A088888888C640106B01C640116B02C640126B03C640136B047B01A56B
+:2004D4000427067B03A5082609350102208484848481C6022027F6725F0220C64101CE4185
+:2004F40000AA20C74101CF410020E2C602212632C64807CE4806AA01C74807CF4806C648A5
+:2005140009CE4808AA01C74809CF4808C6480BCE480AAA01C7480BCF480A35010221A6039D
+:200534002030C64807CE4806A4FEC74807CF4806C64809CE4808A4FEC74809CF4808C64835
+:200554000BCE480AA4FEC7480BCF480A725F0221A61BC7021F725F021E81A6CCAE0CCDF087
+:2005740009725C02232604725C0222C60223A058C60222A202253DCE4601C64600AA90CF52
+:200594004601C74600CE4009C64008A4FECF4009C74008C64603CE4602AA7741AA91CF462E
+:2005B40003C74602A6CCAE0CCDF0004FC70222C70223201CC60223A1572615CE0222A30215
+:2005D400260EC64603CE4602AA40C74603CF4602CD02344D27847207410203CC056E35016E
+:2005F400021DCC056E0000000000000000000000000000000088899EA010955BBFE2AB01ED
+:2006140097350500E590AEF9A610CD08B0CE4009C64008AA01CF4009C74008CE4001C64092
+:2006340000AA01CF4001C74000C64603CE4602A4BFC74603CF4602CE4605C64604A40372F3
+:20065400EF026B01CE4607C64606A40372EF046B03CE4609C64608A40372EF066B05CE46BF
+:200674000BC6460AA40372EF086B07CE460DC6460CA40372EF0A6B09CE460FC6460EA40320
+:2006940072EF0C6B0BCE4611C64610A40372EF0E6B0DCE4613C64612A40372EF106B0F7B42
+:2006B40002C7021C7B01C7021BC60127C0021CC60126C2021B2504A6022014C60125C00294
+:2006D4001CC60124C2021B250BC6021A26064CC7021A201BC60123C0021CC60122C2021BE8
+:2006F400240DC6021A2708725F021A3501021DC6021A27043501021D7B12AE01CDF2B69EB1
+:20071400AB1295818888C64011C64010A402974F6B0272EF01C1022526069FC10224271881
+:200734007B02C702257B01C70224CE4101C64100AA20CF4101C74100848481725F475F35A2
+:2007540030475EA6CCAE0CCDF00920F788897201475F0CCE430BC6430AA4F0AA012008CE0D
+:20077400430BC6430AA4F0CF430BC7430A7B02AE01CDF2B68484814D270B34E836E936EA3B
+:2007940036EB4A26F581BFE388B6E892C7E2AE01B6E992D7E25CB6EA92D7E25CB6EB92D7F5
+:2007B400E284BEE381B7EBBFEA3FE93FE8813FE3B6E892D1E226233CE3B6E992D1E22612F9
+:2007D4003CE3B6EA92D1E226093CE3B6EB92D1E227082404A6FF2002A60181BFE372330040
+:2007F400E2AE01726300E25C726300E25C726000E226125A726C00E2260B5A726C00E226B7
+:2008140004723C00E2BEE381CD0822CC079CBFE3B6E892CAE2B7E8B6E9AE0192DAE2B7E94F
+:20083400B6EA5C92DAE2B7EAB6EB5C92DAE2B7EB81CD08912003CD085C4D270B38EB39EACC
+:2008540039E939E84A26F58188F6B7E8E601B7E9E602B7EAE603B7EB8481BFE3AE03B6EBAA
+:2008740092D0E2B7EBB6EA5A92D2E2B7EAB6E95A92D2E2B7E9B6E892C2E2B7E881BFE388A0
+:2008940092C6E2B7E8AE0192D6E2B7E95C92D6E2B7EA5C92D6E2B7EB84BEE381BFE390BFAC
+:0F08B400E6975A92D6E592D7E25D26F6BEE3812B
 :00000001FF
\ No newline at end of file