From patchwork Tue Apr 12 09:33:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 65599 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1814298qge; Tue, 12 Apr 2016 02:34:59 -0700 (PDT) X-Received: by 10.98.69.1 with SMTP id s1mr3237154pfa.56.1460453694602; Tue, 12 Apr 2016 02:34:54 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id mz1si9310585pab.72.2016.04.12.02.34.54; Tue, 12 Apr 2016 02:34:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756449AbcDLJeg (ORCPT + 7 others); Tue, 12 Apr 2016 05:34:36 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:37466 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756443AbcDLJe3 (ORCPT ); Tue, 12 Apr 2016 05:34:29 -0400 Received: by mail-wm0-f44.google.com with SMTP id n3so19934916wmn.0 for ; Tue, 12 Apr 2016 02:34:28 -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:in-reply-to:references; bh=sLJssX77ujmF5cbYB5nQtHXZ10/8Errj8SS6nD9aO+Q=; b=KItYI97mEjppWTjhS236e2bZsbIuU68jPmu3Q/fZ+1Ba39AaZAp5S66Xp1ylAIIdvM RMpgV0lnxTg+cxzJZgw/lEbmUfN5fvuSuIAQto0r3pncwvvcmUo08l3C/vslsaL+V+9m i8TLEhONg4cMitHmzO2pbiNBNW5yAVSD4OI38= 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=sLJssX77ujmF5cbYB5nQtHXZ10/8Errj8SS6nD9aO+Q=; b=BsDDEvlCpPZh6ZUwkjvo5yZMCF6v1MwozyIfi5QArupQJCxfHbFo5AkmCNeoEzyT4l zveQrSRQKK4sDxkcWGbLAd9MXoPVQimpqH8UfOXIxM6YNRzKQ9n7kltJcQ7AMohOlg6E 9oRQrJqiUDvgvvm+SsxwAO6HxxIPvqdNMi67IPmbUvLNgCo9Q3qCiF+eD2P92Mpo3v06 ymyEijwMvvzA77scmBdrMef1p43UZfWjwvFCa0cAoYiYs2lAk+rmWniK3jXM1ExnDeAs 3/Ji6XTKqWCm34WWbreltDdclU7a5ctTXRO8GyDifjezZQydzhB8UMDNKhihnFfDbFp/ JrcQ== X-Gm-Message-State: AOPr4FVTOk5VEpjcJHNfRGltPnxeG0FrXGgSeqgf1aySU2lSHdpKZmZ7QLmegHEs64V57aKM X-Received: by 10.28.157.142 with SMTP id g136mr2995454wme.29.1460453667887; Tue, 12 Apr 2016 02:34:27 -0700 (PDT) Received: from localhost.localdomain (host-92-17-247-99.as13285.net. [92.17.247.99]) by smtp.gmail.com with ESMTPSA id gt7sm32431907wjc.1.2016.04.12.02.34.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 Apr 2016 02:34:27 -0700 (PDT) From: Srinivas Kandagatla To: Andy Gross , linux-arm-msm@vger.kernel.org Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-soc@vger.kernel.org, srinivas.kandagatla@linaro.org Subject: [PATCH v2 01/13] ARM: dts: apq8064: fix the pinctrls for i2c and spi Date: Tue, 12 Apr 2016 10:33:50 +0100 Message-Id: <1460453642-5809-2-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1460453642-5809-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1460453642-5809-1-git-send-email-srinivas.kandagatla@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This patch fixes pinctrls for spi and i2c nodes whose default and sleep states are together, which is incorrect. Without this patch i2c/spi would not be functional. Signed-off-by: Srinivas Kandagatla Acked-by: Bjorn Andersson --- arch/arm/boot/dts/qcom-apq8064.dtsi | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi index 65d0e8d..c6ff8fc 100644 --- a/arch/arm/boot/dts/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi @@ -227,7 +227,8 @@ gsbi1_i2c: i2c@12460000 { compatible = "qcom,i2c-qup-v1.1.1"; - pinctrl-0 = <&i2c1_pins &i2c1_pins_sleep>; + pinctrl-0 = <&i2c1_pins>; + pinctrl-1 = <&i2c1_pins_sleep>; pinctrl-names = "default", "sleep"; reg = <0x12460000 0x1000>; interrupts = <0 194 IRQ_TYPE_NONE>; @@ -255,7 +256,8 @@ gsbi2_i2c: i2c@124a0000 { compatible = "qcom,i2c-qup-v1.1.1"; reg = <0x124a0000 0x1000>; - pinctrl-0 = <&i2c2_pins &i2c2_pins_sleep>; + pinctrl-0 = <&i2c2_pins>; + pinctrl-1 = <&i2c2_pins_sleep>; pinctrl-names = "default", "sleep"; interrupts = <0 196 IRQ_TYPE_NONE>; clocks = <&gcc GSBI2_QUP_CLK>, <&gcc GSBI2_H_CLK>; @@ -277,7 +279,8 @@ ranges; gsbi3_i2c: i2c@16280000 { compatible = "qcom,i2c-qup-v1.1.1"; - pinctrl-0 = <&i2c3_pins &i2c3_pins_sleep>; + pinctrl-0 = <&i2c3_pins>; + pinctrl-1 = <&i2c3_pins_sleep>; pinctrl-names = "default", "sleep"; reg = <0x16280000 0x1000>; interrupts = ; @@ -302,7 +305,8 @@ gsbi4_i2c: i2c@16380000 { compatible = "qcom,i2c-qup-v1.1.1"; - pinctrl-0 = <&i2c4_pins &i2c4_pins_sleep>; + pinctrl-0 = <&i2c4_pins>; + pinctrl-1 = <&i2c4_pins_sleep>; pinctrl-names = "default", "sleep"; reg = <0x16380000 0x1000>; interrupts = ; @@ -337,7 +341,8 @@ compatible = "qcom,spi-qup-v1.1.1"; reg = <0x1a280000 0x1000>; interrupts = <0 155 0>; - pinctrl-0 = <&spi5_default &spi5_sleep>; + pinctrl-0 = <&spi5_default>; + pinctrl-1 = <&spi5_sleep>; pinctrl-names = "default", "sleep"; clocks = <&gcc GSBI5_QUP_CLK>, <&gcc GSBI5_H_CLK>; clock-names = "core", "iface"; @@ -370,7 +375,8 @@ gsbi6_i2c: i2c@16580000 { compatible = "qcom,i2c-qup-v1.1.1"; - pinctrl-0 = <&i2c6_pins &i2c6_pins_sleep>; + pinctrl-0 = <&i2c6_pins>; + pinctrl-1 = <&i2c6_pins_sleep>; pinctrl-names = "default", "sleep"; reg = <0x16580000 0x1000>; interrupts = ;