arm: tegra: tn8-ers: dt: update emc tables
Ryane Luo [Mon, 28 Oct 2013 08:04:49 +0000 (16:04 +0800)]
Sync tables to 0x16 version.
Add the missing EMC_BGBIAS_CTL0 register.
Add "nvidia,tegra12-emc" to memory-controller node.

Bug 1373423

Change-Id: Ie57f50ef5f9eafaa3903e7ba337efef28aefa48f
Signed-off-by: Ryane Luo <ryanel@nvidia.com>
Reviewed-on: http://git-master/r/304364
GVS: Gerrit_Virtual_Submit
Reviewed-by: Nitin Kumbhar <nkumbhar@nvidia.com>

arch/arm/boot/dts/tegra124-tn8-emc.dtsi
arch/arm/mach-tegra/tegra_emc_dt_parse.c

index 2f0837f..7680754 100644 (file)
 memory-controller@7001b000 {
+       compatible = "nvidia,tegra12-emc";
+       reg = <0x7001b000 0x800>;
+       #address-cells = <1>;
+       #size-cells = <0>;
+       emc-table@12750 {
+               compatible = "nvidia,tegra12-emc-table";
+               nvidia,revision = <0x16>;
+               nvidia,dvfs-version = "06_12750_02_V5.0.9_V0.4";
+               clock-frequency = <12750>;
+               nvidia,emc-min-mv = <800>;
+               nvidia,gk20a-min-mv = <800>;
+               nvidia,source = "pllp_out0";
+               nvidia,src-sel-reg = <0x4000003e>;
+               nvidia,burst-regs-num = <168>;
+               nvidia,burst-up-down-regs-num = <31>;
+               nvidia,emc-registers = <
+                       0x00000000
+                       0x00000003
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000004
+                       0x0000000a
+                       0x00000003
+                       0x0000000b
+                       0x00000000
+                       0x00000000
+                       0x00000003
+                       0x00000003
+                       0x00000000
+                       0x00000006
+                       0x00000006
+                       0x00000006
+                       0x00000002
+                       0x00000000
+                       0x00000005
+                       0x00000005
+                       0x00010000
+                       0x00000003
+                       0x00000008
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000004
+                       0x0000000c
+                       0x0000000d
+                       0x0000000f
+                       0x00000060
+                       0x00000000
+                       0x00000018
+                       0x00000002
+                       0x00000002
+                       0x00000001
+                       0x00000000
+                       0x00000007
+                       0x0000000f
+                       0x00000005
+                       0x00000005
+                       0x00000004
+                       0x00000005
+                       0x00000004
+                       0x00000000
+                       0x00000000
+                       0x00000005
+                       0x00000005
+                       0x00000064
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x1069a298
+                       0x002c00a0
+                       0x00008000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x000fc000
+                       0x000fc000
+                       0x000fc000
+                       0x000fc000
+                       0x0000fc00
+                       0x0000fc00
+                       0x0000fc00
+                       0x0000fc00
+                       0x10000280
+                       0x00000000
+                       0x00111111
+                       0x0130b118
+                       0x00000000
+                       0x00000000
+                       0x77ffc081
+                       0x00000e0e
+                       0x81f1f108
+                       0x07070004
+                       0x0000003f
+                       0x016eeeee
+                       0x51451400
+                       0x00514514
+                       0x00514514
+                       0x51451400
+                       0x0000003f
+                       0x00000007
+                       0x00000000
+                       0x00000000
+                       0x00000042
+                       0x000e000e
+                       0x000e000e
+                       0x00000000
+                       0x00000000
+                       0xa1430000
+                       0x00000000
+                       0x00000003
+                       0x0000f2f3
+                       0x800001c5
+                       0x0000000a
+                       0x40040001
+                       0x8000000a
+                       0x00000001
+                       0x00000001
+                       0x00000002
+                       0x00000000
+                       0x00000002
+                       0x00000001
+                       0x00000002
+                       0x00000008
+                       0x00000003
+                       0x00000002
+                       0x00000003
+                       0x00000006
+                       0x06030203
+                       0x000a0402
+                       0x77e30303
+                       0x001f0000
+               >;
+               nvidia,emc-burst-up-down-regs = <
+                       0x00000001
+                       0x00000007
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff0049
+                       0x00ff0080
+                       0x00ff0004
+                       0x00ff0004
+                       0x000800ff
+                       0x000000ff
+                       0x00ff0004
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff0024
+                       0x00ff00ff
+                       0x000000ff
+                       0x000000ff
+                       0x00ff00ff
+                       0x000000ff
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff00ff
+               >;
+               nvidia,emc-zcal-cnt-long = <0x00000042>;
+               nvidia,emc-acal-interval = <0x001fffff>;
+               nvidia,emc-ctt-term_ctrl = <0x00000802>;
+               nvidia,emc-cfg = <0x73240000>;
+               nvidia,emc-cfg-2 = <0x000008c5>;
+               nvidia,emc-sel-dpd-ctrl = <0x00040128>;
+               nvidia,emc-cfg-dig-dll = <0x002c0068>;
+               nvidia,emc-mode-0 = <0x80001221>;
+               nvidia,emc-mode-1 = <0x80100003>;
+               nvidia,emc-mode-2 = <0x80200008>;
+               nvidia,emc-mode-4 = <0x00000000>;
+       };
+       emc-table@20400 {
+               compatible = "nvidia,tegra12-emc-table";
+               nvidia,revision = <0x16>;
+               nvidia,dvfs-version = "06_20400_02_V5.0.9_V0.4";
+               clock-frequency = <20400>;
+               nvidia,emc-min-mv = <800>;
+               nvidia,gk20a-min-mv = <800>;
+               nvidia,source = "pllp_out0";
+               nvidia,src-sel-reg = <0x40000026>;
+               nvidia,burst-regs-num = <168>;
+               nvidia,burst-up-down-regs-num = <31>;
+               nvidia,emc-registers = <
+                       0x00000000
+                       0x00000005
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000004
+                       0x0000000a
+                       0x00000003
+                       0x0000000b
+                       0x00000000
+                       0x00000000
+                       0x00000003
+                       0x00000003
+                       0x00000000
+                       0x00000006
+                       0x00000006
+                       0x00000006
+                       0x00000002
+                       0x00000000
+                       0x00000005
+                       0x00000005
+                       0x00010000
+                       0x00000003
+                       0x00000008
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000004
+                       0x0000000c
+                       0x0000000d
+                       0x0000000f
+                       0x0000009a
+                       0x00000000
+                       0x00000026
+                       0x00000002
+                       0x00000002
+                       0x00000001
+                       0x00000000
+                       0x00000007
+                       0x0000000f
+                       0x00000006
+                       0x00000006
+                       0x00000004
+                       0x00000005
+                       0x00000004
+                       0x00000000
+                       0x00000000
+                       0x00000005
+                       0x00000005
+                       0x000000a0
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x1069a298
+                       0x002c00a0
+                       0x00008000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00064000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x000fc000
+                       0x000fc000
+                       0x000fc000
+                       0x000fc000
+                       0x0000fc00
+                       0x0000fc00
+                       0x0000fc00
+                       0x0000fc00
+                       0x10000280
+                       0x00000000
+                       0x00111111
+                       0x0130b118
+                       0x00000000
+                       0x00000000
+                       0x77ffc081
+                       0x00000e0e
+                       0x81f1f108
+                       0x07070004
+                       0x0000003f
+                       0x016eeeee
+                       0x51451400
+                       0x00514514
+                       0x00514514
+                       0x51451400
+                       0x0000003f
+                       0x0000000b
+                       0x00000000
+                       0x00000000
+                       0x00000042
+                       0x000e000e
+                       0x000e000e
+                       0x00000000
+                       0x00000000
+                       0xa1430000
+                       0x00000000
+                       0x00000003
+                       0x0000f2f3
+                       0x8000023a
+                       0x0000000a
+                       0x40020001
+                       0x80000012
+                       0x00000001
+                       0x00000001
+                       0x00000002
+                       0x00000000
+                       0x00000002
+                       0x00000001
+                       0x00000002
+                       0x00000008
+                       0x00000003
+                       0x00000002
+                       0x00000003
+                       0x00000006
+                       0x06030203
+                       0x000a0402
+                       0x76230303
+                       0x001f0000
+               >;
+               nvidia,emc-burst-up-down-regs = <
+                       0x00000001
+                       0x0000000a
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff0049
+                       0x00ff0080
+                       0x00ff0004
+                       0x00ff0004
+                       0x000800ff
+                       0x000000ff
+                       0x00ff0004
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff0024
+                       0x00ff00ff
+                       0x000000ff
+                       0x000000ff
+                       0x00ff00ff
+                       0x000000ff
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff00ff
+                       0x00ff00ff
+               >;
+               nvidia,emc-zcal-cnt-long = <0x00000042>;
+               nvidia,emc-acal-interval = <0x001fffff>;
+               nvidia,emc-ctt-term_ctrl = <0x00000802>;
+               nvidia,emc-cfg = <0x73240000>;
+               nvidia,emc-cfg-2 = <0x000008c5>;
+               nvidia,emc-sel-dpd-ctrl = <0x00040128>;
+               nvidia,emc-cfg-dig-dll = <0x002c0068>;
+               nvidia,emc-mode-0 = <0x80001221>;
+               nvidia,emc-mode-1 = <0x80100003>;
+               nvidia,emc-mode-2 = <0x80200008>;
+               nvidia,emc-mode-4 = <0x00000000>;
+       };
        emc-table@40800 {
                compatible = "nvidia,tegra12-emc-table";
-               nvidia,revision = <0x15>;
-               nvidia,dvfs-version = "04_40800_0_V5.0.1_V0.3";
+               nvidia,revision = <0x16>;
+               nvidia,dvfs-version = "06_40800_02_V5.0.9_V0.4";
                clock-frequency = <40800>;
                nvidia,emc-min-mv = <800>;
                nvidia,gk20a-min-mv = <800>;
                nvidia,source = "pllp_out0";
-               nvidia,src-sel-reg = <0x40000006>;
-               nvidia,burst-regs-num = <167>;
+               nvidia,src-sel-reg = <0x40000012>;
+               nvidia,burst-regs-num = <168>;
                nvidia,burst-up-down-regs-num = <31>;
                nvidia,emc-registers = <
                        0x00000001
@@ -33,7 +489,8 @@ memory-controller@7001b000 {
                        0x00000005
                        0x00000005
                        0x00010000
-                       0x00000004
+                       0x00000003
+                       0x00000008
                        0x00000000
                        0x00000000
                        0x00000000
@@ -42,17 +499,17 @@ memory-controller@7001b000 {
                        0x0000000c
                        0x0000000d
                        0x0000000f
-                       0x0000012e
+                       0x00000134
                        0x00000000
-                       0x0000004b
+                       0x0000004d
                        0x00000002
                        0x00000002
                        0x00000001
                        0x00000000
                        0x00000008
                        0x0000000f
-                       0x0000000b
-                       0x0000000b
+                       0x0000000c
+                       0x0000000c
                        0x00000004
                        0x00000005
                        0x00000004
@@ -60,11 +517,11 @@ memory-controller@7001b000 {
                        0x00000000
                        0x00000005
                        0x00000005
-                       0x00000138
+                       0x0000013f
                        0x00000000
                        0x00000000
                        0x00000000
-                       0x1069aa98
+                       0x1069a298
                        0x002c00a0
                        0x00008000
                        0x00064000
@@ -121,21 +578,21 @@ memory-controller@7001b000 {
                        0x00000000
                        0x00000000
                        0x00000000
-                       0x0007c000
-                       0x0007c000
-                       0x0007c000
-                       0x0007c000
-                       0x00007c00
-                       0x00007c00
-                       0x00007c00
-                       0x00007c00
-                       0x100002a0
+                       0x000fc000
+                       0x000fc000
+                       0x000fc000
+                       0x000fc000
+                       0x0000fc00
+                       0x0000fc00
+                       0x0000fc00
+                       0x0000fc00
+                       0x10000280
                        0x00000000
                        0x00111111
-                       0x0030a11c
+                       0x0130b118
                        0x00000000
                        0x00000000
-                       0x77ffc085
+                       0x77ffc081
                        0x00000e0e
                        0x81f1f108
                        0x07070004
@@ -145,8 +602,8 @@ memory-controller@7001b000 {
                        0x00514514
                        0x00514514
                        0x51451400
-                       0x0505003f
-                       0x00000014
+                       0x0000003f
+                       0x00000015
                        0x00000000
                        0x00000000
                        0x00000042
@@ -156,11 +613,11 @@ memory-controller@7001b000 {
                        0x00000000
                        0xa1430000
                        0x00000000
-                       0x00000004
+                       0x00000003
                        0x0000f2f3
-                       0x80000364
+                       0x80000370
                        0x0000000a
-                       0xb0000001
+                       0xa0000001
                        0x80000017
                        0x00000001
                        0x00000001
@@ -176,8 +633,9 @@ memory-controller@7001b000 {
                        0x00000006
                        0x06030203
                        0x000a0402
-                       0x74c30303
-                       0x001f0000>;
+                       0x74a30303
+                       0x001f0000
+               >;
                nvidia,emc-burst-up-down-regs = <
                        0x00000001
                        0x00000014
@@ -209,13 +667,14 @@ memory-controller@7001b000 {
                        0x00ff00ff
                        0x00ff00ff
                        0x00ff00ff
-                       0x00ff00ff>;
+                       0x00ff00ff
+               >;
                nvidia,emc-zcal-cnt-long = <0x00000042>;
                nvidia,emc-acal-interval = <0x001fffff>;
                nvidia,emc-ctt-term_ctrl = <0x00000802>;
                nvidia,emc-cfg = <0x73240000>;
-               nvidia,emc-cfg-2 = <0x00000885>;
-               nvidia,emc-sel-dpd-ctrl = <0x0004012c>;
+               nvidia,emc-cfg-2 = <0x000008c5>;
+               nvidia,emc-sel-dpd-ctrl = <0x00040128>;
                nvidia,emc-cfg-dig-dll = <0x002c0068>;
                nvidia,emc-mode-0 = <0x80001221>;
                nvidia,emc-mode-1 = <0x80100003>;
@@ -224,14 +683,14 @@ memory-controller@7001b000 {
        };
        emc-table@68000 {
                compatible = "nvidia,tegra12-emc-table";
-               nvidia,revision = <0x15>;
-               nvidia,dvfs-version = "04_68000_0_V5.0.1_V0.3";
+               nvidia,revision = <0x16>;
+               nvidia,dvfs-version = "06_68000_02_V5.0.9_V0.4";
                clock-frequency = <68000>;
                nvidia,emc-min-mv = <800>;
                nvidia,gk20a-min-mv = <800>;
                nvidia,source = "pllp_out0";
                nvidia,src-sel-reg = <0x4000000a>;
-               nvidia,burst-regs-num = <167>;
+               nvidia,burst-regs-num = <168>;
                nvidia,burst-up-down-regs-num = <31>;
                nvidia,emc-registers = <
                        0x00000003
@@ -256,7 +715,8 @@ memory-controller@7001b000 {
                        0x00000005
                        0x00000005
                        0x00010000
-                       0x00000004
+                       0x00000003
+                       0x00000008
                        0x00000000
                        0x00000000
                        0x00000000
@@ -287,7 +747,7 @@ memory-controller@7001b000 {
                        0x00000000
                        0x00000000
                        0x00000000
-                       0x1069aa98
+                       0x1069a298
                        0x002c00a0
                        0x00008000
                        0x00064000
@@ -344,21 +804,21 @@ memory-controller@7001b000 {
                        0x00000000
                        0x00000000
                        0x00000000
-                       0x0007c000
-                       0x0007c000
-                       0x0007c000
-                       0x0007c000
-                       0x00007c00
-                       0x00007c00
-                       0x00007c00
-                       0x00007c00
-                       0x100002a0
+                       0x000fc000
+                       0x000fc000
+                       0x000fc000
+                       0x000fc000
+                       0x0000fc00
+                       0x0000fc00
+                       0x0000fc00
+                       0x0000fc00
+                       0x10000280
                        0x00000000
                        0x00111111
-                       0x0030a11c
+                       0x0130b118
                        0x00000000
                        0x00000000
-                       0x77ffc085
+                       0x77ffc081
                        0x00000e0e
                        0x81f1f108
                        0x07070004
@@ -368,7 +828,7 @@ memory-controller@7001b000 {
                        0x00514514
                        0x00514514
                        0x51451400
-                       0x0505003f
+                       0x0000003f
                        0x00000022
                        0x00000000
                        0x00000000
@@ -379,7 +839,7 @@ memory-controller@7001b000 {
                        0x00000000
                        0xa1430000
                        0x00000000
-                       0x00000004
+                       0x00000003
                        0x0000f2f3
                        0x8000050e
                        0x0000000a
@@ -400,7 +860,8 @@ memory-controller@7001b000 {
                        0x06030203
                        0x000a0402
                        0x74230403
-                       0x001f0000>;
+                       0x001f0000
+               >;
                nvidia,emc-burst-up-down-regs = <
                        0x00000001
                        0x00000021
@@ -432,13 +893,14 @@ memory-controller@7001b000 {
                        0x00ff00ff
                        0x00ff00ff
                        0x00ff00ff
-                       0x00ff00ff>;
+                       0x00ff00ff
+               >;
                nvidia,emc-zcal-cnt-long = <0x00000042>;
                nvidia,emc-acal-interval = <0x001fffff>;
                nvidia,emc-ctt-term_ctrl = <0x00000802>;
                nvidia,emc-cfg = <0x73240000>;
-               nvidia,emc-cfg-2 = <0x00000885>;
-               nvidia,emc-sel-dpd-ctrl = <0x0004012c>;
+               nvidia,emc-cfg-2 = <0x000008c5>;
+               nvidia,emc-sel-dpd-ctrl = <0x00040128>;
                nvidia,emc-cfg-dig-dll = <0x002c0068>;
                nvidia,emc-mode-0 = <0x80001221>;
                nvidia,emc-mode-1 = <0x80100003>;
@@ -447,14 +909,14 @@ memory-controller@7001b000 {
        };
        emc-table@102000 {
                compatible = "nvidia,tegra12-emc-table";
-               nvidia,revision = <0x15>;
-               nvidia,dvfs-version = "04_102000_0_V5.0.1_V0.3";
+               nvidia,revision = <0x16>;
+               nvidia,dvfs-version = "06_102000_02_V5.0.9_V0.4";
                clock-frequency = <102000>;
                nvidia,emc-min-mv = <800>;
                nvidia,gk20a-min-mv = <800>;
                nvidia,source = "pllp_out0";
                nvidia,src-sel-reg = <0x40000006>;
-               nvidia,burst-regs-num = <167>;
+               nvidia,burst-regs-num = <168>;
                nvidia,burst-up-down-regs-num = <31>;
                nvidia,emc-registers = <
                        0x00000004
@@ -479,7 +941,8 @@ memory-controller@7001b000 {
                        0x00000005
                        0x00000005
                        0x00010000
-                       0x00000004
+                       0x00000003
+                       0x00000008
                        0x00000000
                        0x00000000
                        0x00000000
@@ -510,7 +973,7 @@ memory-controller@7001b000 {
                        0x00000000
                        0x00000000
                        0x00000000
-                       0x1069aa98
+                       0x1069a298
                        0x002c00a0
                        0x00008000
                        0x00064000
@@ -567,21 +1030,21 @@ memory-controller@7001b000 {
                        0x00000000
                        0x00000000
                        0x00000000
-                       0x0007c000
-                       0x0007c000
-                       0x0007c000
-                       0x0007c000
-                       0x00007c00
-                       0x00007c00
-                       0x00007c00
-                       0x00007c00
-                       0x100002a0
+                       0x000fc000
+                       0x000fc000
+                       0x000fc000
+                       0x000fc000
+                       0x0000fc00
+                       0x0000fc00
+                       0x0000fc00
+                       0x0000fc00
+                       0x10000280
                        0x00000000
                        0x00111111
-                       0x0030a11c
+                       0x0130b118
                        0x00000000
                        0x00000000
-                       0x77ffc085
+                       0x77ffc081
                        0x00000e0e
                        0x81f1f108
                        0x07070004
@@ -591,7 +1054,7 @@ memory-controller@7001b000 {
                        0x00514514
                        0x00514514
                        0x51451400
-                       0x0505003f
+                       0x0000003f
                        0x00000033
                        0x00000000
                        0x00000000
@@ -602,7 +1065,7 @@ memory-controller@7001b000 {
                        0x00000000
                        0xa1430000
                        0x00000000
-                       0x00000004
+                       0x00000003
                        0x0000f2f3
                        0x80000713
                        0x0000000a
@@ -623,7 +1086,8 @@ memory-controller@7001b000 {
                        0x06030203
                        0x000a0403
                        0x73c30504
-                       0x001f0000>;
+                       0x001f0000
+               >;
                nvidia,emc-burst-up-down-regs = <
                        0x00000001
                        0x00000031
@@ -655,13 +1119,14 @@ memory-controller@7001b000 {
                        0x00ff00ff
                        0x00ff00ff
                        0x00ff00ff
-                       0x00ff00da>;
+                       0x00ff00da
+               >;
                nvidia,emc-zcal-cnt-long = <0x00000042>;
                nvidia,emc-acal-interval = <0x001fffff>;
                nvidia,emc-ctt-term_ctrl = <0x00000802>;
                nvidia,emc-cfg = <0x73240000>;
-               nvidia,emc-cfg-2 = <0x00000885>;
-               nvidia,emc-sel-dpd-ctrl = <0x0004012c>;
+               nvidia,emc-cfg-2 = <0x000008c5>;
+               nvidia,emc-sel-dpd-ctrl = <0x00040128>;
                nvidia,emc-cfg-dig-dll = <0x002c0068>;
                nvidia,emc-mode-0 = <0x80001221>;
                nvidia,emc-mode-1 = <0x80100003>;
@@ -670,14 +1135,14 @@ memory-controller@7001b000 {
        };
        emc-table@204000 {
                compatible = "nvidia,tegra12-emc-table";
-               nvidia,revision = <0x15>;
-               nvidia,dvfs-version = "04_204000_0_V5.0.1_V0.3";
+               nvidia,revision = <0x16>;
+               nvidia,dvfs-version = "06_204000_03_V5.0.9_V0.4";
                clock-frequency = <204000>;
                nvidia,emc-min-mv = <800>;
                nvidia,gk20a-min-mv = <800>;
                nvidia,source = "pllp_out0";
                nvidia,src-sel-reg = <0x40000002>;
-               nvidia,burst-regs-num = <167>;
+               nvidia,burst-regs-num = <168>;
                nvidia,burst-up-down-regs-num = <31>;
                nvidia,emc-registers = <
                        0x00000009
@@ -702,7 +1167,8 @@ memory-controller@7001b000 {
                        0x00000004
                        0x00000006
                        0x00010000
-                       0x00000004
+                       0x00000003
+                       0x00000008
                        0x00000000
                        0x00000000
                        0x00000000
@@ -733,7 +1199,7 @@ memory-controller@7001b000 {
                        0x00000000
                        0x00000000
                        0x00000000
-                       0x1069aa98
+                       0x1069a298
                        0x002c00a0
                        0x00008000
                        0x00064000
@@ -790,21 +1256,21 @@ memory-controller@7001b000 {
                        0x00000000
                        0x00000000
                        0x00000000
-                       0x0007c000
-                       0x0007c000
-                       0x0007c000
-                       0x0007c000
-                       0x00007c00
-                       0x00007c00
-                       0x00007c00
-                       0x00007c00
-                       0x100002a0
+                       0x00060000
+                       0x00060000
+                       0x00060000
+                       0x00060000
+                       0x00006000
+                       0x00006000
+                       0x00006000
+                       0x00006000
+                       0x10000280
                        0x00000000
                        0x00111111
-                       0x0030a11c
+                       0x0130b118
                        0x00000000
                        0x00000000
-                       0x77ffc085
+                       0x77ffc081
                        0x00000707
                        0x81f1f108
                        0x07070004
@@ -814,8 +1280,8 @@ memory-controller@7001b000 {
                        0x00514514
                        0x00514514
                        0x51451400
-                       0x0505003f
-                       0x00000000
+                       0x0000003f
+                       0x00000066
                        0x00000000
                        0x00020000
                        0x00000100
@@ -825,7 +1291,7 @@ memory-controller@7001b000 {
                        0x00000000
                        0xa1430000
                        0x00000000
-                       0x00000004
+                       0x00000003
                        0x0000d2b3
                        0x80000d22
                        0x0000000a
@@ -846,7 +1312,8 @@ memory-controller@7001b000 {
                        0x06040203
                        0x000a0404
                        0x73840a05
-                       0x001f0000>;
+                       0x001f0000
+               >;
                nvidia,emc-burst-up-down-regs = <
                        0x00000001
                        0x00000062
@@ -878,33 +1345,34 @@ memory-controller@7001b000 {
                        0x00ff00ff
                        0x00ff00ff
                        0x00ff00c6
-                       0x00ff006d>;
+                       0x00ff006d
+               >;
                nvidia,emc-zcal-cnt-long = <0x00000042>;
                nvidia,emc-acal-interval = <0x001fffff>;
                nvidia,emc-ctt-term_ctrl = <0x00000802>;
-               nvidia,emc-cfg = <0x73200000>;
-               nvidia,emc-cfg-2 = <0x0000088d>;
-               nvidia,emc-sel-dpd-ctrl = <0x0004012c>;
+               nvidia,emc-cfg = <0x73240000>;
+               nvidia,emc-cfg-2 = <0x000008cd>;
+               nvidia,emc-sel-dpd-ctrl = <0x00040128>;
                nvidia,emc-cfg-dig-dll = <0x002c0068>;
                nvidia,emc-mode-0 = <0x80001221>;
                nvidia,emc-mode-1 = <0x80100003>;
                nvidia,emc-mode-2 = <0x80200008>;
                nvidia,emc-mode-4 = <0x00000000>;
        };
-       emc-table@312000 {
+       emc-table@300000 {
                compatible = "nvidia,tegra12-emc-table";
-               nvidia,revision = <0x15>;
-               nvidia,dvfs-version = "04_312000_2_V5.0.1_V0.3";
-               clock-frequency = <312000>;
-               nvidia,emc-min-mv = <820>;
+               nvidia,revision = <0x16>;
+               nvidia,dvfs-version = "06_300000_01_V5.0.9_V0.4";
+               clock-frequency = <300000>;
+               nvidia,emc-min-mv = <810>;
                nvidia,gk20a-min-mv = <800>;
-               nvidia,source = "pllm_out0";
-               nvidia,src-sel-reg = <0x00000002>;
-               nvidia,burst-regs-num = <167>;
+               nvidia,source = "pllc_out0";
+               nvidia,src-sel-reg = <0x20000002>;
+               nvidia,burst-regs-num = <168>;
                nvidia,burst-up-down-regs-num = <31>;
                nvidia,emc-registers = <
                        0x0000000d
-                       0x00000050
+                       0x0000004d
                        0x00000000
                        0x00000009
                        0x00000003
@@ -922,10 +1390,11 @@ memory-controller@7001b000 {
                        0x00000005
                        0x00000002
                        0x00000000
-                       0x00000002
+                       0x00000003
                        0x00000006
                        0x00030000
-                       0x00000004
+                       0x00000003
+                       0x00000000
                        0x00000000
                        0x00000000
                        0x00000000
@@ -934,29 +1403,29 @@ memory-controller@7001b000 {
                        0x0000000d
                        0x0000000e
                        0x00000010
-                       0x00000942
+                       0x000008e4
                        0x00000000
-                       0x00000250
+                       0x00000239
                        0x00000001
                        0x00000008
                        0x00000001
                        0x00000000
-                       0x0000004e
+                       0x0000004b
                        0x0000000e
-                       0x00000055
+                       0x00000052
                        0x00000200
                        0x00000004
                        0x00000005
                        0x00000004
-                       0x0000000a
+                       0x00000009
                        0x00000000
                        0x00000005
                        0x00000005
-                       0x00000982
-                       0x00000002
+                       0x00000924
                        0x00000000
                        0x00000000
-                       0x1049b898
+                       0x00000000
+                       0x1049b098
                        0x002c00a0
                        0x00008000
                        0x00030000
@@ -1038,21 +1507,21 @@ memory-controller@7001b000 {
                        0x00514514
                        0x51451400
                        0x0000003f
-                       0x0000009c
+                       0x00000096
                        0x00000000
                        0x00020000
                        0x00000100
-                       0x0170000e
-                       0x0170000e
+                       0x0173000e
+                       0x0173000e
                        0x00000000
                        0x00000000
                        0xa1430000
                        0x00000000
-                       0x00000004
+                       0x00000003
                        0x0000d3b3
-                       0x8000138d
+                       0x800012d7
                        0x00000009
-                       0x0b000004
+                       0x08000004
                        0x80000040
                        0x00000001
                        0x00000002
@@ -1068,46 +1537,48 @@ memory-controller@7001b000 {
                        0x00000006
                        0x06040202
                        0x000b0607
-                       0x76e50f08
-                       0x001f0000>;
+                       0x77450e08
+                       0x001f0000
+               >;
                nvidia,emc-burst-up-down-regs = <
-                       0x00000005
-                       0x00000096
-                       0x00ff0047
-                       0x00ff0047
+                       0x00000004
+                       0x00000090
+                       0x00ff004a
+                       0x00ff004a
                        0x00ff003c
                        0x00ff0090
                        0x00ff0041
                        0x00ff0090
                        0x00ff0041
-                       0x00330049
+                       0x00350049
                        0x00ff0080
                        0x00ff0004
                        0x00ff0004
-                       0x00080039
+                       0x0008003b
                        0x000000ff
                        0x00ff0004
-                       0x00ff0041
-                       0x00ff002c
+                       0x00ff0043
+                       0x00ff002d
                        0x00ff0024
-                       0x00ff0046
+                       0x00ff0049
                        0x000000ff
                        0x00000036
                        0x00ff00ff
                        0x00000036
                        0x00ff00ff
                        0x00d400ff
-                       0x00510034
+                       0x00510036
                        0x00ff00ff
                        0x00ff00ff
-                       0x00ff0082
-                       0x00ff0047>;
+                       0x00ff0087
+                       0x00ff004a
+               >;
                nvidia,emc-zcal-cnt-long = <0x00000042>;
                nvidia,emc-acal-interval = <0x001fffff>;
                nvidia,emc-ctt-term_ctrl = <0x00000802>;
                nvidia,emc-cfg = <0x73340000>;
-               nvidia,emc-cfg-2 = <0x0000088d>;
-               nvidia,emc-sel-dpd-ctrl = <0x0004012c>;
+               nvidia,emc-cfg-2 = <0x000008cd>;
+               nvidia,emc-sel-dpd-ctrl = <0x00040128>;
                nvidia,emc-cfg-dig-dll = <0x002c0068>;
                nvidia,emc-mode-0 = <0x80000321>;
                nvidia,emc-mode-1 = <0x80100002>;
@@ -1116,14 +1587,14 @@ memory-controller@7001b000 {
        };
        emc-table@396000 {
                compatible = "nvidia,tegra12-emc-table";
-               nvidia,revision = <0x15>;
-               nvidia,dvfs-version = "04_396000_1_V5.0.1_V0.3";
+               nvidia,revision = <0x16>;
+               nvidia,dvfs-version = "06_396000_03_V5.0.9_V0.4";
                clock-frequency = <396000>;
-               nvidia,emc-min-mv = <870>;
-               nvidia,gk20a-min-mv = <800>;
-               nvidia,source = "pllc_out0";
-               nvidia,src-sel-reg = <0x20000002>;
-               nvidia,burst-regs-num = <167>;
+               nvidia,emc-min-mv = <860>;
+               nvidia,gk20a-min-mv = <900>;
+               nvidia,source = "pllm_out0";
+               nvidia,src-sel-reg = <0x00000002>;
+               nvidia,burst-regs-num = <168>;
                nvidia,burst-up-down-regs-num = <31>;
                nvidia,emc-registers = <
                        0x00000011
@@ -1131,7 +1602,7 @@ memory-controller@7001b000 {
                        0x00000000
                        0x0000000c
                        0x00000004
-                       0x00000004
+                       0x00000005
                        0x00000008
                        0x00000002
                        0x0000000a
@@ -1145,10 +1616,11 @@ memory-controller@7001b000 {
                        0x00000005
                        0x00000002
                        0x00000000
-                       0x00000002
+                       0x00000003
                        0x00000006
                        0x00030000
-                       0x00000004
+                       0x00000003
+                       0x00000000
                        0x00000000
                        0x00000000
                        0x00000000
@@ -1176,10 +1648,10 @@ memory-controller@7001b000 {
                        0x00000005
                        0x00000005
                        0x00000c11
-                       0x00000002
                        0x00000000
                        0x00000000
-                       0x1049b898
+                       0x00000000
+                       0x1049b098
                        0x002c00a0
                        0x00008000
                        0x00030000
@@ -1206,11 +1678,11 @@ memory-controller@7001b000 {
                        0x00000000
                        0x00000000
                        0x00000000
-                       0x00070000
-                       0x00070000
+                       0x00040000
+                       0x00040000
                        0x00000000
-                       0x00070000
-                       0x00070000
+                       0x00040000
+                       0x00040000
                        0x00000000
                        0x00000000
                        0x00000000
@@ -1244,13 +1716,13 @@ memory-controller@7001b000 {
                        0x00004400
                        0x00004400
                        0x00004400
-                       0x100002a0
+                       0x10000280
                        0x00000000
                        0x00111111
-                       0x0123133d
+                       0x01231339
                        0x00000000
                        0x00000000
-                       0x77ffc085
+                       0x77ffc081
                        0x00000505
                        0x81f1f108
                        0x07070004
@@ -1271,7 +1743,7 @@ memory-controller@7001b000 {
                        0x00000000
                        0xa1430000
                        0x00000000
-                       0x00000004
+                       0x00000003
                        0x0000d3b3
                        0x8000188b
                        0x00000009
@@ -1292,7 +1764,8 @@ memory-controller@7001b000 {
                        0x06040202
                        0x000d0709
                        0x7586120a
-                       0x001f0000>;
+                       0x001f0000
+               >;
                nvidia,emc-burst-up-down-regs = <
                        0x0000000a
                        0x000000be
@@ -1324,35 +1797,262 @@ memory-controller@7001b000 {
                        0x00ff00ff
                        0x00ff00ff
                        0x00ff0066
-                       0x00ff0038>;
+                       0x00ff0038
+               >;
                nvidia,emc-zcal-cnt-long = <0x00000042>;
                nvidia,emc-acal-interval = <0x001fffff>;
                nvidia,emc-ctt-term_ctrl = <0x00000802>;
                nvidia,emc-cfg = <0x73340000>;
                nvidia,emc-cfg-2 = <0x0000088d>;
-               nvidia,emc-sel-dpd-ctrl = <0x0004012c>;
+               nvidia,emc-sel-dpd-ctrl = <0x00040008>;
                nvidia,emc-cfg-dig-dll = <0x002c0068>;
                nvidia,emc-mode-0 = <0x80000521>;
                nvidia,emc-mode-1 = <0x80100002>;
                nvidia,emc-mode-2 = <0x80200000>;
                nvidia,emc-mode-4 = <0x00000000>;
        };
-       emc-table@624000 {
+       emc-table@528000 {
                compatible = "nvidia,tegra12-emc-table";
-               nvidia,revision = <0x15>;
-               nvidia,dvfs-version = "04_624000_2_NoRegCalcVersion_V0.3";
-               clock-frequency = <624000>;
-               nvidia,emc-min-mv = <910>;
+               nvidia,revision = <0x16>;
+               nvidia,dvfs-version = "06_528000_02_V5.0.9_V0.4";
+               clock-frequency = <528000>;
+               nvidia,emc-min-mv = <920>;
                nvidia,gk20a-min-mv = <900>;
                nvidia,source = "pllm_ud";
                nvidia,src-sel-reg = <0x80000000>;
-               nvidia,burst-regs-num = <167>;
+               nvidia,burst-regs-num = <168>;
                nvidia,burst-up-down-regs-num = <31>;
                nvidia,emc-registers = <
-                       0x0000001c
-                       0x000000a1
+                       0x00000018
+                       0x00000088
                        0x00000000
-                       0x00000014
+                       0x00000010
+                       0x00000006
+                       0x00000006
+                       0x00000009
+                       0x00000002
+                       0x0000000d
+                       0x00000006
+                       0x00000006
+                       0x00000002
+                       0x00000002
+                       0x00000000
+                       0x00000004
+                       0x00000004
+                       0x00000008
+                       0x00000002
+                       0x00000000
+                       0x00000005
+                       0x00000007
+                       0x00060000
+                       0x00000003
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000004
+                       0x0000000e
+                       0x00000013
+                       0x00000015
+                       0x00000fd6
+                       0x00000000
+                       0x000003f5
+                       0x00000002
+                       0x0000000b
+                       0x00000001
+                       0x00000000
+                       0x00000085
+                       0x00000012
+                       0x00000090
+                       0x00000200
+                       0x00000004
+                       0x00000005
+                       0x00000004
+                       0x00000013
+                       0x00000000
+                       0x00000006
+                       0x00000006
+                       0x00001017
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x1049b098
+                       0xe01200b1
+                       0x00008000
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00054000
+                       0x00054000
+                       0x00000000
+                       0x00054000
+                       0x00054000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x00000000
+                       0x0000000e
+                       0x0000000e
+                       0x0000000e
+                       0x0000000e
+                       0x0000000e
+                       0x0000000e
+                       0x0000000e
+                       0x0000000e
+                       0x100002a0
+                       0x00000000
+                       0x00111111
+                       0x0123133d
+                       0x00000000
+                       0x00000000
+                       0x77ffc085
+                       0x00000505
+                       0x81f1f108
+                       0x07070004
+                       0x00000000
+                       0x016eeeee
+                       0x51451420
+                       0x00514514
+                       0x00514514
+                       0x51451400
+                       0x0606003f
+                       0x00000000
+                       0x00000000
+                       0x00020000
+                       0x00000100
+                       0x0139000e
+                       0x0139000e
+                       0x00000000
+                       0x00000000
+                       0xa1430000
+                       0x00000000
+                       0x00000003
+                       0x000052a0
+                       0x80002062
+                       0x0000000c
+                       0x0f000007
+                       0x80000040
+                       0x00000002
+                       0x00000003
+                       0x0000000c
+                       0x00000007
+                       0x0000000a
+                       0x00000001
+                       0x00000002
+                       0x00000009
+                       0x00000002
+                       0x00000002
+                       0x00000005
+                       0x00000006
+                       0x06050202
+                       0x0010090c
+                       0x7428180d
+                       0x001f0000
+               >;
+               nvidia,emc-burst-up-down-regs = <
+                       0x0000000d
+                       0x000000fd
+                       0x00c10038
+                       0x00c10038
+                       0x00c1003c
+                       0x00c10090
+                       0x00c10041
+                       0x00c10090
+                       0x00c10041
+                       0x00270049
+                       0x00c10080
+                       0x00c10004
+                       0x00c10004
+                       0x00080021
+                       0x000000c1
+                       0x00c10004
+                       0x00c10026
+                       0x00c1001a
+                       0x00c10024
+                       0x00c10029
+                       0x000000c1
+                       0x00000036
+                       0x00c100c1
+                       0x00000036
+                       0x00c100c1
+                       0x00d400ff
+                       0x00510029
+                       0x00c100c1
+                       0x00c100c1
+                       0x00c10065
+                       0x00c1002a
+               >;
+               nvidia,emc-zcal-cnt-long = <0x00000042>;
+               nvidia,emc-acal-interval = <0x001fffff>;
+               nvidia,emc-ctt-term_ctrl = <0x00000802>;
+               nvidia,emc-cfg = <0x73300000>;
+               nvidia,emc-cfg-2 = <0x00000895>;
+               nvidia,emc-sel-dpd-ctrl = <0x00040008>;
+               nvidia,emc-cfg-dig-dll = <0xe0120069>;
+               nvidia,emc-mode-0 = <0x80000941>;
+               nvidia,emc-mode-1 = <0x80100002>;
+               nvidia,emc-mode-2 = <0x80200008>;
+               nvidia,emc-mode-4 = <0x00000000>;
+       };
+       emc-table@600000 {
+               compatible = "nvidia,tegra12-emc-table";
+               nvidia,revision = <0x16>;
+               nvidia,dvfs-version = "06_600000_04_V5.0.9_V0.4";
+               clock-frequency = <600000>;
+               nvidia,emc-min-mv = <930>;
+               nvidia,gk20a-min-mv = <900>;
+               nvidia,source = "pllc_ud";
+               nvidia,src-sel-reg = <0xe0000000>;
+               nvidia,burst-regs-num = <168>;
+               nvidia,burst-up-down-regs-num = <31>;
+               nvidia,emc-registers = <
+                       0x0000001b
+                       0x0000009b
+                       0x00000000
+                       0x00000013
                        0x00000007
                        0x00000007
                        0x0000000b
@@ -1370,8 +2070,9 @@ memory-controller@7001b000 {
                        0x00000000
                        0x00000003
                        0x0000000b
-                       0x00080000
-                       0x00000004
+                       0x00070000
+                       0x00000003
+                       0x00000000
                        0x00000000
                        0x00000000
                        0x00000000
@@ -1380,47 +2081,47 @@ memory-controller@7001b000 {
                        0x00000012
                        0x00000016
                        0x00000018
-                       0x000012c3
+                       0x00001208
                        0x00000000
-                       0x000004b0
+                       0x00000482
                        0x00000002
                        0x0000000d
                        0x00000001
                        0x00000000
-                       0x0000009c
+                       0x00000097
                        0x00000015
-                       0x000000a9
+                       0x000000a3
                        0x00000200
                        0x00000004
                        0x00000005
                        0x00000004
-                       0x00000016
+                       0x00000015
                        0x00000000
-                       0x00000007
-                       0x00000007
-                       0x00001304
-                       0x00000002
+                       0x00000006
+                       0x00000006
+                       0x00001248
                        0x00000000
                        0x00000000
-                       0x1049b898
-                       0xe00d01b1
+                       0x00000000
+                       0x1049b098
+                       0xe00e00b1
                        0x00008000
-                       0x00000008
-                       0x00000008
-                       0x00000008
-                       0x00000008
-                       0x00000008
-                       0x00000008
-                       0x00000008
-                       0x00000008
-                       0x00000008
-                       0x00000008
-                       0x00000008
-                       0x00000008
-                       0x00000008
-                       0x00000008
-                       0x00000008
-                       0x00000008
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
+                       0x0000000a
                        0x00000000
                        0x00000000
                        0x00000000
@@ -1429,11 +2130,11 @@ memory-controller@7001b000 {
                        0x00000000
                        0x00000000
                        0x00000000
-                       0x0000400e
-                       0x0000400e
+                       0x0004c000
+                       0x0004c000
                        0x00000000
-                       0x0000400e
-                       0x0000400e
+                       0x0004c000
+                       0x0004c000
                        0x00000000
                        0x00000000
                        0x00000000
@@ -1470,11 +2171,11 @@ memory-controller@7001b000 {
                        0x100002a0
                        0x00000000
                        0x00111111
-                       0x0020013d
+                       0x0121113d
                        0x00000000
                        0x00000000
                        0x77ffc085
-                       0x00000505
+                       0x00000404
                        0x81f1f108
                        0x07070004
                        0x00000000
@@ -1483,26 +2184,26 @@ memory-controller@7001b000 {
                        0x00514514
                        0x00514514
                        0x51451400
-                       0x0505003f
+                       0x0606003f
                        0x00000000
                        0x00000000
                        0x00020000
                        0x00000100
-                       0x0122000e
-                       0x0122000e
+                       0x0127000e
+                       0x0127000e
                        0x00000000
                        0x00000000
                        0xa1430000
                        0x00000000
-                       0x00000004
+                       0x00000003
                        0x000040a0
-                       0x80002617
+                       0x800024a9
                        0x0000000e
-                       0x06000009
+                       0x00000009
                        0x80000040
                        0x00000003
                        0x00000004
-                       0x0000000f
+                       0x0000000e
                        0x00000009
                        0x0000000b
                        0x00000001
@@ -1513,48 +2214,50 @@ memory-controller@7001b000 {
                        0x00000005
                        0x00000007
                        0x07050202
-                       0x00130b0f
-                       0x736a1d10
-                       0x001f0000>;
+                       0x00130b0e
+                       0x73a91b0f
+                       0x001f0000
+               >;
                nvidia,emc-burst-up-down-regs = <
                        0x0000000f
-                       0x0000012b
-                       0x00a40038
-                       0x00a40038
-                       0x00a4003c
-                       0x00a40090
-                       0x00a40041
-                       0x00a40090
-                       0x00a40041
+                       0x00000120
+                       0x00aa0038
+                       0x00aa0038
+                       0x00aa003c
+                       0x00aa0090
+                       0x00aa0041
+                       0x00aa0090
+                       0x00aa0041
                        0x00270049
-                       0x00a40080
-                       0x00a40004
-                       0x00a40004
-                       0x0008001c
-                       0x000000a4
-                       0x00a40004
-                       0x00a40020
-                       0x00a40018
-                       0x00a40024
-                       0x00a40023
-                       0x000000a4
+                       0x00aa0080
+                       0x00aa0004
+                       0x00aa0004
+                       0x0008001d
+                       0x000000aa
+                       0x00aa0004
+                       0x00aa0022
+                       0x00aa0018
+                       0x00aa0024
+                       0x00aa0024
+                       0x000000aa
                        0x00000036
-                       0x00a400a4
+                       0x00aa00aa
                        0x00000036
-                       0x00a400a4
+                       0x00aa00aa
                        0x00d400ff
                        0x00510029
-                       0x00a400a4
-                       0x00a400a4
-                       0x00a40065
-                       0x00a40024>;
+                       0x00aa00aa
+                       0x00aa00aa
+                       0x00aa0065
+                       0x00aa0025
+               >;
                nvidia,emc-zcal-cnt-long = <0x00000042>;
                nvidia,emc-acal-interval = <0x001fffff>;
                nvidia,emc-ctt-term_ctrl = <0x00000802>;
                nvidia,emc-cfg = <0x73300000>;
                nvidia,emc-cfg-2 = <0x0000089d>;
-               nvidia,emc-sel-dpd-ctrl = <0x00040128>;
-               nvidia,emc-cfg-dig-dll = <0xe00d0169>;
+               nvidia,emc-sel-dpd-ctrl = <0x00040008>;
+               nvidia,emc-cfg-dig-dll = <0xe00e0069>;
                nvidia,emc-mode-0 = <0x80000b61>;
                nvidia,emc-mode-1 = <0x80100002>;
                nvidia,emc-mode-2 = <0x80200010>;
@@ -1562,22 +2265,22 @@ memory-controller@7001b000 {
        };
        emc-table@792000 {
                compatible = "nvidia,tegra12-emc-table";
-               nvidia,revision = <0x15>;
-               nvidia,dvfs-version = "04_792000_2_V5.0.1_V0.3";
+               nvidia,revision = <0x16>;
+               nvidia,dvfs-version = "06_792000_05_V5.0.9_V0.4";
                clock-frequency = <792000>;
                nvidia,emc-min-mv = <1000>;
-               nvidia,gk20a-min-mv = <1100>;
-               nvidia,source = "pllc_ud";
-               nvidia,src-sel-reg = <0xe0000000>;
-               nvidia,burst-regs-num = <167>;
+               nvidia,gk20a-min-mv = <1000>;
+               nvidia,source = "pllm_ud";
+               nvidia,src-sel-reg = <0x80000000>;
+               nvidia,burst-regs-num = <168>;
                nvidia,burst-up-down-regs-num = <31>;
                nvidia,emc-registers = <
                        0x00000024
-                       0x000000cc
+                       0x000000cd
                        0x00000000
                        0x00000019
                        0x0000000a
-                       0x00000007
+                       0x00000008
                        0x0000000d
                        0x00000004
                        0x00000013
@@ -1591,18 +2294,19 @@ memory-controller@7001b000 {
                        0x0000000b
                        0x00000002
                        0x00000000
-                       0x00000003
-                       0x0000000c
-                       0x00090000
+                       0x00000002
+                       0x0000000d
+                       0x00080000
                        0x00000004
                        0x00000000
                        0x00000000
                        0x00000000
                        0x00000000
-                       0x00000002
-                       0x00000013
-                       0x00000018
-                       0x0000001a
+                       0x00000000
+                       0x00000001
+                       0x00000014
+                       0x00000017
+                       0x00000019
                        0x000017e2
                        0x00000000
                        0x000005f8
@@ -1610,9 +2314,9 @@ memory-controller@7001b000 {
                        0x00000011
                        0x00000001
                        0x00000000
-                       0x000000c6
+                       0x000000c7
                        0x00000018
-                       0x000000d6
+                       0x000000d7
                        0x00000200
                        0x00000005
                        0x00000006
@@ -1622,11 +2326,11 @@ memory-controller@7001b000 {
                        0x00000008
                        0x00000008
                        0x00001822
-                       0x00000002
                        0x00000000
                        0x00000000
-                       0x1049b898
-                       0xe00701b1
+                       0x00000000
+                       0x1049b098
+                       0xe00700b1
                        0x00008000
                        0x00000006
                        0x00000006
@@ -1652,11 +2356,11 @@ memory-controller@7001b000 {
                        0x00000000
                        0x00000000
                        0x00000000
-                       0x0000400e
-                       0x0000400e
+                       0x00030000
+                       0x00030000
                        0x00000000
-                       0x0000400e
-                       0x0000400e
+                       0x00030000
+                       0x00030000
                        0x00000000
                        0x00000000
                        0x00000000
@@ -1682,18 +2386,18 @@ memory-controller@7001b000 {
                        0x00000000
                        0x00000000
                        0x00000000
-                       0x0000000d
-                       0x0000000d
-                       0x0000000d
-                       0x0000000d
-                       0x0000000d
-                       0x0000000d
-                       0x0000000d
-                       0x0000000d
+                       0x00000009
+                       0x00000009
+                       0x00000009
+                       0x00000009
+                       0x00000009
+                       0x00000009
+                       0x00000009
+                       0x00000009
                        0x100002a0
                        0x00000000
                        0x00111111
-                       0x0020013d
+                       0x0120113d
                        0x00000000
                        0x00000000
                        0x77ffc085
@@ -1706,13 +2410,13 @@ memory-controller@7001b000 {
                        0x00514514
                        0x00514514
                        0x61861800
-                       0x0505003f
+                       0x0606003f
                        0x00000000
                        0x00000000
                        0x00020000
                        0x00000100
-                       0x00f8000e
-                       0x00f8000e
+                       0x00f7000e
+                       0x00f7000e
                        0x00000000
                        0x00000000
                        0xa1430000
@@ -1720,7 +2424,7 @@ memory-controller@7001b000 {
                        0x00000004
                        0x000040a0
                        0x80003012
-                       0x00000010
+                       0x0000000f
                        0x0e00000b
                        0x80000040
                        0x00000004
@@ -1733,12 +2437,13 @@ memory-controller@7001b000 {
                        0x0000000c
                        0x00000002
                        0x00000002
-                       0x00000005
+                       0x00000006
                        0x00000008
-                       0x08050202
+                       0x08060202
                        0x00170e13
-                       0x734c2414
-                       0x001f0000>;
+                       0x736c2414
+                       0x001f0000
+               >;
                nvidia,emc-burst-up-down-regs = <
                        0x00000013
                        0x0000017c
@@ -1770,14 +2475,15 @@ memory-controller@7001b000 {
                        0x00810081
                        0x00810081
                        0x00810065
-                       0x0081001c>;
+                       0x0081001c
+               >;
                nvidia,emc-zcal-cnt-long = <0x00000042>;
                nvidia,emc-acal-interval = <0x001fffff>;
                nvidia,emc-ctt-term_ctrl = <0x00000802>;
                nvidia,emc-cfg = <0x73300000>;
                nvidia,emc-cfg-2 = <0x0000089d>;
                nvidia,emc-sel-dpd-ctrl = <0x00040000>;
-               nvidia,emc-cfg-dig-dll = <0xe0070169>;
+               nvidia,emc-cfg-dig-dll = <0xe0070069>;
                nvidia,emc-mode-0 = <0x80000d71>;
                nvidia,emc-mode-1 = <0x80100002>;
                nvidia,emc-mode-2 = <0x80200018>;
@@ -1785,14 +2491,14 @@ memory-controller@7001b000 {
        };
        emc-table@924000 {
                compatible = "nvidia,tegra12-emc-table";
-               nvidia,revision = <0x15>;
-               nvidia,dvfs-version = "04_924000_4_V5.0.1_V0.3";
+               nvidia,revision = <0x16>;
+               nvidia,dvfs-version = "06_924000_06_V5.0.9_V0.4";
                clock-frequency = <924000>;
-               nvidia,emc-min-mv = <1100>;
+               nvidia,emc-min-mv = <1040>;
                nvidia,gk20a-min-mv = <1100>;
                nvidia,source = "pllm_ud";
                nvidia,src-sel-reg = <0x80000000>;
-               nvidia,burst-regs-num = <167>;
+               nvidia,burst-regs-num = <168>;
                nvidia,burst-up-down-regs-num = <31>;
                nvidia,emc-registers = <
                        0x0000002b
@@ -1800,7 +2506,7 @@ memory-controller@7001b000 {
                        0x00000000
                        0x0000001e
                        0x0000000b
-                       0x00000008
+                       0x0000000a
                        0x0000000f
                        0x00000005
                        0x00000016
@@ -1811,19 +2517,20 @@ memory-controller@7001b000 {
                        0x00000000
                        0x00000007
                        0x00000007
-                       0x0000000e
+                       0x0000000d
                        0x00000002
                        0x00000000
-                       0x00000003
-                       0x0000000e
-                       0x000b0000
+                       0x00000002
+                       0x0000000f
+                       0x000a0000
                        0x00000004
                        0x00000000
                        0x00000000
                        0x00000000
                        0x00000000
-                       0x00000002
-                       0x00000015
+                       0x00000000
+                       0x00000001
+                       0x00000016
                        0x0000001a
                        0x0000001c
                        0x00001be7
@@ -1835,7 +2542,7 @@ memory-controller@7001b000 {
                        0x00000000
                        0x000000e7
                        0x0000001b
-                       0x00000132
+                       0x000000fb
                        0x00000200
                        0x00000006
                        0x00000007
@@ -1849,7 +2556,7 @@ memory-controller@7001b000 {
                        0x00000000
                        0x00000000
                        0x1049b898
-                       0xe00401b1
+                       0xe00400b1
                        0x00008000
                        0x00000003
                        0x00000003
@@ -1875,11 +2582,11 @@ memory-controller@7001b000 {
                        0x00000000
                        0x00000000
                        0x00000000
-                       0x00040000
-                       0x00040000
+                       0x00030000
+                       0x00030000
                        0x00000000
-                       0x00040000
-                       0x00040000
+                       0x00030000
+                       0x00030000
                        0x00000000
                        0x00000000
                        0x00000000
@@ -1956,12 +2663,13 @@ memory-controller@7001b000 {
                        0x0000000e
                        0x00000002
                        0x00000002
-                       0x00000006
+                       0x00000007
                        0x00000009
-                       0x09060202
+                       0x09070202
                        0x001a1016
-                       0x738e2a17
-                       0x001f0000>;
+                       0x734e2a17
+                       0x001f0000
+               >;
                nvidia,emc-burst-up-down-regs = <
                        0x00000017
                        0x000001bb
@@ -1993,18 +2701,18 @@ memory-controller@7001b000 {
                        0x006e006e
                        0x006e006e
                        0x006e0065
-                       0x006e001c>;
+                       0x006e001c
+               >;
                nvidia,emc-zcal-cnt-long = <0x0000004c>;
                nvidia,emc-acal-interval = <0x001fffff>;
                nvidia,emc-ctt-term_ctrl = <0x00000802>;
                nvidia,emc-cfg = <0x73300000>;
                nvidia,emc-cfg-2 = <0x0000089d>;
                nvidia,emc-sel-dpd-ctrl = <0x00040000>;
-               nvidia,emc-cfg-dig-dll = <0xe0040169>;
+               nvidia,emc-cfg-dig-dll = <0xe0040069>;
                nvidia,emc-mode-0 = <0x80000f15>;
                nvidia,emc-mode-1 = <0x80100002>;
                nvidia,emc-mode-2 = <0x80200020>;
                nvidia,emc-mode-4 = <0x00000000>;
        };
 };
-
index bcbc0f8..686d93a 100644 (file)
@@ -54,19 +54,21 @@ void *tegra_emc_dt_parse_pdata(struct platform_device *pdev)
 #if defined(CONFIG_ARCH_TEGRA_12x_SOC)
        struct tegra12_emc_pdata *pdata = NULL;
        const char *comp = "nvidia,tegra12-emc-table";
+       const char *emc_mode = "nvidia,emc-mode-0";
 #elif defined(CONFIG_ARCH_TEGRA_11x_SOC)
        struct tegra11_emc_pdata *pdata = NULL;
        const char *comp = "nvidia,tegra11-emc-table";
+       const char *emc_mode = "nvidia,emc-mode-reset";
 #endif
 
-       tegra_bct_strapping = tegra_get_bct_strapping();
-
        if (!np) {
                dev_err(&pdev->dev,
                        "Unable to find memory-controller node\n");
                return NULL;
        }
 
+       tegra_bct_strapping = tegra_get_bct_strapping();
+
        if (of_find_property(np, "nvidia,use-ram-code", NULL)) {
                tnp = tegra_emc_ramcode_devnode(np);
 
@@ -216,11 +218,10 @@ void *tegra_emc_dt_parse_pdata(struct platform_device *pdev)
                }
                pdata->tables[i].emc_cfg = u;
 
-               ret = of_property_read_u32(iter, "nvidia,emc-mode-reset", &u);
+               ret = of_property_read_u32(iter, emc_mode, &u);
                if (ret) {
-                       dev_err(&pdev->dev,
-                               "malformed emc-mode-reset property in %s\n",
-                               iter->full_name);
+                       dev_err(&pdev->dev, "malformed %s property in %s\n",
+                               emc_mode, iter->full_name);
                        continue;
                }
                pdata->tables[i].emc_mode_reset = u;