Merge tag 'mips-pull-2018-11-30' of git://git.denx.de/u-boot-mips

[oweals/u-boot.git] / arch / arm / mach-mvebu / serdes / a38x / sys_env_lib.h

diff --git a/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.h b/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.h
index 3e5373c085b527a18da7fff8896c62f715d4d5e1..365332d2b048eda37614fb9228a230446b39045c 100644 (file)
--- a/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.h
+++ b/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.h
@@ -1,14 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) Marvell International Ltd. and its affiliates
- *
- * SPDX-License-Identifier:    GPL-2.0
  */
 
 #ifndef _SYS_ENV_LIB_H
 #define _SYS_ENV_LIB_H
 
 #include "../../../drivers/ddr/marvell/a38x/ddr3_init.h"
-#include "../../../drivers/ddr/marvell/a38x/ddr3_hws_hw_training.h"
 
 /* Serdes definitions */
 #define COMMON_PHY_BASE_ADDR           0x18300
@@ -73,6 +71,7 @@
 #define RX_REG3                                0xa0188
 #define PCIE_REG1                      0xa0288
 #define PCIE_REG3                      0xa0290
+#define LANE_CFG0_REG                  0xa0600
 #define LANE_CFG1_REG                  0xa0604
 #define LANE_CFG4_REG                  0xa0620
 #define LANE_CFG5_REG                  0xa0624
@@ -234,6 +233,7 @@
 /* A38x revisions */
 #define MV_88F68XX_Z1_ID               0x0
 #define MV_88F68XX_A0_ID               0x4
+#define MV_88F68XX_B0_ID               0xa
 /* A39x revisions */
 #define MV_88F69XX_Z1_ID               0x2
 
@@ -364,8 +364,6 @@ u8 sys_env_device_rev_get(void);
 u32 sys_env_device_id_get(void);
 u16 sys_env_model_get(void);
 struct dlb_config *sys_env_dlb_config_ptr_get(void);
-u32 sys_env_get_topology_update_info(
-       struct topology_update_info *topology_update_info);
 u32 sys_env_get_cs_ena_from_reg(void);
 
 #endif /* _SYS_ENV_LIB_H */