From patchwork Fri Feb 19 05:19:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 8356241 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1D6EAC0553 for ; Fri, 19 Feb 2016 05:21:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3160E203AB for ; Fri, 19 Feb 2016 05:21:40 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 61DCE201F2 for ; Fri, 19 Feb 2016 05:21:39 +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 1aWdU0-0003uu-HW; Fri, 19 Feb 2016 05:20:00 +0000 Received: from mail-pf0-x230.google.com ([2607:f8b0:400e:c00::230]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aWdTo-0003pb-8F for linux-arm-kernel@lists.infradead.org; Fri, 19 Feb 2016 05:19:49 +0000 Received: by mail-pf0-x230.google.com with SMTP id x65so44725415pfb.1 for ; Thu, 18 Feb 2016 21:19:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Dmhj3oTzwWV6V112acOBiMZwT/ZQZpHSmHVExDH92BI=; b=WPOe39eYHaGi9uNI5No6mxUqXjwTceTQxn/e8uZQQ94/lvAXPFndEzH84w7Hf1vvyb KA+YYwSXDlzrJMd+ZZz6GQm9BGn/qwea0mL6q8EgBLWA7aJ1O1/vwTgU+3eVLObiB3uP U6o+RuIbSKOL/BQ7aLWq8MBHGVZr7E+798vSI= 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=Dmhj3oTzwWV6V112acOBiMZwT/ZQZpHSmHVExDH92BI=; b=jbMQKW4dtk7GXFzjaRmQzKvXe7LUdsG4UdmT8zXdpIPEphyrAs1I+/0hYwjYgZ6aOM AHMqlDn3QvM/2S/5GEUAbdBRTVbinyuz6T0DJ4M9ZLvl2iVmXELvcZT7jC8WCCoLPJnd P9xGK2EOhEPgEwn8SQ0R4SC0U1T6fx68cS8b1Od+b8OTQuag99cvrFWCQOT43rquEehe CgnWg33EnY7EVVkLvj/bVuIj2KenPIw1QCW6PR8BTaLTz4LB0x4GqTwwxTK5RJqKOnOy 3uxjnI2jyXcMnj36pUBbxmx5xXcarclguBYMXpdBnicstDdsxbOq33xUKMqMk56IYTZb 91qA== X-Gm-Message-State: AG10YORAcfGB7BMlwx6QFzIa6n84LLAL1HAxQkFdgSPGLuNtKeXhfhaoGflgwyzlAo5SIcOg X-Received: by 10.98.16.150 with SMTP id 22mr15549451pfq.128.1455859166387; Thu, 18 Feb 2016 21:19:26 -0800 (PST) Received: from docularxu-ThinkPad-T440p.219.146.1.66 ([111.161.114.233]) by smtp.gmail.com with ESMTPSA id l62sm14215507pfj.7.2016.02.18.21.19.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Feb 2016 21:19:25 -0800 (PST) From: Guodong Xu To: xuwei5@hisilicon.com, mark.rutland@arm.com, robh@kernel.org, grant.likely@secretlab.ca Subject: [PATCH 1/5] arm64: dts: hi6220: add pinctrl for uarts and enable them Date: Fri, 19 Feb 2016 13:19:04 +0800 Message-Id: <1455859148-29098-2-git-send-email-guodong.xu@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455859148-29098-1-git-send-email-guodong.xu@linaro.org> References: <1455859148-29098-1-git-send-email-guodong.xu@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160218_211948_501437_7DE67602 X-CRM114-Status: UNSURE ( 9.20 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, kong.kongxinwei@hisilicon.com, Guodong Xu , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Add pinctrl for uart2 uart3 and uart4. Enable uart1 uart2 and uart3. Signed-off-by: Guodong Xu --- arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 12 ++++++++++++ arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 9 +++++++++ 2 files changed, 21 insertions(+) diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts index e00e9ec..c4f560a 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts @@ -50,6 +50,18 @@ i2c1: i2c@f7101000 { status = "ok"; }; + + uart1: uart@f7111000 { + status = "ok"; + }; + + uart2: uart@f7112000 { + status = "ok"; + }; + + uart3: uart@f7113000 { + status = "ok"; + }; }; }; diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi index a7ca40b..6afd327 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi @@ -266,6 +266,8 @@ clocks = <&sys_ctrl HI6220_UART1_PCLK>, <&sys_ctrl HI6220_UART1_PCLK>; clock-names = "uartclk", "apb_pclk"; + pinctrl-names = "default"; + pinctrl-0 = <&uart1_pmx_func &uart1_cfg_func1 &uart1_cfg_func2>; status = "disabled"; }; @@ -276,6 +278,8 @@ clocks = <&sys_ctrl HI6220_UART2_PCLK>, <&sys_ctrl HI6220_UART2_PCLK>; clock-names = "uartclk", "apb_pclk"; + pinctrl-names = "default"; + pinctrl-0 = <&uart2_pmx_func &uart2_cfg_func>; status = "disabled"; }; @@ -286,6 +290,9 @@ clocks = <&sys_ctrl HI6220_UART3_PCLK>, <&sys_ctrl HI6220_UART3_PCLK>; clock-names = "uartclk", "apb_pclk"; + pinctrl-names = "default"; + pinctrl-0 = <&uart3_pmx_func &uart3_cfg_func>; + status = "disabled"; }; uart4: uart@f7114000 { @@ -295,6 +302,8 @@ clocks = <&sys_ctrl HI6220_UART4_PCLK>, <&sys_ctrl HI6220_UART4_PCLK>; clock-names = "uartclk", "apb_pclk"; + pinctrl-names = "default"; + pinctrl-0 = <&uart4_pmx_func &uart4_cfg_func>; status = "disabled"; };