All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] mpc85xx/powerpc:cpu_init: Modified the errata according to endianness
@ 2016-06-21  7:22 Sriram Dash
  2016-06-21 11:12 ` Marek Vasut
                   ` (2 more replies)
  0 siblings, 3 replies; 40+ messages in thread
From: Sriram Dash @ 2016-06-21  7:22 UTC (permalink / raw)
  To: u-boot

Modifies errata implementation due to the fact that P3041,
P5020, and P5040 are all big endian for the USB PHY registers, but
they were specified little endian. Also, Adds errata for P1010 and
P2041 2.0.

Signed-off-by: Sriram Dash <sriram.dash@nxp.com>
Signed-off-by: Rajesh Bhagat <rajesh.bhagat@nxp.com>
---
 arch/powerpc/cpu/mpc85xx/cpu_init.c       | 4 ++--
 arch/powerpc/include/asm/config_mpc85xx.h | 1 +
 arch/powerpc/include/asm/immap_85xx.h     | 2 ++
 drivers/usb/common/fsl-errata.c           | 6 ++++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index 61f5639..61dedfc 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -114,10 +114,10 @@ void fsl_erratum_a006261_workaround(struct ccsr_usb_phy __iomem *usb_phy)
 	setbits_be32(&usb_phy->config2,
 		     CONFIG_SYS_FSL_USB_RX_AUTO_CAL_RD_WR_SEL);
 
-	temp = squelch_prog_rd_0_2 << CONFIG_SYS_FSL_USB_SQUELCH_PROG_WR_0;
+	temp = squelch_prog_rd_0_2 << CONFIG_SYS_FSL_USB_SQUELCH_PROG_WR_3;
 	out_be32(&usb_phy->config2, in_be32(&usb_phy->config2) | temp);
 
-	temp = squelch_prog_rd_3_5 << CONFIG_SYS_FSL_USB_SQUELCH_PROG_WR_3;
+	temp = squelch_prog_rd_3_5 << CONFIG_SYS_FSL_USB_SQUELCH_PROG_WR_0;
 	out_be32(&usb_phy->config2, in_be32(&usb_phy->config2) | temp);
 #endif
 }
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 505d355..9b7feda 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -162,6 +162,7 @@
 #define CONFIG_SYS_FSL_ERRATUM_I2C_A004447
 #define CONFIG_SYS_FSL_ERRATUM_A004508
 #define CONFIG_SYS_FSL_ERRATUM_A007075
+#define CONFIG_SYS_FSL_USB1_PHY_ENABLE
 #define CONFIG_SYS_FSL_ERRATUM_A006261
 #define CONFIG_SYS_FSL_ERRATUM_A004477
 #define CONFIG_SYS_FSL_A004447_SVR_REV	0x10
diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h
index c045a24..07ad22d 100644
--- a/arch/powerpc/include/asm/immap_85xx.h
+++ b/arch/powerpc/include/asm/immap_85xx.h
@@ -2953,6 +2953,8 @@ struct ccsr_pman {
 #define CONFIG_SYS_MPC85xx_DMA_OFFSET		0x21000
 #define CONFIG_SYS_MPC85xx_USB1_OFFSET		0x22000
 #define CONFIG_SYS_MPC85xx_USB2_OFFSET		0x23000
+#define CONFIG_SYS_MPC85xx_USB1_PHY_OFFSET	0xE5000
+#define CONFIG_SYS_MPC85xx_USB2_PHY_OFFSET	0xE5100
 #ifdef CONFIG_TSECV2
 #define CONFIG_SYS_TSEC1_OFFSET			0xB0000
 #elif defined(CONFIG_TSECV2_1)
diff --git a/drivers/usb/common/fsl-errata.c b/drivers/usb/common/fsl-errata.c
index ebe60a8..a69b977 100644
--- a/drivers/usb/common/fsl-errata.c
+++ b/drivers/usb/common/fsl-errata.c
@@ -53,7 +53,8 @@ bool has_erratum_a006261(void)
 	case SVR_P2041:
 	case SVR_P2040:
 		return IS_SVR_REV(svr, 1, 0) ||
-			IS_SVR_REV(svr, 1, 1) || IS_SVR_REV(svr, 2, 1);
+			IS_SVR_REV(svr, 1, 1) ||
+			IS_SVR_REV(svr, 2, 0) || IS_SVR_REV(svr, 2, 1);
 	case SVR_P3041:
 		return IS_SVR_REV(svr, 1, 0) ||
 			IS_SVR_REV(svr, 1, 1) ||
@@ -72,7 +73,8 @@ bool has_erratum_a006261(void)
 	case SVR_T2081:
 		return IS_SVR_REV(svr, 1, 0);
 	case SVR_P5040:
-		return IS_SVR_REV(svr, 1, 0);
+		return IS_SVR_REV(svr, 1, 0) ||
+		       IS_SVR_REV(svr, 2, 0) || IS_SVR_REV(svr, 2, 1);
 #endif
 	}
 
-- 
2.1.0

^ permalink raw reply related	[flat|nested] 40+ messages in thread

end of thread, other threads:[~2016-09-28 17:46 UTC | newest]

Thread overview: 40+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-21  7:22 [U-Boot] [PATCH] mpc85xx/powerpc:cpu_init: Modified the errata according to endianness Sriram Dash
2016-06-21 11:12 ` Marek Vasut
2016-06-22  4:08   ` Sriram Dash
2016-06-21 16:50 ` york sun
2016-06-28  9:24   ` Sriram Dash
2016-07-18  3:47 ` [U-Boot] [PATCH v2 0/5] Modified the errata A006261 " Sriram Dash
2016-07-18  3:47   ` [U-Boot] [PATCH v2 1/5] mpc85xx/powerpc:cpu_init: " Sriram Dash
2016-07-18  9:17     ` Marek Vasut
2016-07-18 16:20     ` york sun
2016-08-12  5:12       ` Sriram Dash
2016-08-17  5:50     ` [U-Boot] [PATCH v3 0/3] Modifies the erratum " y at lvd5587.freescale.com
2016-08-17  5:50       ` [U-Boot] [PATCH v3 1/3] mpc85xx: powerpc: usb: Modified " y at lvd5587.freescale.com
2016-08-17  5:50       ` [U-Boot] [PATCH v3 2/3] mpc85xx: powerpc: usb: Enable Usb phy initialisation settings for P1010 y at lvd5587.freescale.com
2016-08-17  5:50       ` [U-Boot] [PATCH v3 3/3] mpc85xx: powerpc: usb: Update the list of Socs afftected by erratum A006261 y at lvd5587.freescale.com
2016-08-17  6:17     ` [U-Boot] [PATCH v3 0/3] Modifies the erratum A006261 according to endianness Sriram Dash
2016-08-17  6:17       ` [U-Boot] [PATCH v3 1/3] mpc85xx: powerpc: usb: Modified " Sriram Dash
2016-08-23 20:33         ` [U-Boot] [u-boot-release] " york sun
2016-08-17  6:17       ` [U-Boot] [PATCH v3 2/3] mpc85xx: powerpc: usb: Enable Usb phy initialisation settings for P1010 Sriram Dash
2016-08-23 20:33         ` york sun
2016-08-17  6:17       ` [U-Boot] [PATCH v3 3/3] mpc85xx: powerpc: usb: Update the list of Socs afftected by erratum A006261 Sriram Dash
2016-08-23 20:33         ` york sun
2016-08-17  7:55       ` [U-Boot] [PATCH v3 0/3] Modifies the erratum A006261 according to endianness Marek Vasut
2016-08-23 20:34         ` york sun
2016-08-23 20:58           ` Marek Vasut
2016-09-28 17:46       ` york sun
2016-07-18  3:47   ` [U-Boot] [PATCH v2 2/5] mpc85xx/powerpc:P1010: Apply errata A006261 for P1010 Sriram Dash
2016-07-18 16:21     ` york sun
2016-08-12  5:12       ` Sriram Dash
2016-07-18  3:47   ` [U-Boot] [PATCH v2 3/5] mpc85xx/powerpc: P2041: Apply errata A006261 for P2041 Sriram Dash
2016-07-18  9:19     ` Marek Vasut
2016-07-18 16:23     ` york sun
2016-08-12  5:13       ` Sriram Dash
2016-07-18  3:47   ` [U-Boot] [PATCH v2 4/5] mpc85xx/powerpc: P5040: Apply errata A006261 for P5040 Sriram Dash
2016-07-18 16:27     ` york sun
2016-08-12  5:13       ` Sriram Dash
2016-07-18  3:47   ` [U-Boot] [PATCH v2 5/5] mpc85xx/powerpc: Do not apply errata A006261 for T4160, T1040, T2080 Sriram Dash
2016-07-18 16:39     ` york sun
2016-08-12  5:13       ` Sriram Dash
2016-07-18  9:15   ` [U-Boot] [PATCH v2 0/5] Modified the errata A006261 according to endianness Marek Vasut
2016-07-18 16:40     ` york sun

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.