arm: mvebu: Remove A39x relicts

Signed-off-by: Pali Rohár <pali@kernel.org>

diff --git a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c
index 943ae019425fd34ba3526865e9b35210f42d1689..3349f4eb54917e477a9cdcf6054695f7f4c38c83 100644 (file)
--- a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c
@@ -53,7 +53,7 @@ u8 serdes_lane_in_use_count[MAX_UNITS_ID][MAX_UNIT_NUMB] = {
  */
 u8 serdes_unit_count[MAX_UNITS_ID] = { 0 };
 
-/* Selector mapping for A380-A0 and A390-Z1 */
+/* Selector mapping for A380-A0 */
 u8 selectors_serdes_rev2_map[LAST_SERDES_TYPE][MAX_SERDES_LANES] = {
        /* 0      1      2       3       4       5       6 */
        { 0x1,   0x1,    NA,     NA,     NA,     NA,     NA  }, /* PEX0 */
@@ -812,7 +812,7 @@ u8 hws_ctrl_serdes_rev_get(void)
        if (sys_env_device_rev_get() == MV_88F68XX_Z1_ID)
                return MV_SERDES_REV_1_2;
 
-       /* for A39x-Z1, A38x-A0 */
+       /* for A38x-A0 */
        return MV_SERDES_REV_2_1;
 }
 

diff --git a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.h b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.h
index dd229e1a4701731e551e317d6c91d78bd5e6b57c..6925a9d236ed94fb0451d7d6dfbf523d99f20672 100644 (file)
--- a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.h
+++ b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.h
@@ -15,12 +15,12 @@
 #define SET_BIT(data, bit)             ((data) | (0x1 << (bit)))
 #define CLEAR_BIT(data, bit)           ((data) & (~(0x1 << (bit))))
 
-#define MAX_SERDES_LANES               7       /* as in a39x */
+#define MAX_SERDES_LANES               7
 
 /* Serdes revision */
 /* Serdes revision 1.2 (for A38x-Z1) */
 #define MV_SERDES_REV_1_2              0x0
-/* Serdes revision 2.1 (for A39x-Z1, A38x-A0) */
+/* Serdes revision 2.1 (for A38x-A0) */
 #define MV_SERDES_REV_2_1              0x1
 #define MV_SERDES_REV_NA               0xff
 

diff --git a/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c b/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c
index 950680a58167e3d879b340bb939de5fbafbc7e64..fb8ec11dfb95c6f8bf7c4b057896a8887af42c58 100644 (file)
--- a/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c
@@ -145,10 +145,6 @@ u32 sys_env_id_index_get(u32 ctrl_model)
                return MV_6811_INDEX;
        case MV_6828_DEV_ID:
                return MV_6828_INDEX;
-       case MV_6920_DEV_ID:
-               return MV_6920_INDEX;
-       case MV_6928_DEV_ID:
-               return MV_6928_INDEX;
        default:
                return MV_6820_INDEX;
        }
@@ -183,11 +179,9 @@ u16 sys_env_model_get(void)
        case MV_6810_DEV_ID:
        case MV_6811_DEV_ID:
        case MV_6828_DEV_ID:
-       case MV_6920_DEV_ID:
-       case MV_6928_DEV_ID:
                return ctrl_id;
        default:
-               /* Device ID Default for A38x: 6820 , for A39x: 6920 */
+               /* Device ID Default for A38x: 6820 */
                default_ctrl_id =  MV_6820_DEV_ID;
                printf("%s: Error retrieving device ID (%x), using default ID = %x\n",
                       __func__, ctrl_id, default_ctrl_id);
@@ -201,8 +195,8 @@ u16 sys_env_model_get(void)
  */
 u32 sys_env_device_id_get(void)
 {
-       char *device_id_str[7] = {
-               "6810", "6820", "6811", "6828", "NONE", "6920", "6928"
+       char *device_id_str[4] = {
+               "6810", "6820", "6811", "6828",
        };
 
        if (g_dev_id != -1)
@@ -210,7 +204,7 @@ u32 sys_env_device_id_get(void)
 
        g_dev_id = reg_read(DEVICE_SAMPLE_AT_RESET1_REG);
        g_dev_id = g_dev_id >> SAR_DEV_ID_OFFS & SAR_DEV_ID_MASK;
-       printf("Detected Device ID %s\n", device_id_str[g_dev_id]);
+       printf("Detected Device ID %s\n", g_dev_id < 4 ? device_id_str[g_dev_id] : "NONE");
 
        return g_dev_id;
 }

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 94c43b4dafa27a49b7c66d441242bd0efe00d37a..20039f72d8b1de8957aea7b915b219ec10df685a 100644 (file)
--- a/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.h
+++ b/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.h
@@ -198,22 +198,6 @@
 #define A38X_MV_MARVELL_BOARD_NUM      (A38X_MV_MAX_MARVELL_BOARD_ID - \
                                         A38X_MARVELL_BOARD_ID_BASE)
 
-/* Customer boards for A39x */
-#define A39X_CUSTOMER_BOARD_ID_BASE    0x20
-#define A39X_CUSTOMER_BOARD_ID0                (A39X_CUSTOMER_BOARD_ID_BASE + 0)
-#define A39X_CUSTOMER_BOARD_ID1                (A39X_CUSTOMER_BOARD_ID_BASE + 1)
-#define A39X_MV_MAX_CUSTOMER_BOARD_ID  (A39X_CUSTOMER_BOARD_ID_BASE + 2)
-#define A39X_MV_CUSTOMER_BOARD_NUM     (A39X_MV_MAX_CUSTOMER_BOARD_ID - \
-                                        A39X_CUSTOMER_BOARD_ID_BASE)
-
-/* Marvell boards for A39x */
-#define A39X_MARVELL_BOARD_ID_BASE     0x30
-#define A39X_DB_69XX_ID                        (A39X_MARVELL_BOARD_ID_BASE + 0)
-#define A39X_RD_69XX_ID                        (A39X_MARVELL_BOARD_ID_BASE + 1)
-#define A39X_MV_MAX_MARVELL_BOARD_ID   (A39X_MARVELL_BOARD_ID_BASE + 2)
-#define A39X_MV_MARVELL_BOARD_NUM      (A39X_MV_MAX_MARVELL_BOARD_ID - \
-                                        A39X_MARVELL_BOARD_ID_BASE)
-
 #define CUTOMER_BOARD_ID_BASE          A38X_CUSTOMER_BOARD_ID_BASE
 #define CUSTOMER_BOARD_ID0             A38X_CUSTOMER_BOARD_ID0
 #define CUSTOMER_BOARD_ID1             A38X_CUSTOMER_BOARD_ID1
@@ -236,8 +220,6 @@
 #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
 
 #define MPP_CONTROL_REG(id)            (0x18000 + (id * 4))
 #define GPP_DATA_OUT_REG(grp)          (MV_GPP_REGS_BASE(grp) + 0x00)
@@ -257,19 +239,12 @@
 #define MV_6811_DEV_ID         0x6811
 #define MV_6820_DEV_ID         0x6820
 #define MV_6828_DEV_ID         0x6828
-/* Armada 39x Family */
-#define MV_6920_DEV_ID         0x6920
-#define MV_6928_DEV_ID         0x6928
 
 enum {
        MV_6810,
        MV_6820,
        MV_6811,
        MV_6828,
-       MV_NONE,
-       MV_6920,
-       MV_6928,
-       MV_MAX_DEV_ID,
 };
 
 #define MV_6820_INDEX                  0
@@ -277,17 +252,12 @@ enum {
 #define MV_6811_INDEX                  2
 #define MV_6828_INDEX                  3
 
-#define MV_6920_INDEX                  0
-#define MV_6928_INDEX                  1
-
 #define MAX_DEV_ID_NUM                 4
 
 #define MV_6820_INDEX                  0
 #define MV_6810_INDEX                  1
 #define MV_6811_INDEX                  2
 #define MV_6828_INDEX                  3
-#define MV_6920_INDEX                  0
-#define MV_6928_INDEX                  1
 
 enum unit_id {
        PEX_UNIT_ID,