From patchwork Tue May 13 09:44:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 30016 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f197.google.com (mail-ob0-f197.google.com [209.85.214.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AE77620560 for ; Tue, 13 May 2014 09:48:03 +0000 (UTC) Received: by mail-ob0-f197.google.com with SMTP id vb8sf403013obc.4 for ; Tue, 13 May 2014 02:48:03 -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=cbevK7ykeIn3XFswa9SdKn5Cgj7TZb+WB2RzX3l7HNk=; b=Q5oPAUxfo//FOsP1ps3WD0sqh0h84+tvmu2QfXd12TiQLZko9V9h5bElOEQhB0kIyU ruzkJSIZSa24A22ABGhn+U2LzYKdMPWcQij5tIgXKp6a9aArxUL3PGFQXeqP/s6SHkQ2 aFkFQ8AAWMKvYKhG2ZDgz9tyEqSr7cnj8rWaHOr6EfgDHzN9e8vrSfRzSkwbZ0nRtNi1 OnECebDHSXtHfUDM14n2L+wXJktNLsmN1w+kkVH3BXvFo4i1Z51bEb+mqdDY9H303wrw qCzZov8lNX7L3n6UqOUTIXvWzEKcqISSjV0K6sPp2W71Ei5GrHTVCRl/2PrQEzWsIOaK 0/yA== X-Gm-Message-State: ALoCoQnWorzPaopZ1qT+ZNYiyGIygsHifg554Sl8LXhk1rpmbeCw6u/0zcaOD9nyxL18oNkusJNy X-Received: by 10.43.90.198 with SMTP id bj6mr1899309icc.16.1399974483303; Tue, 13 May 2014 02:48:03 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.50.81 with SMTP id r75ls1755361qga.71.gmail; Tue, 13 May 2014 02:48:03 -0700 (PDT) X-Received: by 10.52.125.198 with SMTP id ms6mr2315507vdb.28.1399974483191; Tue, 13 May 2014 02:48:03 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id tx4si867648vdc.22.2014.05.13.02.48.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 13 May 2014 02:48:03 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id im17so102217vcb.38 for ; Tue, 13 May 2014 02:48:03 -0700 (PDT) X-Received: by 10.58.154.10 with SMTP id vk10mr28248031veb.18.1399974483077; Tue, 13 May 2014 02:48:03 -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.220.221.72 with SMTP id ib8csp137208vcb; Tue, 13 May 2014 02:48:02 -0700 (PDT) X-Received: by 10.224.151.130 with SMTP id c2mr43569892qaw.67.1399974482176; Tue, 13 May 2014 02:48:02 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id m6si7418075qay.172.2014.05.13.02.48.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 May 2014 02:48:02 -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 1Wk9HV-0001fu-JU; Tue, 13 May 2014 09:45:53 +0000 Received: from mail-pb0-f51.google.com ([209.85.160.51]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wk9HS-0001Rd-DE for linux-arm-kernel@lists.infradead.org; Tue, 13 May 2014 09:45:50 +0000 Received: by mail-pb0-f51.google.com with SMTP id ma3so78694pbc.24 for ; Tue, 13 May 2014 02:45:29 -0700 (PDT) X-Received: by 10.68.159.228 with SMTP id xf4mr3975434pbb.74.1399974329576; Tue, 13 May 2014 02:45:29 -0700 (PDT) Received: from localhost.localdomain ([140.206.182.114]) by mx.google.com with ESMTPSA id kj1sm27294335pbd.20.2014.05.13.02.45.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 May 2014 02:45:28 -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 v2 2/6] ARM: debug: Rename Hi3716 to HI5XHD2 Date: Tue, 13 May 2014 17:44:37 +0800 Message-Id: <1399974281-9737-3-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1399974281-9737-1-git-send-email-haojian.zhuang@linaro.org> References: <1399974281-9737-1-git-send-email-haojian.zhuang@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140513_024550_469992_17BE2690 X-CRM114-Status: GOOD ( 11.74 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.2 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.51 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record Cc: Haojian Zhuang X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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.220.179 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 5a311af..df930e5 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 @@ -1058,7 +1058,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 0xfcb00000 if DEBUG_HI3620_UART default 0xfe800000 if ARCH_IOP32X default 0xffc02000 if DEBUG_SOCFPGA_UART @@ -1101,7 +1101,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