From patchwork Mon Jul 28 12:51:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 4634231 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 87E9AC0338 for ; Mon, 28 Jul 2014 12:54:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E193C2017E for ; Mon, 28 Jul 2014 12:54:44 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0031320109 for ; Mon, 28 Jul 2014 12:54:43 +0000 (UTC) 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 1XBkQ0-0001st-2t; Mon, 28 Jul 2014 12:52:44 +0000 Received: from mail-pa0-f52.google.com ([209.85.220.52]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XBkPw-0001nW-PN for linux-arm-kernel@lists.infradead.org; Mon, 28 Jul 2014 12:52:41 +0000 Received: by mail-pa0-f52.google.com with SMTP id bj1so10347920pad.25 for ; Mon, 28 Jul 2014 05:52:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JAwlb1Vrp96TAiNUzNnJMISmauEZMM9NiXQnha652WY=; b=jYBH6vIq9OAiLqBcMso59J2G5WuJaOx8MS34CCy+UxMp6qhfjJj+hjIpSOITF6TMCQ L6vPkfUvEF6NBnsa0ZVJMPZIZs717nR/HFz0MjRwb1TUwhmNFbchfgFDegMHcHlVLm3F m3I0tLT7G1tJP6Bp5cs+spCatjYY1J9SeL8f6tDE/uHELC53T9VHjf+zV3Lq7Atl0Nd3 vi9AJaDetGvHl86iVFhlCE1HIFQIhOoXxBNnyDlO1nLEkRauuhU7tVG1KPuEc9XZTtMP OK49Q5zN8nNOEL9zLjqYJrhl1hIpWEuc2dhsfInJ6o8fHfCkS7OjY9B9AWAcZzL7PKeb 1y3A== X-Gm-Message-State: ALoCoQloOLgkOE4P74yY0GugRrQqY95kyxkrCJ9ykkZrbQZebBKX7B97oGFxPqfGqHyoMR0pNvCy X-Received: by 10.70.33.102 with SMTP id q6mr38626505pdi.39.1406551939082; Mon, 28 Jul 2014 05:52:19 -0700 (PDT) Received: from localhost.localdomain ([61.172.253.147]) by mx.google.com with ESMTPSA id ia2sm17602248pbb.32.2014.07.28.05.52.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Jul 2014 05:52:18 -0700 (PDT) From: Haojian Zhuang To: arnd@arndb.de, xuwei5@hisilicon.com, olof@lixom.net, khilman@linaro.org, arm@kernel.org, linux-arm-kernel@lists.infradead.org, yanhaifeng@hisilicon.com, liguozhu@hisilicon.com Subject: [PATCH v5 1/8] ARM: debug: Rename Hi3716 to HI5XHD2 Date: Mon, 28 Jul 2014 20:51:16 +0800 Message-Id: <1406551883-26154-2-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1406551883-26154-1-git-send-email-haojian.zhuang@linaro.org> References: <1406551883-26154-1-git-send-email-haojian.zhuang@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140728_055240_854184_2116D8EF X-CRM114-Status: GOOD ( 11.27 ) X-Spam-Score: -0.7 (/) Cc: Jiancheng Xue , Haojian Zhuang , Haifeng Yan 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 8f90595..d061de0 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -223,6 +223,14 @@ choice Say Y here if you want kernel low-level debugging support on HI3716 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 @@ -1092,7 +1100,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 @@ -1144,7 +1152,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