From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Mon, 24 Jun 2013 09:07:02 +0000 (+0200)
Subject: add VTP_CTRL_FILTER definition
X-Git-Tag: KARO-TX48-2013-06-25~17
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=3d831d2858685fea860f1bdb0fa615c499d6b142

add VTP_CTRL_FILTER definition
---

diff --git a/arch/arm/cpu/armv7/am33xx/emif4.c b/arch/arm/cpu/armv7/am33xx/emif4.c
index 01e3a5204e..fea639c77b 100644
--- a/arch/arm/cpu/armv7/am33xx/emif4.c
+++ b/arch/arm/cpu/armv7/am33xx/emif4.c
@@ -51,14 +51,15 @@ static void config_vtp(void)
 {
 	writel(readl(&vtpreg->vtp0ctrlreg) | VTP_CTRL_ENABLE,
 			&vtpreg->vtp0ctrlreg);
-	writel(readl(&vtpreg->vtp0ctrlreg) & (~VTP_CTRL_START_EN),
+	writel(readl(&vtpreg->vtp0ctrlreg) & ~(VTP_CTRL_START_EN |
+						VTP_CTRL_FILTER_MASK),
 			&vtpreg->vtp0ctrlreg);
-	writel(readl(&vtpreg->vtp0ctrlreg) | VTP_CTRL_START_EN,
+	writel(readl(&vtpreg->vtp0ctrlreg) | VTP_CTRL_START_EN |
+			VTP_CTRL_FILTER(3),
 			&vtpreg->vtp0ctrlreg);
 
 	/* Poll for READY */
-	while ((readl(&vtpreg->vtp0ctrlreg) & VTP_CTRL_READY) !=
-			VTP_CTRL_READY)
+	while (!(readl(&vtpreg->vtp0ctrlreg) & VTP_CTRL_READY))
 		;
 }
 
diff --git a/arch/arm/include/asm/arch-am33xx/ddr_defs.h b/arch/arm/include/asm/arch-am33xx/ddr_defs.h
index dd4dcdfa0c..89ed78f888 100644
--- a/arch/arm/include/asm/arch-am33xx/ddr_defs.h
+++ b/arch/arm/include/asm/arch-am33xx/ddr_defs.h
@@ -25,7 +25,10 @@
 /* AM335X EMIF Register values */
 #define VTP_CTRL_READY		(0x1 << 5)
 #define VTP_CTRL_ENABLE		(0x1 << 6)
-#define VTP_CTRL_START_EN	(0x1)
+#define VTP_CTRL_FILTER_SHIFT	1
+#define VTP_CTRL_FILTER_MASK	(0x7 << VTP_CTRL_FILTER_SHIFT)
+#define VTP_CTRL_FILTER(n)	(((n) << VTP_CTRL_FILTER_SHIFT) & VTP_CTRL_FILTER_MASK)
+#define VTP_CTRL_START_EN	(0x1 << 0)
 #define PHY_DLL_LOCK_DIFF	0x0
 #define DDR_CKE_CTRL_NORMAL	0x1