Skip to content

Commit

Permalink
mx6var_som: Reuse 2GB RAM DART-MX6 code also for legacy DDR conf
Browse files Browse the repository at this point in the history 
Reuse the code added by commit
"mx6var_som: Fix Ethernet and video issues with 2GB RAM DART-MX6"
also for the legacy DDR configuration, instead of keeping the
same commands in two parts of the code.

Signed-off-by: Eran Matityahu <[email protected]>
  • Loading branch information
@eranmati
eranmati committed Sep 2, 2018
1 parent 501a35f commit 2d1855c
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 47 deletions.
4 changes: 2 additions & 2 deletions board/variscite/mx6var_som/mx6var_eeprom_v2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ void var_eeprom_v2_dram_init(void)
var_eeprom_v2_cfg.custom_addresses_values:
mt128x64mx32_Step3_RamValues);

if (ram_size == 2048) {
if (!is_eeprom_data_correct || ram_size == 2048) {
/* Set DDR clock to 400MHz */
writel(0x00060324, 0x020c4018);
/* AHB_ROOT_CLK change divide ratio from 4 to 3 for ENET */
Expand All @@ -261,7 +261,7 @@ void var_eeprom_v2_dram_init(void)
(struct eeprom_command *) mt128x64mx32_Step3_commands,
common_addresses, common_values, custom_addresses, custom_values);

if (ram_size == 2048) {
if (!is_eeprom_data_correct || ram_size == 2048) {
/* Enable AXI cache for VDOA/VPU/IPU */
writel(0xF00000CF, 0x020e0010);
/* Set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */
Expand Down
87 changes: 42 additions & 45 deletions board/variscite/mx6var_som/mx6var_legacy_dart_auto.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,58 +41,55 @@ unsigned char MX6Q_MMDC_LPDDR2_register_programming_aid_v0_Micron_InterL_command
/*
* This is an automatically generated part.
* Address file was: addresses.inc
* Address file MD5 was: 980A738D4534913CD453034EBE23D4EA
* Address file MD5 was: 8F9C34981E8C202ADAE66E5F87343C32
* Values file was: values.inc
* Values file MD5 was: 21A75C9EDCB34288E2E75596CF8430F6
* DDR file was: mt128x64mx32_Step3.inc
* DDR file MD5 was: E095B4E8E969E41800AF5A6E104D650C
* Values file MD5 was: AA631379DEAAF26A319964126FB59D85
* DDR file was: mt128x64mx32_Step3-removed_400Mhz.inc
* DDR file MD5 was: 8D2AB90F758243C351ED7470DFDF74F6
*/
unsigned char mt128x64mx32_Step3_commands[]={
0xC8, 0xC8, 0xC9, 0xC9, 0x01, 0x9B, 0x02, 0x9B,
0x03, 0x9B, 0x04, 0x9B, 0x05, 0x9B, 0x06, 0x9B,
0x07, 0x9B, 0x08, 0x9B, 0x42, 0x1C, 0x3D, 0x00,
0x2C, 0x06, 0x2E, 0x06, 0x29, 0x06, 0x2A, 0x06,
0x2B, 0x06, 0x2D, 0x00, 0x2F, 0x06, 0x30, 0x06,
0x3A, 0x06, 0x48, 0x06, 0x3B, 0x1C, 0x31, 0x13,
0x33, 0x13, 0x27, 0x13, 0x25, 0x13, 0x24, 0x13,
0x21, 0x13, 0x35, 0x13, 0x37, 0x13, 0x4A, 0x26,
0x46, 0x06, 0x47, 0x06, 0x49, 0x06, 0x4B, 0x06,
0x4C, 0x06, 0x4D, 0x06, 0x4E, 0x06, 0x39, 0x06,
0x32, 0x06, 0x34, 0x06, 0x28, 0x06, 0x26, 0x06,
0x23, 0x06, 0x22, 0x06, 0x36, 0x06, 0x38, 0x06,
0x56, 0x16, 0x79, 0x16, 0x6E, 0xCA, 0x91, 0xCA,
0x5E, 0x90, 0x81, 0xCB, 0x6F, 0x3A, 0x92, 0x3A,
0x70, 0x0D, 0x93, 0x0D, 0x62, 0x6C, 0x63, 0x6C,
0x64, 0x6C, 0x65, 0x6C, 0x85, 0x6C, 0x86, 0x6C,
0x87, 0x6C, 0x88, 0x6C, 0x66, 0x97, 0x67, 0x97,
0x68, 0x97, 0x69, 0x97, 0x89, 0x97, 0x8A, 0x97,
0x8B, 0x97, 0x8C, 0x97, 0x6C, 0xCC, 0x8F, 0xCD,
0x6D, 0xCE, 0x90, 0xCF, 0x6A, 0x67, 0x6B, 0x00,
0x8D, 0x67, 0x8E, 0x00, 0x71, 0x69, 0x95, 0x69,
0x70, 0x0D, 0x93, 0x0D, 0x52, 0xD0, 0x50, 0x1F,
0x53, 0xD1, 0x54, 0xD2, 0x55, 0x0F, 0x58, 0x60,
0x59, 0xD3, 0x5A, 0xD4, 0x51, 0x00, 0x5B, 0x09,
0x4F, 0x8B, 0x75, 0xD0, 0x73, 0x1F, 0x76, 0xD1,
0x77, 0xD2, 0x78, 0x0F, 0x7B, 0x60, 0x7C, 0xD3,
0x7D, 0xD4, 0x74, 0x00, 0x7E, 0x02, 0x72, 0x8B,
0x56, 0x38, 0x56, 0x98, 0x56, 0x93, 0x56, 0xD5,
0x56, 0xD6, 0x79, 0x38, 0x79, 0x98, 0x79, 0x93,
0x79, 0xD5, 0x79, 0xD6, 0x57, 0x10, 0x7A, 0x10,
0x61, 0x00, 0x84, 0x00, 0x70, 0x0D, 0x93, 0x0D,
0x50, 0x23, 0x73, 0x23, 0x5D, 0x19, 0x80, 0x19,
0x56, 0x00, 0x79, 0x00, 0xCA, 0xD7, 0xCB, 0xD8,
0xCC, 0xD8, 0xFF, 0xFF
0x01, 0x9B, 0x02, 0x9B, 0x03, 0x9B, 0x04, 0x9B,
0x05, 0x9B, 0x06, 0x9B, 0x07, 0x9B, 0x08, 0x9B,
0x42, 0x1C, 0x3D, 0x00, 0x2C, 0x06, 0x2E, 0x06,
0x29, 0x06, 0x2A, 0x06, 0x2B, 0x06, 0x2D, 0x00,
0x2F, 0x06, 0x30, 0x06, 0x3A, 0x06, 0x48, 0x06,
0x3B, 0x1C, 0x31, 0x13, 0x33, 0x13, 0x27, 0x13,
0x25, 0x13, 0x24, 0x13, 0x21, 0x13, 0x35, 0x13,
0x37, 0x13, 0x4A, 0x26, 0x46, 0x06, 0x47, 0x06,
0x49, 0x06, 0x4B, 0x06, 0x4C, 0x06, 0x4D, 0x06,
0x4E, 0x06, 0x39, 0x06, 0x32, 0x06, 0x34, 0x06,
0x28, 0x06, 0x26, 0x06, 0x23, 0x06, 0x22, 0x06,
0x36, 0x06, 0x38, 0x06, 0x56, 0x16, 0x79, 0x16,
0x6E, 0xC8, 0x91, 0xC8, 0x5E, 0x90, 0x81, 0xC9,
0x6F, 0x3A, 0x92, 0x3A, 0x70, 0x0D, 0x93, 0x0D,
0x62, 0x6C, 0x63, 0x6C, 0x64, 0x6C, 0x65, 0x6C,
0x85, 0x6C, 0x86, 0x6C, 0x87, 0x6C, 0x88, 0x6C,
0x66, 0x97, 0x67, 0x97, 0x68, 0x97, 0x69, 0x97,
0x89, 0x97, 0x8A, 0x97, 0x8B, 0x97, 0x8C, 0x97,
0x6C, 0xCA, 0x8F, 0xCB, 0x6D, 0xCC, 0x90, 0xCD,
0x6A, 0x67, 0x6B, 0x00, 0x8D, 0x67, 0x8E, 0x00,
0x71, 0x69, 0x95, 0x69, 0x70, 0x0D, 0x93, 0x0D,
0x52, 0xCE, 0x50, 0x1F, 0x53, 0xCF, 0x54, 0xD0,
0x55, 0x0F, 0x58, 0x60, 0x59, 0xD1, 0x5A, 0xD2,
0x51, 0x00, 0x5B, 0x09, 0x4F, 0x8B, 0x75, 0xCE,
0x73, 0x1F, 0x76, 0xCF, 0x77, 0xD0, 0x78, 0x0F,
0x7B, 0x60, 0x7C, 0xD1, 0x7D, 0xD2, 0x74, 0x00,
0x7E, 0x02, 0x72, 0x8B, 0x56, 0x38, 0x56, 0x98,
0x56, 0x93, 0x56, 0xD3, 0x56, 0xD4, 0x79, 0x38,
0x79, 0x98, 0x79, 0x93, 0x79, 0xD3, 0x79, 0xD4,
0x57, 0x10, 0x7A, 0x10, 0x61, 0x00, 0x84, 0x00,
0x70, 0x0D, 0x93, 0x0D, 0x50, 0x23, 0x73, 0x23,
0x5D, 0x19, 0x80, 0x19, 0x56, 0x00, 0x79, 0x00,
0xFF, 0xFF
};

u32 mt128x64mx32_Step3_RamValues[]={
/* ADDRESSES */
0x020C4018, 0x020C4014, 0x020E0010, 0x020E0018,
0x020E001C, 0x00000000,
0x00000000,
/* VALUES */
0x00060324, 0x00018900, 0x1B5F0109, 0xA1310003,
0x40404046, 0x42424648, 0x3A383C34, 0x40323C3C,
0x33374133, 0x00100A82, 0x00000093, 0x009F0E10,
0x001A0889, 0x04028030, 0x03038030, 0xF00000CF,
0x007F007F, 0x00000000
0x1B5F0109, 0xA1310003, 0x40404046, 0x42424648,
0x3A383C34, 0x40323C3C, 0x33374133, 0x00100A82,
0x00000093, 0x009F0E10, 0x001A0889, 0x04028030,
0x03038030, 0x00000000
};
/* End of automatically generated part */

0 comments on commit 2d1855c

Please sign in to comment.