diff options
author | Shengjiu Wang <shengjiu.wang@freescale.com> | 2014-09-04 16:31:10 +0800 |
---|---|---|
committer | Nitin Garg <nitin.garg@freescale.com> | 2015-09-17 08:58:23 -0500 |
commit | 6be0f127f0335a23b9b439458948b2416f521231 (patch) | |
tree | 87cabf5dfd9e464e49d006b9974d57559b3d2f92 | |
parent | 318f4e134aaca6c8a7db6e8af6903c03923ee104 (diff) |
ENGR00329948-1: firmware: imx: add latest sdma script
This is V3 version sdma firmware, which add support for qspi and canfd.
Another update sdma driver for this new script.
Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
-rw-r--r-- | drivers/dma/imx-sdma.c | 6 | ||||
-rw-r--r-- | firmware/Makefile | 1 | ||||
-rwxr-xr-x | firmware/imx/sdma/sdma-imx6q.bin.ihex | 144 | ||||
-rw-r--r-- | include/linux/platform_data/dma-imx-sdma.h | 3 |
4 files changed, 153 insertions, 1 deletions
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index d1f68c105f52..ae63b0502f2a 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -7,7 +7,7 @@ * * Based on code from Freescale: * - * Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved. * * The code contained herein is licensed under the GNU General Public * License. You may obtain a copy of the GNU General Public License @@ -1265,6 +1265,7 @@ static void sdma_issue_pending(struct dma_chan *chan) #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1 34 #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V2 38 +#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V3 40 static void sdma_add_scripts(struct sdma_engine *sdma, const struct sdma_script_start_addrs *addr) @@ -1310,6 +1311,9 @@ static void sdma_load_firmware(const struct firmware *fw, void *context) case 2: sdma->script_number = SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V2; break; + case 3: + sdma->script_number = SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V3; + break; default: dev_err(sdma->dev, "unknown firmware version\n"); goto err_firmware; diff --git a/firmware/Makefile b/firmware/Makefile index cbb09ce9730a..eb82601a4f7c 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -61,6 +61,7 @@ fw-shipped-$(CONFIG_DRM_RADEON) += radeon/R100_cp.bin radeon/R200_cp.bin \ radeon/RV770_pfp.bin radeon/RV770_me.bin \ radeon/RV730_pfp.bin radeon/RV730_me.bin \ radeon/RV710_pfp.bin radeon/RV710_me.bin +fw-shipped-$(CONFIG_IMX_SDMA) += imx/sdma/sdma-imx6q.bin fw-shipped-$(CONFIG_DVB_AV7110) += av7110/bootcode.bin fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \ diff --git a/firmware/imx/sdma/sdma-imx6q.bin.ihex b/firmware/imx/sdma/sdma-imx6q.bin.ihex new file mode 100755 index 000000000000..abf10afdbf87 --- /dev/null +++ b/firmware/imx/sdma/sdma-imx6q.bin.ihex @@ -0,0 +1,144 @@ +:1000000053444D4103000000010000001C000000AB +:1000100028000000BC000000280800008202000048 +:10002000FFFFFFFF00000000FFFFFFFFFFFFFFFFDC +:10003000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD0 +:10004000FFFFFFFFFFFFFFFF6A1A00004B040000E5 +:10005000EB020000BB180000FFFFFFFFC81A000002 +:10006000FFFFFFFFC0030000FFFFFFFFFFFFFFFFD9 +:10007000FFFFFFFFAB020000FFFFFFFF7B0300005D +:10008000FFFFFFFFFFFFFFFF4C0400006E040000B6 +:10009000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF70 +:1000A000000000000018000062180000161A00008E +:1000B000771B0000121B0000AE1B0000E3C1DB57E2 +:1000C000E35FE357F352016A8F00D500017D8D0095 +:1000D000A005EB5D7804037D79042C7D367C7904E2 +:1000E0001F7CEE56000F6006057D0965437E0A629F +:1000F000417E20980A623E7E09653C7E120512050B +:10010000AD026007037DFB55D36D2B98FB55041D95 +:10011000D36DC86A2F7F011F03200048E47C5398E9 +:10012000FB55D76D150005780962C86A0962C86A6F +:10013000D76D5298FB55D76D1500150005780A62EA +:10014000C86A0A62C86AD76D5298FB55D76D150008 +:100150001500150005780B62C86A0B62C86AD76D76 +:10016000097CDF6D077F0000EB55004D077DFAC16C +:10017000E35706980700CC680C6813C20AC20398BC +:10018000D9C1E3C1DB57E35FE357F352216A8F0024 +:10019000D500017D8D00A005EB5DFB567804037D45 +:1001A00079042A7D317C7904207C700B1103EB5398 +:1001B000000F6003057D0965377E0A62357E8698EB +:1001C0000A62327E0965307E12051205AD026007B3 +:1001D000027C065A8E98265A277F011F032000486A +:1001E000E87C700B11031353AF9815000478096273 +:1001F000065A0962265AAE981500150004780A625C +:10020000065A0A62265AAE981500150015000478A1 +:100210000B62065A0B62265A077C0000EB55004D14 +:10022000067DFAC1E357699807000C6813C20AC239 +:100230006698700B110313536C07017CD9C1FB5EE8 +:100240008A066B07017CD9C1F35EDB59D3588F0155 +:1002500010010F398B003CC12B7DC05AC85B4EC1C9 +:10026000277C88038906E35CFF0D1105FF1DBC0593 +:100270003E07004D187D700811007E07097D7D073F +:10028000027D2852E698F852DB54BC02CC02097C6D +:100290007C07027D2852EF98F852D354BC02CC025E +:1002A000097D0004DD988B00C052C85359C1D67D2A +:1002B0000002CD98FF08BF007F07157D8804D50098 +:1002C000017D8D00A005EB5D8F0212021202FF3A44 +:1002D000DA05027C3E071899A402DD02027D3E0782 +:1002E00018995E071899EB559805EB5DF352FB548E +:1002F0006A07267D6C07017D55996B07577C690756 +:10030000047D6807027D010E2F999358D600017D68 +:100310008E009355A005935DA00602780255045DFA +:100320001D7C004E087C6907037D0255177E3C99B1 +:10033000045D147F890693500048017D2799A09998 +:10034000150006780255045D4F070255245D2F07FE +:10035000017CA09917006F07017C012093559D0037 +:100360000700A7D9F598D36C6907047D6807027D5B +:10037000010E64999358D600017D8E009355A00517 +:10038000935DA00602780255C86D0F7C004E087C74 +:100390006907037D0255097E7199C86D067F89063C +:1003A00093500048017D5C99A0999A99C36A6907A6 +:1003B000047D6807027D010E87999358D600017D60 +:1003C0008E009355A005935DA0060278C865045D74 +:1003D0000F7C004E087C6907037DC865097E9499EF +:1003E000045D067F890693500048017D7F99A0999E +:1003F00093559D000700FF6CA7D9F5980000E354C2 +:10040000EB55004D017CF598DD98E354EB55FF0A60 +:100410001102FF1A7F07027CA005B4999D008C058C +:10042000BA05A0051002BA04AD0454040600E3C1E5 +:10043000DB57FB52C36AF352056A8F00D500017D7A +:100440008D00A005EB5D7804037D79042B7D1E7C77 +:100450007904337CEE56000FFB556007027DC36DB7 +:10046000D599041DC36DC8623B7E6006027D1002F3 +:100470001202096A357F1202096A327F1202096A82 +:100480002F7F011F03200048E77C099AFB55C76DA9 +:100490001500150015000578C8620B6AC8620B6A62 +:1004A000C76D089AFB55C76D150015000578C86221 +:1004B0000A6AC8620A6AC76D089AFB55C76D1500BB +:1004C0000578C862096AC862096AC76D097C286A2A +:1004D000077F0000EB55004D057DFAC1DB57BF9942 +:1004E00077C254040AC2BA99D9C1E3C1DB57F352A7 +:1004F000056A8F00D500017D8D00A005FB567804AC +:10050000037D7904297D1F7C79042E7CE35D700DC9 +:100510001105ED55000F6007027D0652329A2652F2 +:10052000337E6005027D10021202096A2D7F1202DD +:10053000096A2A7F1202096A277F011F03200048E7 +:10054000EA7CE3555D9A1500150015000478065203 +:100550000B6A26520B6A5C9A150015000478065245 +:100560000A6A26520A6A5C9A150004780652096AD9 +:100570002652096A097C286A077F0000DB57004D74 +:10058000057DFAC1DB571B9A77C254040AC2189A38 +:10059000E3C1DB57F352056AFB568E02941AC36A15 +:1005A000C8626902267D941EC36ED36EC86248027B +:1005B000C86A9426981EC36EC8629826C36E6002ED +:1005C0000E7D981EC36EC8626C02037D9826C36EB2 +:1005D000AB9A4C02D36EC86A9826C36EBB9AC862A7 +:1005E0006E02017CB59A096A1A7F0125004D217DB2 +:1005F0007C9AE36E8F00D805017D8D00C8626E0283 +:10060000127D096A0C7F01250120F87CDB57004D23 +:10061000107D286A047F0000FAC1DB576E9A07003C +:1006200004620C6AB89A286AFA7F04627AC2580493 +:100630005404FF081100FF18BC00CD00017CAB9AE8 +:10064000286AED7F04627AC20AC26B9AD9C1E3C1FB +:10065000DB57F352056AFB568E02941A0252690266 +:100660001D7D941E06524802065A9426981E065274 +:100670004C02065A9826981E065260020A7C98265A +:1006800006526E02237D096A1D7F0125004D247DDF +:10069000DD9A286A177F04627AC20E9B8F00D80504 +:1006A000017D8D00A00506526E02107D096A0A7F49 +:1006B0000120F97C286A067F0000004D0D7DFAC1FB +:1006C000DB57CD9A070004620C6A0B9B286AFA7FFD +:1006D00004627AC258045404286AF47F0AC2CA9A8F +:1006E00056DBDB57F352056AC7698F00D500017DE1 +:1006F0008D00A0057804037D79041C7D157C7904A8 +:100700001E7CEE56C862287E6006027D1002120230 +:10071000096A227F1202096A1F7F1202096A1C7F7E +:1007200003200048EF7C459B150015000278C86245 +:100730000B6A449B15000278C8620A6A449B0278DF +:10074000C862096A097C286A077F004D077DD35279 +:10075000010802580004169B77C25404D3520108C2 +:10076000025801046EDB139B700B11031353DB5F04 +:100770000A07D3588B00FB5E3CC1157DC05AC85B8D +:100780004EC1117C8803F05DFF0D1105FF1DBC05F6 +:10079000004D047D6D9B0807DB5F0A078B00C35289 +:1007A000CB5359C1EC7D00025E9B016E0B612F7E25 +:1007B0000B622D7E0B632B7E0C0D170417041704A0 +:1007C0009D04081DCC05017C0C0DD16A000F420769 +:1007D000C86FDD6F1C7F8E009D0001680B67177E60 +:1007E000D56B04080278C86F1207117C0B670F7E67 +:1007F00004080278C86F12070A7CDD6F087FD16990 +:10080000010FC86FDD6F037F01010004839B0700A8 +:10081000FF680C680002839BF3DBDB57F352056A29 +:10082000FB52C76A8F00D500017D8D00A0057804BA +:10083000037D79041C7D157C79041E7CEE56C8620C +:10084000287E6006027D10021202096A227F1202CF +:10085000096A1F7F1202096A1C7F03200048EF7C8F +:10086000E29B150015000278C8620B6AE19B150037 +:100870000278C8620A6AE19B0278C862096A097C48 +:10088000286A077F004D077DD352010802580004F3 +:10089000B29B77C25404D3520108025801040BDC06 +:1008A000AF9B700B11031353DB5F0A07D3588B0008 +:1008B000FB5E3CC1157DC05AC85B4EC1117C8803EC +:1008C000F05DFF0D1105FF1DBC05004D047D0A9C68 +:1008D0000807DB5F0A078B00C352CB5359C1EC7D7D +:0408E0000002FB9B7C +:00000001FF diff --git a/include/linux/platform_data/dma-imx-sdma.h b/include/linux/platform_data/dma-imx-sdma.h index eabac4e2fc99..2d08816720f6 100644 --- a/include/linux/platform_data/dma-imx-sdma.h +++ b/include/linux/platform_data/dma-imx-sdma.h @@ -48,6 +48,9 @@ struct sdma_script_start_addrs { s32 ssish_2_mcu_addr; s32 hdmi_dma_addr; /* End of v2 array */ + s32 zcanfd_2_mcu_addr; + s32 zqspi_2_mcu_addr; + /* End of v3 array */ }; /** |