Merge branch 'tx53-ddr-calib'

diff --git a/config/TX53-xx30.ecc b/config/TX53-xx30.ecc
index 610d8bb7fe58a43c29e83a32d875f7869dd353b8..7cc287a5048ea6288cb2f6f1927d0d3cb5557c07 100644 (file)
--- a/config/TX53-xx30.ecc
+++ b/config/TX53-xx30.ecc
@@ -3465,7 +3465,7 @@ cdl_option CYGNUM_HAL_ARM_TX53_SDRAM_SIZE {
 };
 
 # CPU clock
-# This option specifies the CPU clock in MHz of the TX51 module.
+# This option specifies the CPU clock in MHz of the TX53 module.
 #
 cdl_option CYGNUM_HAL_ARM_TX53_CPU_CLK {
     # Flavor: data

diff --git a/config/TX53-xx31.ecc b/config/TX53-xx31.ecc
index 315c0f8326efc2245672188f450e89f5bd24ef86..a5e396c437c2d4c004a0f785b909eadfab054995 100644 (file)
--- a/config/TX53-xx31.ecc
+++ b/config/TX53-xx31.ecc
@@ -3464,7 +3464,7 @@ cdl_option CYGNUM_HAL_ARM_TX53_SDRAM_SIZE {
 };
 
 # CPU clock
-# This option specifies the CPU clock in MHz of the TX51 module.
+# This option specifies the CPU clock in MHz of the TX53 module.
 #
 cdl_option CYGNUM_HAL_ARM_TX53_CPU_CLK {
     # Flavor: data

diff --git a/packages/hal/arm/mx53/karo/v1_0/cdl/hal_arm_tx53.cdl b/packages/hal/arm/mx53/karo/v1_0/cdl/hal_arm_tx53.cdl
index b96985b53ff7b6f4ef8d753907710564be106fc2..ebfb01baa0e68e54083c45681ba4dc6774dac030 100644 (file)
--- a/packages/hal/arm/mx53/karo/v1_0/cdl/hal_arm_tx53.cdl
+++ b/packages/hal/arm/mx53/karo/v1_0/cdl/hal_arm_tx53.cdl
@@ -222,7 +222,7 @@ cdl_package CYGPKG_HAL_ARM_TX53KARO {
             legal_values  { 800 1000 }
             default_value { 1000 }
             description   "
-                This option specifies the CPU clock in MHz of the TX51 module."
+                This option specifies the CPU clock in MHz of the TX53 module."
         }
 
         cdl_option CYGOPT_HAL_ARM_TX53_DEBUG {

diff --git a/packages/hal/arm/mx53/karo/v1_0/include/hal_platform_setup.h b/packages/hal/arm/mx53/karo/v1_0/include/hal_platform_setup.h
index de331e089b410264982ea1c06dcd4c0ba06737a8..fed8b8dfad92411c77650be9ebf9193323789144 100644 (file)
--- a/packages/hal/arm/mx53/karo/v1_0/include/hal_platform_setup.h
+++ b/packages/hal/arm/mx53/karo/v1_0/include/hal_platform_setup.h
@@ -54,10 +54,10 @@
 
 #define SDRAM_CLK                      400
 
-#define DEBUG_LED_BIT          20
-#define LED_GPIO_BASE          GPIO2_BASE_ADDR
-#define LED_MUX_OFFSET         0x174
-#define LED_MUX_MODE           0x11
+#define DEBUG_LED_BIT                  20
+#define LED_GPIO_BASE                  GPIO2_BASE_ADDR
+#define LED_MUX_OFFSET                 0x174
+#define LED_MUX_MODE                   0x11
 
 #ifdef CYGOPT_HAL_ARM_TX53_DEBUG
 #define LED_ON                         bl      led_on
@@ -480,7 +480,7 @@ GPU Memory                       0xF8020000 0xF805FFFF
        .endif
        .endm
 
-#define MXC_DCD_ITEM(addr, val)                mxc_dcd_item    addr, val
+#define MXC_DCD_ITEM(addr, val)                mxc_dcd_item    (addr), (val)
 
 #define MXC_DCD_CMD_SZ_BYTE            1
 #define MXC_DCD_CMD_SZ_SHORT           2
@@ -656,8 +656,8 @@ CK_MAX      tCKSRE, NS_TO_CK(10), 5, 0, 7
        .iflt   tWR - 7
        .set    mr0_val, (((1 - DLL_DISABLE) << 8) /* DLL Reset */ |    \
                        (SLOW_PD << 12) /* PD exit: 0: fast 1: slow */ |\
-                       ((tWR + 1 - 4) << 9) |                          \
-                       ((((tCL + 3) - 4) & 0x7) << 4) |                \
+                       ((tWR + 1 - 4) << 9) |                          \
+                       ((((tCL + 3) - 4) & 0x7) << 4) |                \
                        ((((tCL + 3) - 4) & 0x8) >> 1))
        .else
        .set    mr0_val, ((1 << 8) /* DLL Reset */ |                    \
@@ -677,7 +677,7 @@ CK_MAX      tCKSRE, NS_TO_CK(10), 5, 0, 7
                                         (Rtt_WR << 9) /* dynamic ODT */ |      \
                                         (0 << 7) /* SRT: Ext. temp. (mutually exclusive with ASR!) */ | \
                                         (1 << 6) | /* ASR: Automatic Self Refresh */\
-                                        (((tCWL + 2) - 5) << 3) |              \
+                                        (((tCWL + 2) - 5) << 3) |              \
                                        0)
 #define mr3_val                                0
 

diff --git a/packages/hal/arm/mx53/karo/v1_0/src/tx53_misc.c b/packages/hal/arm/mx53/karo/v1_0/src/tx53_misc.c
index c3e537f72c456d8aafd5e0a02b2f2aff8eec7172..dffac58e22ca32b3709390dd89fbdcf0e493e0fb 100644 (file)
--- a/packages/hal/arm/mx53/karo/v1_0/src/tx53_misc.c
+++ b/packages/hal/arm/mx53/karo/v1_0/src/tx53_misc.c
@@ -733,26 +733,16 @@ int adjust_core_voltage(unsigned int clock)
        int volt;
        int retries = 0;
 
-       switch (clock) {
-       case 1200:
-               volt = CORE_VOLTAGE_1200;
-               break;
-
-       case 1000:
-               volt = CORE_VOLTAGE_1000;
-               break;
-
-       case 800:
-               volt = CORE_VOLTAGE_800;
-               break;
-
-       default:
-               if (clock > 1200) {
-                       diag_printf("No core voltage assigned for %u MHz core clock\n",
-                                               clock);
-                       return -EINVAL;
-               }
+       if (clock <= 800) {
                volt = CORE_VOLTAGE_800;
+       } else if (clock <= 1000) {
+               volt = CORE_VOLTAGE_1000;
+       } else if (clock <= 1200) {
+               volt = CORE_VOLTAGE_1200;
+       } else {
+               diag_printf("No core voltage assigned for %u MHz core clock\n",
+                       clock);
+               return -EINVAL;
        }
 
        ret = pmic_reg_read(0x23);
@@ -788,6 +778,7 @@ int adjust_core_voltage(unsigned int clock)
 static void display_board_type(void)
 {
        diag_printf("\nBoard Type: Ka-Ro TX53 v3\n");
+       adjust_core_voltage(CYGNUM_HAL_ARM_TX53_CPU_CLK);
 }
 
 static void display_board_info(void)