From patchwork Thu Jun 26 04:05:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 32517 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f199.google.com (mail-pd0-f199.google.com [209.85.192.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 05F4820C88 for ; Thu, 26 Jun 2014 04:08:28 +0000 (UTC) Received: by mail-pd0-f199.google.com with SMTP id r10sf10111353pdi.2 for ; Wed, 25 Jun 2014 21:08:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=XZTQRvr6sNNVUyhGao9b0H/dckRFjcOFdAI+w1LNRCE=; b=FG6ctPO1TjBIDz2TQTx4g7MSHjUneVHa5Lf5RCWFxRWozEkycUUjJnCfemq/iG2dDP vhuyhIXhWbXWSQylUU6mPCN9Eufy3OIc9uaqhGW4PvYIEeJ/DSIrBQ3oC+ZnoQZWO8L5 Hs7+KCqb8w+EJ8bFZ6ruQLjCy6m5AI90FIKK+VUhgWuxwp78OiHRaRV/katXwn74XztS aF9cNQxe2rYbvFGv6brmVfq8u6JTsrAtRyVoTYlmqGJKjVTx0zM208fcFbYpQ6FLP+ag /clckRONNXtdiEVLl8TRbRZM+mdbZYOBEv/EboU33RaVx1jvFZra3b1mX7rH4QFBFMtU UxVA== X-Gm-Message-State: ALoCoQmKBOYjLm0uBNu1M/1H0FVte38+MeHkog1mR2m7//k6S7SEv6+GJVlZZfmE1q6jRHKCY0uY X-Received: by 10.66.216.161 with SMTP id or1mr7153308pac.38.1403755708301; Wed, 25 Jun 2014 21:08:28 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.20.141 with SMTP id 13ls83074qgj.59.gmail; Wed, 25 Jun 2014 21:08:28 -0700 (PDT) X-Received: by 10.58.211.229 with SMTP id nf5mr10528821vec.19.1403755708175; Wed, 25 Jun 2014 21:08:28 -0700 (PDT) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id zy2si3644931veb.78.2014.06.25.21.08.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 25 Jun 2014 21:08:28 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.174 as permitted sender) client-ip=209.85.128.174; Received: by mail-ve0-f174.google.com with SMTP id jx11so3093148veb.33 for ; Wed, 25 Jun 2014 21:08:28 -0700 (PDT) X-Received: by 10.58.228.74 with SMTP id sg10mr10574234vec.6.1403755708025; Wed, 25 Jun 2014 21:08:28 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp1117vcb; Wed, 25 Jun 2014 21:08:27 -0700 (PDT) X-Received: by 10.66.136.103 with SMTP id pz7mr17836563pab.140.1403755706813; Wed, 25 Jun 2014 21:08:26 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id g7si7948460pat.225.2014.06.25.21.08.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Jun 2014 21:08:26 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X00xV-00079L-EP; Thu, 26 Jun 2014 04:06:49 +0000 Received: from mail-pb0-f46.google.com ([209.85.160.46]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X00xM-00072H-KS for linux-arm-kernel@lists.infradead.org; Thu, 26 Jun 2014 04:06:41 +0000 Received: by mail-pb0-f46.google.com with SMTP id md12so2590917pbc.33 for ; Wed, 25 Jun 2014 21:06:19 -0700 (PDT) X-Received: by 10.68.231.196 with SMTP id ti4mr17865464pbc.48.1403755579636; Wed, 25 Jun 2014 21:06:19 -0700 (PDT) Received: from localhost.localdomain ([140.206.182.114]) by mx.google.com with ESMTPSA id z3sm27916184pas.15.2014.06.25.21.06.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Jun 2014 21:06:18 -0700 (PDT) From: Haojian Zhuang To: yanhaifeng@gmail.com, xuwei5@hisilicon.com, arnd@arndb.de, olof@lixom.net, linux-arm-kernel@lists.infradead.org, khilman@kernel.org, jchxue@gmail.com Subject: [PATCH v4 3/8] ARM: debug: Rename Hi3716 to HI5XHD2 Date: Thu, 26 Jun 2014 12:05:42 +0800 Message-Id: <1403755547-623-4-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1403755547-623-1-git-send-email-haojian.zhuang@linaro.org> References: <1403755547-623-1-git-send-email-haojian.zhuang@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140625_210640_703294_562DA46A X-CRM114-Status: GOOD ( 11.07 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.46 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.160.46 listed in wl.mailspike.net] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: Haojian Zhuang X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: haojian.zhuang@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.174 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Haifeng Yan Rename Hisilicon HI3716 to HI5XHD2. And it relies on ARCH_HI5XHD2 instead. Hi5XHD2 is a SoC with dual Cortex A9 cores. Signed-off-by: Haifeng Yan Signed-off-by: Jiancheng Xue Signed-off-by: Haojian Zhuang --- arch/arm/Kconfig.debug | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index f64a6df..17caa08 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -215,14 +215,6 @@ choice Say Y here if you want kernel low-level debugging support on HI3620 UART. - config DEBUG_HI3716_UART - bool "Hisilicon Hi3716 Debug UART" - depends on ARCH_HI3xxx - select DEBUG_UART_PL01X - help - Say Y here if you want kernel low-level debugging support - on HI3716 UART. - config DEBUG_HIP04_UART bool "Hisilicon HiP04 Debug UART" depends on ARCH_HIP04 @@ -231,6 +223,14 @@ choice Say Y here if you want kernel low-level debugging support on HIP04 UART. + config DEBUG_HIX5HD2_UART + bool "Hisilicon Hix5hd2 Debug UART" + depends on ARCH_HIX5HD2 + select DEBUG_UART_PL01X + help + Say Y here if you want kernel low-level debugging support + on Hix5hd2 UART. + config DEBUG_HIGHBANK_UART bool "Kernel low-level debugging messages via Highbank UART" depends on ARCH_HIGHBANK @@ -1101,7 +1101,7 @@ config DEBUG_UART_PHYS default 0xf1012000 if ARCH_DOVE || ARCH_KIRKWOOD || ARCH_MV78XX0 || \ ARCH_ORION5X default 0xf7fc9000 if DEBUG_BERLIN_UART - default 0xf8b00000 if DEBUG_HI3716_UART + default 0xf8b00000 if DEBUG_HIX5HD2_UART default 0xf991e000 if DEBUG_QCOM_UARTDM default 0xfcb00000 if DEBUG_HI3620_UART default 0xfe800000 if ARCH_IOP32X @@ -1154,7 +1154,7 @@ config DEBUG_UART_VIRT default 0xfe230000 if DEBUG_PICOXCELL_UART default 0xfe300000 if DEBUG_BCM_KONA_UART default 0xfe800000 if ARCH_IOP32X - default 0xfeb00000 if DEBUG_HI3620_UART || DEBUG_HI3716_UART + default 0xfeb00000 if DEBUG_HI3620_UART || DEBUG_HIX5HD2_UART default 0xfeb24000 if DEBUG_RK3X_UART0 default 0xfeb26000 if DEBUG_RK3X_UART1 default 0xfeb30c00 if DEBUG_KEYSTONE_UART0