From patchwork Fri Jun 10 09:38:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 9169147 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4156F60573 for ; Fri, 10 Jun 2016 09:40:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 34E362824F for ; Fri, 10 Jun 2016 09:40:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 293C32835A; Fri, 10 Jun 2016 09:40:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id BC4542824F for ; Fri, 10 Jun 2016 09:40:34 +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 1bBIu9-0007wN-Jg; Fri, 10 Jun 2016 09:39:05 +0000 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bBIu5-0007m0-TY for linux-arm-kernel@lists.infradead.org; Fri, 10 Jun 2016 09:39:03 +0000 Received: by mail-wm0-x22f.google.com with SMTP id k204so94216942wmk.0 for ; Fri, 10 Jun 2016 02:38:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=Trux66hcucEBj6orkReol4AvfuKZrfqymYOMRFoMtXc=; b=IduzoXechX7GkQDXiU/8m4KZksJxUOk0YxlGzCKPF9Rt9nFW3UXa8r9QvWVW8H4mhP 0JEgT8aCZ4xbfoyCPDPyz+SGfIRTPfjIGtnvwwx2woElLtzEa01bIqTksnwtGrws+StF +pTNpgxYLTLmk1eWwL3oqMIohwthmDmkKkR6E= 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; bh=Trux66hcucEBj6orkReol4AvfuKZrfqymYOMRFoMtXc=; b=h/+Ct6CZ6OUwtg49kZzRg11l6W2OwNQSYOz9AGkIKWTDUbXIrqgyUofoAVImKecos0 iRwNxRmDkDq5GR7S4PsHIw91qhKnsagIIOHIBJc/RlHRPIy1/18Gf5mEKN0Fl5hBMR5D 9RwA3mQN7w+Vb+/DVOg9AgB/9nWWG6isTuv6ceuu81gULqchZWxgWV8PZCsdRWGSxRg3 SKnMkh0gG59gzbd4iR1fuDqDmagKvcVc8kCqWy1OGWmXXPSIr0vuuP8+XTW6ef25L4Hz AxtgiAE0aBS7zsgAUC6MeX7OC6eC4+WmAK9lHtrTDO8eOI2OwUNE1xIpoFqDRhOaFN6w iO6g== X-Gm-Message-State: ALyK8tLVrvj5VeRR915wvIxk02SbbydT85NmXrzoesazuXuW2HATXOlFc+Z/8/E9lHhe1io1 X-Received: by 10.194.3.51 with SMTP id 19mr1299616wjz.57.1465551520189; Fri, 10 Jun 2016 02:38:40 -0700 (PDT) Received: from localhost.localdomain (host-92-17-247-99.as13285.net. [92.17.247.99]) by smtp.gmail.com with ESMTPSA id xw8sm11448326wjb.30.2016.06.10.02.38.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Jun 2016 02:38:39 -0700 (PDT) From: Srinivas Kandagatla To: Andy Gross Subject: [PATCH 1/2] ARM: dts: apq8064: move sdcc1 pinctrl nodes to soc file Date: Fri, 10 Jun 2016 10:38:34 +0100 Message-Id: <1465551515-21622-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160610_023902_105272_CB0FEF18 X-CRM114-Status: GOOD ( 12.36 ) 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, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, David Brown , Rob Herring , Srinivas Kandagatla , linux-soc@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-Virus-Scanned: ClamAV using ClamSMTP This patch moves out the sdcc1 pinctrl nodes out of board files to soc file, so that it will be duplicated in other board files. Signed-off-by: Srinivas Kandagatla --- arch/arm/boot/dts/qcom-apq8064-pins.dtsi | 20 ++++++++++++++++++++ .../arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts | 22 ---------------------- arch/arm/boot/dts/qcom-apq8064.dtsi | 2 ++ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/arch/arm/boot/dts/qcom-apq8064-pins.dtsi b/arch/arm/boot/dts/qcom-apq8064-pins.dtsi index 4102a98..ca683e5 100644 --- a/arch/arm/boot/dts/qcom-apq8064-pins.dtsi +++ b/arch/arm/boot/dts/qcom-apq8064-pins.dtsi @@ -7,6 +7,26 @@ }; }; + sdcc1_pins: sdcc1-pin-active { + clk { + pins = "sdc1_clk"; + drive-strengh = <16>; + bias-disable; + }; + + cmd { + pins = "sdc1_cmd"; + drive-strengh = <10>; + bias-pull-up; + }; + + data { + pins = "sdc1_data"; + drive-strengh = <10>; + bias-pull-up; + }; + }; + ps_hold: ps_hold { mux { pins = "gpio78"; diff --git a/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts b/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts index 06b3c76..93d08b9 100644 --- a/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts +++ b/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts @@ -70,25 +70,6 @@ }; }; - sdcc1_pin_a: sdcc1-pin-active { - clk { - pins = "sdc1_clk"; - drive-strengh = <16>; - bias-disable; - }; - - cmd { - pins = "sdc1_cmd"; - drive-strengh = <10>; - bias-pull-up; - }; - - data { - pins = "sdc1_data"; - drive-strengh = <10>; - bias-pull-up; - }; - }; sdcc3_pin_a: sdcc3-pin-active { clk { @@ -417,9 +398,6 @@ vmmc-supply = <&pm8921_l5>; vqmmc-supply = <&pm8921_s4>; - - pinctrl-names = "default"; - pinctrl-0 = <&sdcc1_pin_a>; }; sdcc3: sdcc@12180000 { diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi index cf37d55..ce7ce84 100644 --- a/arch/arm/boot/dts/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi @@ -859,6 +859,8 @@ sdcc1: sdcc@12400000 { status = "disabled"; compatible = "arm,pl18x", "arm,primecell"; + pinctrl-names = "default"; + pinctrl-0 = <&sdcc1_pins>; arm,primecell-periphid = <0x00051180>; reg = <0x12400000 0x2000>; interrupts = ;