[linux-yocto] [PATCH 02/15] drivers/misc: Update Axxia PEI Configuration

[Daniel Dragomir]

From: John Jacques <john.jacques at intel.com>

- In configuration 2, set sw_port_1 to 0x2.
- Always set the number of PHYs to 4 for 5600
  and 1 for 6700.

Signed-off-by: John Jacques <john.jacques at intel.com>
---
 drivers/misc/axxia-pei.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/misc/axxia-pei.c b/drivers/misc/axxia-pei.c
index 565992c..2c0fabd 100644
--- a/drivers/misc/axxia-pei.c
+++ b/drivers/misc/axxia-pei.c
@@ -1370,9 +1370,10 @@ pei_setup_56xx(unsigned int control)
 		*/
 
 		set_sw_port_config0(pc0_PEI0x2_PEI2x2);
-		set_sw_port_config1(pc1_PEI1x2_PEI2x2);
+		set_sw_port_config1(pc1_PEI1x2_SATA0x1_SATA1x1);
 		set_pei0_rc_mode(rc_mode);
 		set_pipe_port_sel(pp_0_1_2_3);
+		set_pipe_nphy(four_phy);
 
 		if (pei0_mode)
 			release_reset(0);
@@ -1400,7 +1401,7 @@ pei_setup_56xx(unsigned int control)
 		set_sw_port_config0(pc0_PEI0x2_SRIO0x2);
 		set_sw_port_config1(pc1_PEI1x2_PEI2x2);
 		set_pipe_port_sel(pp_0_1_2_3);
-		set_pipe_nphy(three_phy);
+		set_pipe_nphy(four_phy);
 
 		if (pei0_mode)
 			release_reset(0);
@@ -1454,6 +1455,7 @@ pei_setup_56xx(unsigned int control)
 		set_sw_port_config0(pc0_SRIO1x2_SRIO0x2);
 		set_sw_port_config1(pc1_PEI1x2_PEI2x2);
 		set_pipe_port_sel(pp_0_1_2_3);
+		set_pipe_nphy(four_phy);
 
 		if (pei1_mode)
 			release_reset(2);
@@ -1524,6 +1526,7 @@ pei_setup_56xx(unsigned int control)
 		set_sw_port_config0(pc0_SRIO1x2_SRIO0x2);
 		set_sw_port_config1(pc1_PEI1x4);
 		set_pipe_port_sel(pp_0_1_2_3);
+		set_pipe_nphy(four_phy);
 
 		if (pei1_mode) {
 			release_reset(2);
@@ -1617,11 +1620,9 @@ pei_setup_67xx(unsigned int control)
 		/*
 		 * PEI0x2
 		 */
-		if (0) {
-			set_pei0_rc_mode(rc_mode);
-			set_pipe_port_sel(pp_0);
-			set_pipe_nphy(one_phy);
-		}
+		set_pei0_rc_mode(rc_mode);
+		set_pipe_port_sel(pp_0);
+		set_pipe_nphy(one_phy);
 
 		if (pei0_mode)
 			release_reset(0);
-- 
2.7.4