{"id":1745915,"url":"http://patchwork.ozlabs.org/api/patches/1745915/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20230221201925.9644-56-pali@kernel.org/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20230221201925.9644-56-pali@kernel.org>","list_archive_url":null,"date":"2023-02-21T20:19:21","name":"[RFC,u-boot-mvebu,55/59] arm: mvebu: Remove A39x relicts","commit_ref":"117481d27a80ab2f18876ba0468bebee15a72301","pull_url":null,"state":"accepted","archived":false,"hash":"243094e578d9b983406ce74984684106e6483c91","submitter":{"id":78810,"url":"http://patchwork.ozlabs.org/api/people/78810/?format=json","name":"Pali Rohár","email":"pali@kernel.org"},"delegate":{"id":1696,"url":"http://patchwork.ozlabs.org/api/users/1696/?format=json","username":"stroese","first_name":"Stefan","last_name":"Roese","email":"sr@denx.de"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20230221201925.9644-56-pali@kernel.org/mbox/","series":[{"id":343058,"url":"http://patchwork.ozlabs.org/api/series/343058/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=343058","date":"2023-02-21T20:18:27","name":"arm: mvebu: Various fixes","version":1,"mbox":"http://patchwork.ozlabs.org/series/343058/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1745915/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1745915/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=)","legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=TwNhwUmg;\n\tdkim-atps=neutral","phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=kernel.org","phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de","phobos.denx.de;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.b=\"TwNhwUmg\";\n\tdkim-atps=neutral","phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=kernel.org","phobos.denx.de; spf=pass smtp.mailfrom=pali@kernel.org"],"Received":["from phobos.denx.de (phobos.denx.de\n [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature ECDSA (P-384))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4PLrf81jWqz240n\n\tfor ; Wed, 22 Feb 2023 07:36:00 +1100 (AEDT)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id CFD58859FF;\n\tTue, 21 Feb 2023 21:25:36 +0100 (CET)","by phobos.denx.de (Postfix, from userid 109)\n id 1FDE885AEB; Tue, 21 Feb 2023 21:24:04 +0100 (CET)","from dfw.source.kernel.org (dfw.source.kernel.org\n [IPv6:2604:1380:4641:c500::1])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id 0141385AEC\n for ; Tue, 21 Feb 2023 21:22:44 +0100 (CET)","from smtp.kernel.org (relay.kernel.org [52.25.139.140])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by dfw.source.kernel.org (Postfix) with ESMTPS id 03EB6611FD;\n Tue, 21 Feb 2023 20:22:37 +0000 (UTC)","by smtp.kernel.org (Postfix) with ESMTPSA id 8201EC4339E;\n Tue, 21 Feb 2023 20:22:36 +0000 (UTC)","by pali.im (Postfix)\n id 3DEAA9E0; Tue, 21 Feb 2023 21:22:36 +0100 (CET)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,\n DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,\n SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n s=k20201202; t=1677010956;\n bh=xsV1Ld6OjAA68L8UA5DLiHvZL8W572wfmT383BS1sOc=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=TwNhwUmgALEhTzl4vjHKkYMAba5kbn337DmcylxCOrnSAxTjGLq3h6SP/ZWiDHJS2\n p/DslWFGnzH7sPmdf2LAJoZ94C4VMEnvT3MXpxGOETYtK6M7ynIIzSBDLgfPXh+yVP\n D6GeeI1WxalBumLvwFRBZUETNbhAORJizTkMTd8yIB62OR76soRUeXB//2rwPo4yGR\n MMsz/dz5TzFBx2XithXG6KVvLquFLnSUm46if+fK5WD4OcwSMONdTfYWEDhO/3c+wQ\n YLotEerNTP2iOk2lWbPjnn2t589sBAl3o7G8KJNK9LVV5E22/5lNT/N/7GnAxMR/1n\n ocVHhdro7xAHQ==","From":"=?utf-8?q?Pali_Roh=C3=A1r?= ","To":"u-boot@lists.denx.de","Cc":"Stefan Roese , Tony Dinh ,\n Josua Mayer ","Subject":"[PATCH RFC u-boot-mvebu 55/59] arm: mvebu: Remove A39x relicts","Date":"Tue, 21 Feb 2023 21:19:21 +0100","Message-Id":"<20230221201925.9644-56-pali@kernel.org>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20230221201925.9644-1-pali@kernel.org>","References":"<20230221201925.9644-1-pali@kernel.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.39","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" ","X-Virus-Scanned":"clamav-milter 0.103.6 at phobos.denx.de","X-Virus-Status":"Clean"},"content":"Signed-off-by: Pali Rohár \n---\n .../serdes/a38x/high_speed_env_spec.c | 4 +--\n .../serdes/a38x/high_speed_env_spec.h | 4 +--\n arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c | 14 +++------\n arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.h | 30 -------------------\n 4 files changed, 8 insertions(+), 44 deletions(-)","diff":"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\nindex 943ae019425f..3349f4eb5491 100644\n--- a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c\n+++ b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c\n@@ -53,7 +53,7 @@ u8 serdes_lane_in_use_count[MAX_UNITS_ID][MAX_UNIT_NUMB] = {\n */\n u8 serdes_unit_count[MAX_UNITS_ID] = { 0 };\n \n-/* Selector mapping for A380-A0 and A390-Z1 */\n+/* Selector mapping for A380-A0 */\n u8 selectors_serdes_rev2_map[LAST_SERDES_TYPE][MAX_SERDES_LANES] = {\n \t/* 0 1 2 3 4 5 6 */\n \t{ 0x1, 0x1, NA,\t NA,\t NA,\t NA, NA }, /* PEX0 */\n@@ -812,7 +812,7 @@ u8 hws_ctrl_serdes_rev_get(void)\n \tif (sys_env_device_rev_get() == MV_88F68XX_Z1_ID)\n \t\treturn MV_SERDES_REV_1_2;\n \n-\t/* for A39x-Z1, A38x-A0 */\n+\t/* for A38x-A0 */\n \treturn MV_SERDES_REV_2_1;\n }\n \ndiff --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\nindex dd229e1a4701..6925a9d236ed 100644\n--- a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.h\n+++ b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.h\n@@ -15,12 +15,12 @@\n #define SET_BIT(data, bit)\t\t((data) | (0x1 << (bit)))\n #define CLEAR_BIT(data, bit)\t\t((data) & (~(0x1 << (bit))))\n \n-#define MAX_SERDES_LANES\t\t7\t/* as in a39x */\n+#define MAX_SERDES_LANES\t\t7\n \n /* Serdes revision */\n /* Serdes revision 1.2 (for A38x-Z1) */\n #define MV_SERDES_REV_1_2\t\t0x0\n-/* Serdes revision 2.1 (for A39x-Z1, A38x-A0) */\n+/* Serdes revision 2.1 (for A38x-A0) */\n #define MV_SERDES_REV_2_1\t\t0x1\n #define MV_SERDES_REV_NA\t\t0xff\n \ndiff --git a/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c b/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c\nindex 950680a58167..fb8ec11dfb95 100644\n--- a/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c\n+++ b/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c\n@@ -145,10 +145,6 @@ u32 sys_env_id_index_get(u32 ctrl_model)\n \t\treturn MV_6811_INDEX;\n \tcase MV_6828_DEV_ID:\n \t\treturn MV_6828_INDEX;\n-\tcase MV_6920_DEV_ID:\n-\t\treturn MV_6920_INDEX;\n-\tcase MV_6928_DEV_ID:\n-\t\treturn MV_6928_INDEX;\n \tdefault:\n \t\treturn MV_6820_INDEX;\n \t}\n@@ -183,11 +179,9 @@ u16 sys_env_model_get(void)\n \tcase MV_6810_DEV_ID:\n \tcase MV_6811_DEV_ID:\n \tcase MV_6828_DEV_ID:\n-\tcase MV_6920_DEV_ID:\n-\tcase MV_6928_DEV_ID:\n \t\treturn ctrl_id;\n \tdefault:\n-\t\t/* Device ID Default for A38x: 6820 , for A39x: 6920 */\n+\t\t/* Device ID Default for A38x: 6820 */\n \t\tdefault_ctrl_id = MV_6820_DEV_ID;\n \t\tprintf(\"%s: Error retrieving device ID (%x), using default ID = %x\\n\",\n \t\t __func__, ctrl_id, default_ctrl_id);\n@@ -201,8 +195,8 @@ u16 sys_env_model_get(void)\n */\n u32 sys_env_device_id_get(void)\n {\n-\tchar *device_id_str[7] = {\n-\t\t\"6810\", \"6820\", \"6811\", \"6828\", \"NONE\", \"6920\", \"6928\"\n+\tchar *device_id_str[4] = {\n+\t\t\"6810\", \"6820\", \"6811\", \"6828\",\n \t};\n \n \tif (g_dev_id != -1)\n@@ -210,7 +204,7 @@ u32 sys_env_device_id_get(void)\n \n \tg_dev_id = reg_read(DEVICE_SAMPLE_AT_RESET1_REG);\n \tg_dev_id = g_dev_id >> SAR_DEV_ID_OFFS & SAR_DEV_ID_MASK;\n-\tprintf(\"Detected Device ID %s\\n\", device_id_str[g_dev_id]);\n+\tprintf(\"Detected Device ID %s\\n\", g_dev_id < 4 ? device_id_str[g_dev_id] : \"NONE\");\n \n \treturn g_dev_id;\n }\ndiff --git a/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.h b/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.h\nindex 94c43b4dafa2..20039f72d8b1 100644\n--- a/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.h\n+++ b/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.h\n@@ -198,22 +198,6 @@\n #define A38X_MV_MARVELL_BOARD_NUM\t(A38X_MV_MAX_MARVELL_BOARD_ID - \\\n \t\t\t\t\t A38X_MARVELL_BOARD_ID_BASE)\n \n-/* Customer boards for A39x */\n-#define A39X_CUSTOMER_BOARD_ID_BASE\t0x20\n-#define A39X_CUSTOMER_BOARD_ID0\t\t(A39X_CUSTOMER_BOARD_ID_BASE + 0)\n-#define A39X_CUSTOMER_BOARD_ID1\t\t(A39X_CUSTOMER_BOARD_ID_BASE + 1)\n-#define A39X_MV_MAX_CUSTOMER_BOARD_ID\t(A39X_CUSTOMER_BOARD_ID_BASE + 2)\n-#define A39X_MV_CUSTOMER_BOARD_NUM\t(A39X_MV_MAX_CUSTOMER_BOARD_ID - \\\n-\t\t\t\t\t A39X_CUSTOMER_BOARD_ID_BASE)\n-\n-/* Marvell boards for A39x */\n-#define A39X_MARVELL_BOARD_ID_BASE\t0x30\n-#define A39X_DB_69XX_ID\t\t\t(A39X_MARVELL_BOARD_ID_BASE + 0)\n-#define A39X_RD_69XX_ID\t\t\t(A39X_MARVELL_BOARD_ID_BASE + 1)\n-#define A39X_MV_MAX_MARVELL_BOARD_ID\t(A39X_MARVELL_BOARD_ID_BASE + 2)\n-#define A39X_MV_MARVELL_BOARD_NUM\t(A39X_MV_MAX_MARVELL_BOARD_ID - \\\n-\t\t\t\t\t A39X_MARVELL_BOARD_ID_BASE)\n-\n #define CUTOMER_BOARD_ID_BASE\t\tA38X_CUSTOMER_BOARD_ID_BASE\n #define CUSTOMER_BOARD_ID0\t\tA38X_CUSTOMER_BOARD_ID0\n #define CUSTOMER_BOARD_ID1\t\tA38X_CUSTOMER_BOARD_ID1\n@@ -236,8 +220,6 @@\n #define MV_88F68XX_Z1_ID\t\t0x0\n #define MV_88F68XX_A0_ID\t\t0x4\n #define MV_88F68XX_B0_ID\t\t0xa\n-/* A39x revisions */\n-#define MV_88F69XX_Z1_ID\t\t0x2\n \n #define MPP_CONTROL_REG(id)\t\t(0x18000 + (id * 4))\n #define GPP_DATA_OUT_REG(grp)\t\t(MV_GPP_REGS_BASE(grp) + 0x00)\n@@ -257,19 +239,12 @@\n #define MV_6811_DEV_ID\t\t0x6811\n #define MV_6820_DEV_ID\t\t0x6820\n #define MV_6828_DEV_ID\t\t0x6828\n-/* Armada 39x Family */\n-#define MV_6920_DEV_ID\t\t0x6920\n-#define MV_6928_DEV_ID\t\t0x6928\n \n enum {\n \tMV_6810,\n \tMV_6820,\n \tMV_6811,\n \tMV_6828,\n-\tMV_NONE,\n-\tMV_6920,\n-\tMV_6928,\n-\tMV_MAX_DEV_ID,\n };\n \n #define MV_6820_INDEX\t\t\t0\n@@ -277,17 +252,12 @@ enum {\n #define MV_6811_INDEX\t\t\t2\n #define MV_6828_INDEX\t\t\t3\n \n-#define MV_6920_INDEX\t\t\t0\n-#define MV_6928_INDEX\t\t\t1\n-\n #define MAX_DEV_ID_NUM\t\t\t4\n \n #define MV_6820_INDEX\t\t\t0\n #define MV_6810_INDEX\t\t\t1\n #define MV_6811_INDEX\t\t\t2\n #define MV_6828_INDEX\t\t\t3\n-#define MV_6920_INDEX\t\t\t0\n-#define MV_6928_INDEX\t\t\t1\n \n enum unit_id {\n \tPEX_UNIT_ID,\n","prefixes":["RFC","u-boot-mvebu","55/59"]}