From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Fri, 4 Apr 2014 11:24:24 +0000 (+0200)
Subject: committed missing source code changes for commit 6ff32795
X-Git-Tag: KARO-TX53-2014-04-09~2^2
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-redboot.git;a=commitdiff_plain;h=c249eb1a042cf2ccdeb9f180c6bbff29097b70d5

committed missing source code changes for commit 6ff32795
---

diff --git a/config/TX27-40x0.ecc b/config/TX27-40x0.ecc
index 0715ffb6..4f59d2a5 100644
--- a/config/TX27-40x0.ecc
+++ b/config/TX27-40x0.ecc
@@ -3169,6 +3169,10 @@ cdl_option CYGHWR_HAL_ARM_SOC_PROCESSOR_CLOCK {
     #     CYGHWR_HAL_ARM_SOC_PROCESSOR_CLOCK_OVERRIDE_DEFAULT (unknown) == 0
     #   --> 399
     # Legal values: 266 399
+
+    # The following properties are affected by this value
+    # option CYGOPT_MX27_WORKAROUND_ENGcm11563
+    #     Requires: CYGHWR_HAL_ARM_SOC_PROCESSOR_CLOCK == "399"
 };
 
 # System clock (hclk) rate
@@ -3534,6 +3538,22 @@ cdl_option CYGPKG_HAL_ARM_TX27_CFLAGS_REMOVE {
     # Default value: ""
 };
 
+# Enable workaround for Erratum ENGcm11563
+# This option enables the software workaround for
+# ENGcm11563 (ARM core lockup due to invalid
+# duty cycle of ARM clock at 399 MHz.
+#
+cdl_option CYGOPT_MX27_WORKAROUND_ENGcm11563 {
+    # Flavor: bool
+    # No user value, uncomment the following line to provide one.
+    # user_value 1
+    # value_source default
+    # Default value: 1
+    # Requires: CYGHWR_HAL_ARM_SOC_PROCESSOR_CLOCK == "399"
+    #     CYGHWR_HAL_ARM_SOC_PROCESSOR_CLOCK == 399
+    #   --> 1
+};
+
 # <
 # Memory layout
 #
diff --git a/config/TX27-40x1.ecc b/config/TX27-40x1.ecc
index fdc18211..94bcb263 100644
--- a/config/TX27-40x1.ecc
+++ b/config/TX27-40x1.ecc
@@ -3169,6 +3169,10 @@ cdl_option CYGHWR_HAL_ARM_SOC_PROCESSOR_CLOCK {
     #     CYGHWR_HAL_ARM_SOC_PROCESSOR_CLOCK_OVERRIDE_DEFAULT (unknown) == 0
     #   --> 399
     # Legal values: 266 399
+
+    # The following properties are affected by this value
+    # option CYGOPT_MX27_WORKAROUND_ENGcm11563
+    #     Requires: CYGHWR_HAL_ARM_SOC_PROCESSOR_CLOCK == "399"
 };
 
 # System clock (hclk) rate
@@ -3533,6 +3537,22 @@ cdl_option CYGPKG_HAL_ARM_TX27_CFLAGS_REMOVE {
     # Default value: ""
 };
 
+# Enable workaround for Erratum ENGcm11563
+# This option enables the software workaround for
+# ENGcm11563 (ARM core lockup due to invalid
+# duty cycle of ARM clock at 399 MHz.
+#
+cdl_option CYGOPT_MX27_WORKAROUND_ENGcm11563 {
+    # Flavor: bool
+    # No user value, uncomment the following line to provide one.
+    # user_value 1
+    # value_source default
+    # Default value: 1
+    # Requires: CYGHWR_HAL_ARM_SOC_PROCESSOR_CLOCK == "399"
+    #     CYGHWR_HAL_ARM_SOC_PROCESSOR_CLOCK == 399
+    #   --> 1
+};
+
 # <
 # Memory layout
 #
diff --git a/packages/hal/arm/mx27/karo/v1_0/cdl/hal_arm_tx27.cdl b/packages/hal/arm/mx27/karo/v1_0/cdl/hal_arm_tx27.cdl
index 4bc54142..45dd774c 100644
--- a/packages/hal/arm/mx27/karo/v1_0/cdl/hal_arm_tx27.cdl
+++ b/packages/hal/arm/mx27/karo/v1_0/cdl/hal_arm_tx27.cdl
@@ -247,6 +247,16 @@ cdl_package CYGPKG_HAL_ARM_TX27KARO {
                 the set of global flags if present."
         }
 
+        cdl_option CYGOPT_MX27_WORKAROUND_ENGcm11563 {
+            display "Enable workaround for Erratum ENGcm11563"
+            flavor bool
+            default_value { 1 }
+	    requires      {CYGHWR_HAL_ARM_SOC_PROCESSOR_CLOCK == "399"}
+            description   "
+                This option enables the software workaround for
+                ENGcm11563 (ARM core lockup due to invalid
+		duty cycle of ARM clock at 399 MHz."
+        }
     }
 
     cdl_component CYGHWR_MEMORY_LAYOUT {
diff --git a/packages/hal/arm/mx27/karo/v1_0/include/hal_platform_setup.h b/packages/hal/arm/mx27/karo/v1_0/include/hal_platform_setup.h
index 295e446c..e6edab57 100644
--- a/packages/hal/arm/mx27/karo/v1_0/include/hal_platform_setup.h
+++ b/packages/hal/arm/mx27/karo/v1_0/include/hal_platform_setup.h
@@ -413,9 +413,11 @@ NAND_ClockSetup:
 	ldr	r0, SOC_CRM_BASE_W
 	// disable PLL update first
 	ldr	r1, [r0, #(SOC_CRM_CSCR - SOC_CRM_BASE)]
+	/* clear ARM_SRC & ARM_DIV required as workaround for ENGcm12387 */
+	bic	r1, r1, #((1 << 15) | (3 << 12))
 	orr	r1, r1, #(1 << 31)
 #ifdef PLL_REF_CLK_32768HZ
-	orr	r1, r1, #(1 << 3)	// disable OSC26M
+	orr	r1, r1, #(1 << 3)	// disable 26MHz osc
 #else
 	bic	r1, r1, #(1 << 3)	// enable 26MHz osc
 #endif
@@ -430,6 +432,12 @@ NAND_ClockSetup:
 	str	r1, [r0, #(SOC_CRM_SPCTL0 - SOC_CRM_BASE)]
 
 	ldr	r1, [r0, #(SOC_CRM_CSCR - SOC_CRM_BASE)]
+#ifdef PLL_REF_CLK_32768HZ
+	// Make sure to use CKIL
+	bic	r1, r1, #(3 << 16)
+#else
+	orr	r1, r1, #(3 << 16)	// select 26MHz
+#endif
 	orr	r1, r1, #(0x3 << 18)	// SPLL_RESTART | MPLL_RESTART
 	orr	r1, r1, #(0x3 << 0)	// SPLL_ENABLE | MPLL_ENABLE
 	str	r1, [r0, #(SOC_CRM_CSCR - SOC_CRM_BASE)]