From patchwork Sun Aug 2 21:56:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 51804 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by patches.linaro.org (Postfix) with ESMTPS id 31252229FD for ; Sun, 2 Aug 2015 21:58:17 +0000 (UTC) Received: by wicmv11 with SMTP id mv11sf23154501wic.1 for ; Sun, 02 Aug 2015 14:58:16 -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 :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:cc:mime-version:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=5BSat++Wl3mEYe3CeEPHxSSwWlWrjdLq0dSl585uR28=; b=SQuETIyEU9va3IINcj92sNElqU6yU/TjGfuwHKnKcTokZC836vvQiWEObHIosHCuKn Ue8fDhZxuBO5f5Ot1xpTztyp7yL5fi6hqwZ2hX+A/D3ZTEdIUBFFTGqn7XJrf7bPS8dW C9KxqylYaHj5lBODEEqluZCul5DinjQUcruTGNabB2aPTyQhVJWwpQsLC/r+SamLtrcv X9pzZbMHvtgFDa5CQqbXRSy3go8kGgtDbFqiszUmpB5EyZYN5FqPIIHtGQO2O5kGG8OY 1B7bwKPa9JbBIsy+EcQEWmyubt5aWGilGqwBAixQEIIKsJQQDjIbQpS3h9zhStilzox+ 8RGg== X-Gm-Message-State: ALoCoQm3ZE+C1DwKTSkt/YMR/1X6l8MExbt6TDD2IXQoDdoz6nIdY/O988h3zlISCSJFp4A4De2y X-Received: by 10.152.27.130 with SMTP id t2mr4575785lag.2.1438552696368; Sun, 02 Aug 2015 14:58:16 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.133 with SMTP id y5ls506516laj.19.gmail; Sun, 02 Aug 2015 14:58:16 -0700 (PDT) X-Received: by 10.152.7.65 with SMTP id h1mr13821576laa.33.1438552696085; Sun, 02 Aug 2015 14:58:16 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id w9si10308527laj.54.2015.08.02.14.58.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Aug 2015 14:58:15 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by labow3 with SMTP id ow3so4929100lab.1 for ; Sun, 02 Aug 2015 14:58:15 -0700 (PDT) X-Received: by 10.152.36.102 with SMTP id p6mr13792806laj.19.1438552695656; Sun, 02 Aug 2015 14:58:15 -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.112.7.198 with SMTP id l6csp1548139lba; Sun, 2 Aug 2015 14:58:14 -0700 (PDT) X-Received: by 10.70.1.102 with SMTP id 6mr29396175pdl.32.1438552694426; Sun, 02 Aug 2015 14:58:14 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id wj6si9481372pbc.232.2015.08.02.14.58.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Aug 2015 14:58:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) 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 1ZM1FY-0001YR-Pe; Sun, 02 Aug 2015 21:56:56 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZM1FW-0001Xx-1r for linux-arm-kernel@bombadil.infradead.org; Sun, 02 Aug 2015 21:56:54 +0000 Received: from mail-la0-f50.google.com ([209.85.215.50]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZM1FT-000554-N8 for linux-arm-kernel@lists.infradead.org; Sun, 02 Aug 2015 21:56:52 +0000 Received: by labgo9 with SMTP id go9so16019851lab.3 for ; Sun, 02 Aug 2015 14:56:28 -0700 (PDT) X-Received: by 10.112.25.69 with SMTP id a5mr13732508lbg.16.1438552588358; Sun, 02 Aug 2015 14:56:28 -0700 (PDT) Received: from localhost.localdomain.localdomain (c-297471d5.01-192-6c756e10.cust.bredbandsbolaget.se. [213.113.116.41]) by smtp.gmail.com with ESMTPSA id g1sm2556372lam.30.2015.08.02.14.56.25 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Aug 2015 14:56:26 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/4] ARM: nomadik: selectively enable UART0 on boards Date: Sun, 2 Aug 2015 23:56:21 +0200 Message-Id: <1438552581-4531-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150802_225651_797229_105669A4 X-CRM114-Status: GOOD ( 14.37 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on casper.infradead.org summary: Content analysis details: (-2.6 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.50 listed in wl.mailspike.net] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.215.50 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 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: Linus Walleij 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: linus.walleij@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.215.49 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 The S8815 board is using RX/TX on UART0, and the NHK8815 is using RX/TX and CTS/RTS (the latter connected to a Bluetooth chip). Activate the right groups with the u0 UART0 function on each board and undisable it. Get rid of the old erroneous default definition from the SoC file. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-nomadik-nhk15.dts | 16 ++++++++++++++++ arch/arm/boot/dts/ste-nomadik-s8815.dts | 18 +++++++++++++++++- arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 10 ---------- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/ste-nomadik-nhk15.dts b/arch/arm/boot/dts/ste-nomadik-nhk15.dts index 0e167ed2857b..9d888b0e75af 100644 --- a/arch/arm/boot/dts/ste-nomadik-nhk15.dts +++ b/arch/arm/boot/dts/ste-nomadik-nhk15.dts @@ -17,12 +17,22 @@ }; aliases { + serial0 = &uart0; serial1 = &uart1; stmpe-i2c0 = &stmpe0; stmpe-i2c1 = &stmpe1; }; pinctrl { + uart0 { + uart0_nhk_mode: uart0_mux { + u0_default_mux { + function = "u0"; + groups = "u0txrx_a_1", "u0ctsrts_a_1"; + }; + }; + }; + stmpe2401_1 { stmpe2401_1_nhk_mode: stmpe2401_1_nhk { nhk_cfg1 { @@ -146,6 +156,12 @@ }; amba { + /* Activate RX/TX and CTS/RTS on UART 0 */ + uart0: uart@101fd000 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_nhk_mode>; + status = "okay"; + }; mmcsd: sdi@101f6000 { cd-gpios = <&stmpe_gpio44 7 GPIO_ACTIVE_LOW>; wp-gpios = <&stmpe_gpio44 18 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts index edcfe2413ee7..11b5e34150b8 100644 --- a/arch/arm/boot/dts/ste-nomadik-s8815.dts +++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts @@ -16,6 +16,7 @@ }; aliases { + serial0 = &uart0; serial1 = &uart1; }; @@ -40,6 +41,15 @@ pinctrl-names = "default"; pinctrl-0 = <&cd_default_mode>; + uart0 { + /* Only use RX/TX pins */ + uart0_s8815_mode: uart0_mux { + u0_default_mux { + function = "u0"; + groups = "u0txrx_a_1"; + }; + }; + }; mmcsd-cd { cd_default_mode: cd_default { cd_default_cfg1 { @@ -112,8 +122,14 @@ }; - /* Configure card detect for the uSD slot */ amba { + /* Activate RXTX on UART 0 */ + uart0: uart@101fd000 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_s8815_mode>; + status = "okay"; + }; + /* Configure card detect for the uSD slot */ mmcsd: sdi@101f6000 { cd-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>; }; diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi index 8e601d02ca8c..0edab6d23211 100644 --- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi +++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi @@ -103,14 +103,6 @@ compatible = "stericsson,stn8815-pinctrl"; nomadik-gpio-chips = <&gpio0>, <&gpio1>, <&gpio2>, <&gpio3>; /* Pin configurations */ - uart0 { - uart0_default_mux: uart0_mux { - u0_default_mux { - function = "u0"; - groups = "u0_a_1"; - }; - }; - }; uart1 { uart1_default_mux: uart1_mux { u1_default_mux { @@ -761,8 +753,6 @@ interrupts = <12>; clocks = <&uart0clk>, <&pclkuart0>; clock-names = "uartclk", "apb_pclk"; - pinctrl-names = "default"; - pinctrl-0 = <&uart0_default_mux>; status = "disabled"; };