From patchwork Thu Oct 28 14:19:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Bulwahn X-Patchwork-Id: 12590345 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8853C433F5 for ; Thu, 28 Oct 2021 14:24:33 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A3C3D61106 for ; Thu, 28 Oct 2021 14:24:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A3C3D61106 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=o2EUtyvtWvHkhZBNCsmAq9n56YUB33mcXTxweWadEKg=; b=mS5eROIsUoYLZx TWLvsWXod0rBhyQs58CiX83YGzd2hwaDq+bHyE0v6+AjT7zrE69qfBsoKbwcZh/OWV2orYhBKz0r9 U0aGha67EXkMDjyH4b3S4Nw1P8aBxQQl1hAn9k5fey3UvDijnxdBxJ1sF0yG5qpASa2u6v33PK3i5 wB969P+WgwdaPSms91bymY8PNfY4oW2fcilN0xN9fmPt74XYz98e7tF2oWl+jBP3D2Gd975TWZELn uQF2suUG83KQECCZnGbtPVamy0wPugw4q6igewpV2b1yvazeaPf2y5dt6FYrRJv7FIr5g5M/Za656 kGyNdcPn9oygx9fK4TaA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mg6Iv-0087Ti-L1; Thu, 28 Oct 2021 14:22:54 +0000 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mg6GK-0086KM-GV for linux-arm-kernel@lists.infradead.org; Thu, 28 Oct 2021 14:20:14 +0000 Received: by mail-wr1-x436.google.com with SMTP id k7so10454660wrd.13 for ; Thu, 28 Oct 2021 07:20:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Jq2UWtG87dKtp2XZhwrbjMAgWZR6sHhFRmylDzZWc3U=; b=Ga9puom6MDb1nGZqJz4kzpiYpvKxyb9Nm4IeObhoEB/Vyllld2oBBGENQHR5M90VZp t6IYEj07WV+x9NavL9+WLfTcp9SPEMOZEYlWpMWtWNMOkt0CUEjSGJN0/NNSJOzoxG1r gPMborydG7PWwy4+8i/EnGGjnaw4j6akgpVanezrqm0D8Ty7h8UCUem3TsgZE3w4PjH5 7r+4hlcJj22WKY5x9yJkkno2fzzvDwTTNr2pNgB6awOHHnQmxc3US9B9HdumUG0dHMyV pDWyXkldoEGup0spMTVH1ReipOAau4ZpTUImIBX0JqY58UCBKej5j0YT17ywMh9Ng9B/ IDXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Jq2UWtG87dKtp2XZhwrbjMAgWZR6sHhFRmylDzZWc3U=; b=1ZoEIWmvbGLbFzWVZVyfU4FmnfNR+A63HE8qRauEb9FYiEZU22wKMPvkUuZnKN4+k0 4y/MWgPOnM/aez2L0+o7azb4bl2/KHxBch/J9d0gyRlBv5aAmUypRcIbpM4FrbY+eC5Q +99vvaRjQSFYcKT8tQ2QZ019irnULYjOIf4A73tygqBR5gJmlbgtjcaW8SMXtA8AwEqk iBB/+XYBeOf9ITC+2BdnfFDZVfHCxLBt4A6T+5kw9KN+q1xANqSAkPX9Z+U08pc8S3pc mFreNxvKOALYWDN5MbhriqM0khiHJmrsTkhJyRJAkFVnWySkzuBWwrIgUSC5qW1aIG6U +Vnw== X-Gm-Message-State: AOAM532IXNT3Um6umjVbDtFR00/uapW+8u0UDrSHYf10SMBlg3XhyEQV yO7+FR8d4gC9OfWCf242Rp8= X-Google-Smtp-Source: ABdhPJyTnHflOd35od7Nqe0uPf6eZ2Tsvdh6LTEeOfKT4xLNdiyUfBf9J8jHcbNZwK8CGER76iQugg== X-Received: by 2002:a5d:6da7:: with SMTP id u7mr5906547wrs.322.1635430810538; Thu, 28 Oct 2021 07:20:10 -0700 (PDT) Received: from localhost.localdomain (i5C74E249.versanet.de. [92.116.226.73]) by smtp.gmail.com with ESMTPSA id m2sm6284546wml.15.2021.10.28.07.20.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 07:20:10 -0700 (PDT) From: Lukas Bulwahn To: Russell King , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Sekhar Nori , Bartosz Golaszewski , Linus Walleij , Imre Kaloz , Krzysztof Halasa , Avi Fishman , Tomer Maimon , Tali Perry , Patrick Venture , Nancy Yuen , Benjamin Fair , Dinh Nguyen , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, openbmc@lists.ozlabs.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, Lukas Bulwahn Subject: [PATCH 08/13] arm: imx: rename DEBUG_IMX21_IMX27_UART to DEBUG_IMX27_UART Date: Thu, 28 Oct 2021 16:19:33 +0200 Message-Id: <20211028141938.3530-9-lukas.bulwahn@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211028141938.3530-1-lukas.bulwahn@gmail.com> References: <20211028141938.3530-1-lukas.bulwahn@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211028_072012_593317_8A253B42 X-CRM114-Status: GOOD ( 14.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Since commit 4b563a066611 ("ARM: imx: Remove imx21 support"), the config DEBUG_IMX21_IMX27_UART is really only debug support for IMX27. So, rename this option to DEBUG_IMX27_UART and adjust dependencies in Kconfig and rename the definitions to IMX27 as further clean-up. This issue was discovered with ./scripts/checkkconfigsymbols.py, which reported that DEBUG_IMX21_IMX27_UART depends on the non-existing config SOC_IMX21. Signed-off-by: Lukas Bulwahn Reviewed-by: Arnd Bergmann --- arch/arm/Kconfig.debug | 14 +++++++------- arch/arm/include/debug/imx-uart.h | 18 +++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 87aa6e92ee6e..7dad01729683 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -410,12 +410,12 @@ choice Say Y here if you want kernel low-level debugging support on i.MX25. - config DEBUG_IMX21_IMX27_UART - bool "i.MX21 and i.MX27 Debug UART" - depends on SOC_IMX21 || SOC_IMX27 + config DEBUG_IMX27_UART + bool "i.MX27 Debug UART" + depends on SOC_IMX27 help Say Y here if you want kernel low-level debugging support - on i.MX21 or i.MX27. + on i.MX27. config DEBUG_IMX28_UART bool "i.MX28 Debug UART" @@ -1481,7 +1481,7 @@ config DEBUG_IMX_UART_PORT int "i.MX Debug UART Port Selection" depends on DEBUG_IMX1_UART || \ DEBUG_IMX25_UART || \ - DEBUG_IMX21_IMX27_UART || \ + DEBUG_IMX27_UART || \ DEBUG_IMX31_UART || \ DEBUG_IMX35_UART || \ DEBUG_IMX50_UART || \ @@ -1540,12 +1540,12 @@ config DEBUG_LL_INCLUDE default "debug/icedcc.S" if DEBUG_ICEDCC default "debug/imx.S" if DEBUG_IMX1_UART || \ DEBUG_IMX25_UART || \ - DEBUG_IMX21_IMX27_UART || \ + DEBUG_IMX27_UART || \ DEBUG_IMX31_UART || \ DEBUG_IMX35_UART || \ DEBUG_IMX50_UART || \ DEBUG_IMX51_UART || \ - DEBUG_IMX53_UART ||\ + DEBUG_IMX53_UART || \ DEBUG_IMX6Q_UART || \ DEBUG_IMX6SL_UART || \ DEBUG_IMX6SX_UART || \ diff --git a/arch/arm/include/debug/imx-uart.h b/arch/arm/include/debug/imx-uart.h index c8eb83d4b896..3edbb3c5b42b 100644 --- a/arch/arm/include/debug/imx-uart.h +++ b/arch/arm/include/debug/imx-uart.h @@ -11,13 +11,6 @@ #define IMX1_UART_BASE_ADDR(n) IMX1_UART##n##_BASE_ADDR #define IMX1_UART_BASE(n) IMX1_UART_BASE_ADDR(n) -#define IMX21_UART1_BASE_ADDR 0x1000a000 -#define IMX21_UART2_BASE_ADDR 0x1000b000 -#define IMX21_UART3_BASE_ADDR 0x1000c000 -#define IMX21_UART4_BASE_ADDR 0x1000d000 -#define IMX21_UART_BASE_ADDR(n) IMX21_UART##n##_BASE_ADDR -#define IMX21_UART_BASE(n) IMX21_UART_BASE_ADDR(n) - #define IMX25_UART1_BASE_ADDR 0x43f90000 #define IMX25_UART2_BASE_ADDR 0x43f94000 #define IMX25_UART3_BASE_ADDR 0x5000c000 @@ -26,6 +19,13 @@ #define IMX25_UART_BASE_ADDR(n) IMX25_UART##n##_BASE_ADDR #define IMX25_UART_BASE(n) IMX25_UART_BASE_ADDR(n) +#define IMX27_UART1_BASE_ADDR 0x1000a000 +#define IMX27_UART2_BASE_ADDR 0x1000b000 +#define IMX27_UART3_BASE_ADDR 0x1000c000 +#define IMX27_UART4_BASE_ADDR 0x1000d000 +#define IMX27_UART_BASE_ADDR(n) IMX27_UART##n##_BASE_ADDR +#define IMX27_UART_BASE(n) IMX27_UART_BASE_ADDR(n) + #define IMX31_UART1_BASE_ADDR 0x43f90000 #define IMX31_UART2_BASE_ADDR 0x43f94000 #define IMX31_UART3_BASE_ADDR 0x5000c000 @@ -112,10 +112,10 @@ #ifdef CONFIG_DEBUG_IMX1_UART #define UART_PADDR IMX_DEBUG_UART_BASE(IMX1) -#elif defined(CONFIG_DEBUG_IMX21_IMX27_UART) -#define UART_PADDR IMX_DEBUG_UART_BASE(IMX21) #elif defined(CONFIG_DEBUG_IMX25_UART) #define UART_PADDR IMX_DEBUG_UART_BASE(IMX25) +#elif defined(CONFIG_DEBUG_IMX27_UART) +#define UART_PADDR IMX_DEBUG_UART_BASE(IMX27) #elif defined(CONFIG_DEBUG_IMX31_UART) #define UART_PADDR IMX_DEBUG_UART_BASE(IMX31) #elif defined(CONFIG_DEBUG_IMX35_UART)