Skip to contentSkip to conversation

arm: mvebu: Minor fixes in the AXP / A38x SERDES code

PATCH New Stefan Roese 1 participant 2 messages Apr 7, 2017 – May 9, 2017

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SoC support
lore
Share & tools
lore

Stefan Roese

author
#0 lore raw

PATCH 1/1 arm: mvebu: Minor fixes in the AXP / A38x SERDES code

From: Uwe Kleine-König <[email protected]>

- Fix spelling error of SERDES_VERSION
- Remove superfluous definition of this macro
- Remove unnecessary include of i2c.h

Signed-off-by Uwe Kleine-König <[email protected]>
Signed-off-by Stefan Roese <[email protected]>
---
 arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c | 2 --
 arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c     | 4 ++--
 arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c       | 6 +++---
 arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c      | 1 -
 4 files changed, 5 insertions(+), 8 deletions(-)
arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c +0 -2
index 104e7e88d7..0dfb9452e6 100644
@@ -13,8 +13,6 @@
 #include "high_speed_env_spec.h"
 #include "sys_env_lib.h"
 
-#define SERDES_VERION	"2.0"
-
 u8 selectors_serdes_rev1_map[LAST_SERDES_TYPE][MAX_SERDES_LANES] = {
 	/* 0  1    2    3    4    5 */
 	{0x1, 0x1, NA,  NA,  NA,  NA},		/* PEX0 */
arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c +2 -2
index 820219e68e..883b90776a 100644
@@ -27,7 +27,7 @@
  */
 struct cfg_seq serdes_seq_db[SERDES_LAST_SEQ];
 
-#define	SERDES_VERION		"2.0"
+#define	SERDES_VERSION		"2.0"
 #define ENDED_OK		"High speed PHY - Ended Successfully\n"
 
 #define LINK_WAIT_CNTR		100

@@ -1416,7 +1416,7 @@ int serdes_phy_config(void)
 	DEBUG_INIT_FULL_S("\n### ctrl_high_speed_serdes_phy_config ###\n");
 
 	DEBUG_INIT_S("High speed PHY - Version: ");
-	DEBUG_INIT_S(SERDES_VERION);
+	DEBUG_INIT_S(SERDES_VERSION);
 	DEBUG_INIT_S("\n");
 
 	/* Init serdes sequences DB */
arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c +3 -3
index 5925bae69f..b0e193b78c 100644
@@ -14,7 +14,7 @@
 #include "high_speed_env_spec.h"
 #include "board_env_spec.h"
 
-#define	SERDES_VERION	"2.1.5"
+#define	SERDES_VERSION	"2.1.5"
 #define ENDED_OK	"High speed PHY - Ended Successfully\n"
 
 static const u8 serdes_cfg[][SERDES_LAST_UNIT] = BIN_SERDES_CFG;

@@ -285,12 +285,12 @@ int serdes_phy_config(void)
 	if (reg_read(REG_BOOTROM_ROUTINE_ADDR) &
 	    (1 << REG_BOOTROM_ROUTINE_DRAM_INIT_OFFS)) {
 		DEBUG_INIT_S("High speed PHY - Version: ");
-		DEBUG_INIT_S(SERDES_VERION);
+		DEBUG_INIT_S(SERDES_VERSION);
 		DEBUG_INIT_S(" - 2nd boot - Skip\n");
 		return MV_OK;
 	}
 	DEBUG_INIT_S("High speed PHY - Version: ");
-	DEBUG_INIT_S(SERDES_VERION);
+	DEBUG_INIT_S(SERDES_VERSION);
 	DEBUG_INIT_S(" (COM-PHY-V20)\n");
 
 	/*
arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c +0 -1
index 115ec2cd60..704a59fa15 100644
@@ -5,7 +5,6 @@
  */
 
 #include <common.h>
-#include <i2c.h>
 #include <spl.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
Signature · 1 line
2.12.2