From: Greg Meiste Date: Thu, 19 Aug 2010 14:47:44 +0000 (-0500) Subject: firmware: cpcap: Add workaround to support soft reset X-Git-Tag: firefly_0821_release~9834^2~666 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b289ead1eed0069e5189e59b3f3f54ff1947a00c;p=firefly-linux-kernel-4.4.55.git firmware: cpcap: Add workaround to support soft reset The CPCAP uC needs to be stopped before a soft reset. Macro 15 can be used to stop the uC with the SYS_RESTART line. Change-Id: I7a7711d771881320a4b6f1a462411b8a4b21b0fc Signed-off-by: Greg Meiste --- diff --git a/drivers/mfd/cpcap-uc.c b/drivers/mfd/cpcap-uc.c index 813bf8adb681..ded4ce12b19a 100644 --- a/drivers/mfd/cpcap-uc.c +++ b/drivers/mfd/cpcap-uc.c @@ -611,7 +611,8 @@ 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_14)))) { + ((macro == CPCAP_MACRO_12) || (macro == CPCAP_MACRO_14) || + (macro == CPCAP_MACRO_15)))) { retval = cpcap_regacc_write(cpcap, CPCAP_REG_MI2, (1 << macro), (1 << macro)); @@ -632,7 +633,8 @@ 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_14))) { + ((macro == CPCAP_MACRO_12) || (macro == CPCAP_MACRO_14) || + (macro == CPCAP_MACRO_15))) { retval = cpcap_regacc_write(cpcap, CPCAP_REG_MI2, 0, (1 << macro)); } else { @@ -654,7 +656,8 @@ 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_14)))) { + ((macro == CPCAP_MACRO_12) || (macro == CPCAP_MACRO_14) || + (macro == CPCAP_MACRO_15)))) { cpcap_regacc_read(cpcap, CPCAP_REG_MI2, ®val); if (regval & (1 << macro)) diff --git a/firmware/cpcap/firmware_0_2x.HEX b/firmware/cpcap/firmware_0_2x.HEX index abe78b6cb239..68a57deb63d0 100644 --- a/firmware/cpcap/firmware_0_2x.HEX +++ b/firmware/cpcap/firmware_0_2x.HEX @@ -1,69 +1,75 @@ :20001800017C0000000000000000000000000000000000000000000000000000000000004B :200038000000000000000000000000000000000001EC0000000000000000000002080000B1 -:20005800000000000000000000000000000000000000000000000000000000000000000088 +:20005800000002160000000000000000000000000000000000000000000000000000000070 :20007800000000000000000000000000000000000000000000000000000000000000000068 :20009800000000000000000000000000000000000000000000000000000000000000000048 :0800B800000000000000000040 :20012000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDF :20014000FFFFFFFF00000000000000000000000000000000000000000000000000000000A3 -:2001600000000000000000000000000000000000000000000000000000000000031D00005F +:2001600000000000000000000000000000000000000000000000000000000000032B000051 :2001800000000000000000000000000000000000000000000000000000000000000000005F :2001A00000000000000000000000000000000000000000000000000000000000000000003F :2001C00000000000000000000000000000000000000000000000000000000000000000001F -: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 +:2001E000000000000000000000000000057C0617040001000000000000000000000000005C +:200200000000000000000000075D076E00400000000000000000079907BE040000000080DC +:0402200000040000D6 +:1002240000000000000000000000000000000200C8 +:200242009EA00C955BBFE2AB0997CD09465BBFE2AB0597CD09465BBFE2AB0197CD0946C6DA +:20026200450DCE450C6B0C72EF0B4F6B0A6B095BBFE2AB0997A610CD08FA3FEB3FEA5BBFB7 +:20028200E2AB0997CD084FC6450BCE450ACD086E5BBFE2AB0997CD08D15BBFE2AB0997CD94 +:2002A2000946350200E2AE24CD09235BBFE2AB0597CD084F7B052A095BBFE2AB0597CD08D7 +:2002C200A4350100E2AE28A610CD08FA3FEB3FEA5BBFE2AB0197CD084F350100E2AE28CD94 +:2002E2000946A610CD08403FE93FE85BBFE2AB0197CD08D15BBFE2AB0597CD09465BBFE253 +:20030200AB0197CD087725187B0CC702277B0BC702267B0AC702257B09C70224A601200177 +:200322004F6B0C9EAB0B958481C6012DCA012C2728A640C7831B725F831AC78327725F834F +:200342002648C78329725F8328A620C7832B725F832AC7832D725F832C4FC70234C7023544 +:20036200C70236C70237C70238C70239C7023AC7023BC7023CC7023DC7023EC7023FC7028F +:2003820040C7024135690123725F012235590125725F012435510127725F01263520012B8A +:2003A20035A1012A3507012935000128720A410303CD04C7720C410322725C023726047294 +:2003C2005C0236C60237C0022DC60236C2022C250ACD050D4FC70236C70237720E4103206B +:2003E200725C02392604725C0238C60239CA02382715C64101CE4100AA80C74101CF410025 +:200402004FC70238C702397200410224725C023B2604725C023AC6023BA00AC6023AA2001F +:200422002515CE4101C64100AA01CF4101C741004FC7023AC7023B7202410224725C023D67 +:200442002604725C023CC6023DA014C6023CA2002515CE4101C64100AA02CF4101C74100EF +:200462004FC7023CC7023D7204410224725C023F2604725C023EC6023FA03CC6023EA20071 +:200482002515CE4101C64100AA04CF4101C741004FC7023EC7023F7206410217C6022B27F8 +:2004A20012725F022BCE4101C64100AA08CF4101C74100720A410203CD0726A6CCAE0CCD93 +:2004C200F009CC03AE88888888C640106B01C640116B02C640126B03C640136B047B01A54F +:2004E2000427067B03A50826093501022E8484848481C6022E27F6725F022EC64101CE414D +:2005020000AA20C74101CF410020E2C6022F2632C64807CE4806AA01C74807CF4806C64888 +:2005220009CE4808AA01C74809CF4808C6480BCE480AAA01C7480BCF480A3501022FA60381 +:200542002030C64807CE4806A4FEC74807CF4806C64809CE4808A4FEC74809CF4808C64827 +:200562000BCE480AA4FEC7480BCF480A725F022FA61BC7022D725F022C81A6CCAE0CCDF04F +:2005820009725C02312604725C0230C60231A058C60230A202253DCE4601C64600AA90CF0C +:2005A2004601C74600CE4009C64008A4FECF4009C74008C64603CE4602AA7741AA91CF4620 +:2005C20003C74602A6CCAE0CCDF0004FC70230C70231201CC60231A1572615CE0230A302CF +:2005E200260EC64603CE4602AA40C74603CF4602CD02424D27847207410203CC057C350144 +:20060200022BCC057C0000000000000000000000000000000088899EA010955BBFE2AB01C2 +:2006220097350600E590AE07A610CD0965CE4009C64008AA01CF4009C74008CE4001C640BF +:2006420000AA01CF4001C74000C64603CE4602A4BFC74603CF4602CE4605C64604A40372E5 +:20066200EF026B01CE4607C64606A40372EF046B03CE4609C64608A40372EF066B05CE46B1 +:200682000BC6460AA40372EF086B07CE460DC6460CA40372EF0A6B09CE460FC6460EA40312 +:2006A20072EF0C6B0BCE4611C64610A40372EF0E6B0DCE4613C64612A40372EF106B0F7B34 +:2006C20002C7022A7B01C70229C60127C0022AC60126C202292504A6022014C60125C0024E +:2006E2002AC60124C20229250BC6022826064CC70228201BC60123C0022AC60122C2022986 +:20070200240DC602282708725F02283501022BC6022827043501022B7B12AE01CDF2B69E5C +:20072200AB1295818888C64011C64010A402974F6B0272EF01C1023326069FC10232271857 +:200742007B02C702337B01C70232CE4101C64100AA20CF4101C74100848481725F475F3578 +:2007620030475EA6CCAE0CCDF00920F788897201475F0CCE430BC6430AA4F0AA072008CEF9 +:20078200430BC6430AA4F0CF430BC7430A7B02AE01CDF2B6848481C6400BCE400AA47FC7F4 +:2007A200400BCF400AC6400DCE400CA4FBC7400DCF400CA6CCAE0CCDF00920F78889C640B8 +:2007C20003CE4002A480273EC6400BCE400AA47FC7400BCF400AC64003CE4002AA80C740BA +:2007E20003CF4002C64013CE4012A480270AC64115CE4114A4BF2008C64115CE4114AA4062 +:20080200C74115CF4114C64005CE4004A4042724C6400DCE400CAA04C7400DCF400CC64075 +:2008220005CE4004AA04C74005CF4004725F4104725F41057B02AE01CDF2B68484814D2707 +:200842000B34E836E936EA36EB4A26F581BFE388B6E892C7E2AE01B6E992D7E25CB6EA92FF +:20086200D7E25CB6EB92D7E284BEE381B7EBBFEA3FE93FE8813FE3B6E892D1E226233CE347 +:20088200B6E992D1E226123CE3B6EA92D1E226093CE3B6EB92D1E227082404A6FF2002A63E +:2008A2000181BFE3723300E2AE01726300E25C726300E25C726000E226125A726C00E2268A +:2008C2000B5A726C00E22604723C00E2BEE381CD08D7CC0851BFE3B6E892CAE2B7E8B6E988 +:2008E200AE0192DAE2B7E9B6EA5C92DAE2B7EAB6EB5C92DAE2B7EB81CD09462003CD0911DA +:200902004D270B38EB39EA39E939E84A26F58188F6B7E8E601B7E9E602B7EAE603B7EB84AB +:2009220081BFE3AE03B6EB92D0E2B7EBB6EA5A92D2E2B7EAB6E95A92D2E2B7E9B6E892C2A8 +:20094200E2B7E881BFE38892C6E2B7E8AE0192D6E2B7E95C92D6E2B7EA5C92D6E2B7EB84E4 +:16096200BEE381BFE390BFE6975A92D6E592D7E25D26F6BEE38162 :00000001FF \ No newline at end of file