From patchwork Thu May 3 12:13:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 10378031 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9CC3C60327 for ; Thu, 3 May 2018 12:16:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8707B2861D for ; Thu, 3 May 2018 12:16:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7BCD3290F5; Thu, 3 May 2018 12:16:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E20282861D for ; Thu, 3 May 2018 12:16:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=No0WcDpyssvFobJWozLq5RxaL+8c23ncXNLQFZ6xmDo=; b=mlUX7dJrJ9Doyt HLhSyWwC8qi+cxwq/m1Q3mdDibQ/x9yF0J6aZSxg4qsoJdGPhMRYIxxP8OtAoYPSe38uEKwKh6dPY mn7LG2XJKis9NReR1Pe5Mst9AyOIVo6m86LipO9rsvrtLXx4V4B6WLOjyaWcMgfWAbvotov/rn4HM 7uTVwy3b4lF15NW8kLTFyFtkSGUhpyzMwtWVcVKoYiC/P7w55tA1XgC7As1TXYuo7hpkHx9U7qmSu c2uStIfyBnIryP0hsySWX+3YT3dfByfZ1f4mVQP7tHO6ylwR6eFDqCWPPZCcqMjyGYDQCzkixyqt7 DQcsTdP4HC5km6yXbFAQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fEDAC-0005Uh-Aa; Thu, 03 May 2018 12:16:44 +0000 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fEDA6-0005Tv-Tj for linux-arm-kernel@lists.infradead.org; Thu, 03 May 2018 12:16:41 +0000 Received: by mail-wm0-x244.google.com with SMTP id o78so30060055wmg.0 for ; Thu, 03 May 2018 05:16:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Eo+rp8PD2Yr/FDHNfPvZzz5keIsekXiiGQ51zT2SKbE=; b=cyNahk/Mw+DecHT8E3fZUu7M+CydcPDvsLZHlTgIMFjRxsGdKoaRfNIB2uQuSaCe47 bVSykJgkESVWmbo7EVoDC6GL7OYiGxdu7UeUrhbVYZNhaj4F6NqcAhWuxMXVguBjYh0W I9IWF3vUoIqfxXP6PyO1afjrEwezlrLq3U+7G5qELQoWTKQ+1lVf8q/Gzl0fF97/JIkS acQCuzqvZlRST42dW0ibYKhH5zXd2rXkoajda1tj3DKaAjy/TGKqcpMx2Lz7fGa/j5Ot eiKsZNXTugCDSHKgECAgdYhLpQBWu+gWXRuBXppkM1o7lmZBTn4Ut3nXubc7mmEEJiVI pndQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Eo+rp8PD2Yr/FDHNfPvZzz5keIsekXiiGQ51zT2SKbE=; b=WJ4yUyudO1Lp9rO6yyfxLjnomHxmDBSdOK6pnS2QZ8e8NATYc7KN2jGffSitaVDLmR iXE8EhfgxqAJPyHUGwTem7+fMsG2fOtWBda/k1V9UhLmLCK6ZblpdFl6MEjcZCOZGUeA 5D+wqoCP9GnR3zASSDoSf1OiDAwYrKk75HmuGrnk1pO6QqWN2Zt+yZ0vXHuv+vv5nMgD jqF2mQw60P1GMgrZ6okQ94z3ta1Tv6XywKeIFkqLJ/6RQTX4EBokHI1KC/Owwv95O59M LaOffp4HDOw5Q9/bPjGFFe7GOA8kl4s2TtiMzaZH0eMNJKaVfcUqeCLT8MSsRcLa027D qNnA== X-Gm-Message-State: ALQs6tBCs8DSO+y9M4b6KAWh5CXTIOphiRKRX/bhi5KUXtVvCU92gUV8 lNnxZeDrvcMpNTqot0JVlOLMGw== X-Google-Smtp-Source: AB8JxZoTWfFXnwwFhNhDir9As7YaMQ08B9mLtOGOjXPwGyPB3xVVLsfKVZOqYDaasoUUzzYPh8m6Ig== X-Received: by 10.28.103.135 with SMTP id b129mr1202265wmc.117.1525349786584; Thu, 03 May 2018 05:16:26 -0700 (PDT) Received: from cperon-Latitude-7490.lan (static-css-csd-151233.business.bouyguestelecom.com. [176.162.151.233]) by smtp.gmail.com with ESMTPSA id z11-v6sm13843481wre.15.2018.05.03.05.16.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 May 2018 05:16:25 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: debug: enable UART1 for socfpga Cyclone5 Date: Thu, 3 May 2018 14:13:42 +0200 Message-Id: <20180503121342.14178-1-peron.clem@gmail.com> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180503_051638_981060_11CB48CE X-CRM114-Status: GOOD ( 11.50 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dinh Nguyen , =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Cyclone5 and Arria10 doesn't have the same memory map for UART1. Split the SOCFPGA_UART1 into 2 options to allow debugging on UART1 for Cylone5. Signed-off-by: Clément Péron --- arch/arm/Kconfig.debug | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 199ebc1c4538..5b1f1ec1d3fe 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -1067,14 +1067,21 @@ choice Say Y here if you want kernel low-level debugging support on SOCFPGA(Cyclone 5 and Arria 5) based platforms. - config DEBUG_SOCFPGA_UART1 + config DEBUG_SOCFPGA_ARRIA10_UART1 depends on ARCH_SOCFPGA - bool "Use SOCFPGA UART1 for low-level debug" + bool "Use SOCFPGA Arria10 UART1 for low-level debug" select DEBUG_UART_8250 help Say Y here if you want kernel low-level debugging support on SOCFPGA(Arria 10) based platforms. + config DEBUG_SOCFPGA_CYCLONE5_UART1 + depends on ARCH_SOCFPGA + bool "Use SOCFPGA Cyclone 5 UART1 for low-level debug" + select DEBUG_UART_8250 + help + Say Y here if you want kernel low-level debugging support + on SOCFPGA(Cyclone 5 and Arria 5) based platforms. config DEBUG_SUN9I_UART0 bool "Kernel low-level debugging messages via sun9i UART0" @@ -1632,7 +1639,8 @@ config DEBUG_UART_PHYS default 0xfe800000 if ARCH_IOP32X default 0xff690000 if DEBUG_RK32_UART2 default 0xffc02000 if DEBUG_SOCFPGA_UART0 - default 0xffc02100 if DEBUG_SOCFPGA_UART1 + default 0xffc02100 if DEBUG_SOCFPGA_ARRIA10_UART1 + default 0xffc03000 if DEBUG_SOCFPGA_CYCLONE5_UART1 default 0xffd82340 if ARCH_IOP13XX default 0xffe40000 if DEBUG_RCAR_GEN1_SCIF0 default 0xffe42000 if DEBUG_RCAR_GEN1_SCIF2 @@ -1738,7 +1746,8 @@ config DEBUG_UART_VIRT default 0xfeb30c00 if DEBUG_KEYSTONE_UART0 default 0xfeb31000 if DEBUG_KEYSTONE_UART1 default 0xfec02000 if DEBUG_SOCFPGA_UART0 - default 0xfec02100 if DEBUG_SOCFPGA_UART1 + default 0xfec02100 if DEBUG_SOCFPGA_ARRIA10_UART1 + default 0xfec03000 if DEBUG_SOCFPGA_CYCLONE5_UART1 default 0xfec12000 if (DEBUG_MVEBU_UART0 || DEBUG_MVEBU_UART0_ALTERNATE) && ARCH_MVEBU default 0xfec12100 if DEBUG_MVEBU_UART1_ALTERNATE default 0xfec10000 if DEBUG_SIRFATLAS7_UART0 @@ -1787,9 +1796,9 @@ config DEBUG_UART_8250_WORD depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250 depends on DEBUG_UART_8250_SHIFT >= 2 default y if DEBUG_PICOXCELL_UART || \ - DEBUG_SOCFPGA_UART0 || DEBUG_SOCFPGA_UART1 || \ - DEBUG_KEYSTONE_UART0 || DEBUG_KEYSTONE_UART1 || \ - DEBUG_ALPINE_UART0 || \ + DEBUG_SOCFPGA_UART0 || DEBUG_SOCFPGA_ARRIA10_UART1 || \ + DEBUG_SOCFPGA_CYCLONE5_UART1 || DEBUG_KEYSTONE_UART0 || \ + DEBUG_KEYSTONE_UART1 || DEBUG_ALPINE_UART0 || \ DEBUG_DAVINCI_DMx_UART0 || DEBUG_DAVINCI_DA8XX_UART1 || \ DEBUG_DAVINCI_DA8XX_UART2 || \ DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2