Message ID | 1408716235-26164-4-git-send-email-nm@ti.com |
---|---|
State | Accepted |
Commit | 817c0378c50c2aab2b026caab7486df6895ed8a2 |
Headers | show
Return-Path: <patchwork-forward+bncBCO3XAUMTIFRBFM63WPQKGQEKBUHQNA@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oi0-f71.google.com (mail-oi0-f71.google.com [209.85.218.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B8CFE2057E for <linaro@patches.linaro.org>; Fri, 22 Aug 2014 14:09:25 +0000 (UTC) Received: by mail-oi0-f71.google.com with SMTP id e131sf54896336oig.2 for <linaro@patches.linaro.org>; Fri, 22 Aug 2014 07:09:25 -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:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=GwM2dZefe4I6JbcW3nupAHrUtGKyFuT5KHevohsXquw=; b=dTUIk/c/LxGV3+5g8WgesxXFznrMdDZcX64PGOPCQfQe3zZPrDJEk2Cwvsuex+W2TP +XcsfGu+V3L3cX/C5Ih3X+aBNBy+k4t6afIffJDA+RtVGadU9BFS2G6v2LlzH5kcNo6t JO/owiEKFii7Qsyw41DPZ7yKD/W4U2FBVUug+kaacTfv69/H9sA3KWzNR3/ReHuHDlrl XAmOsAotnmUITRXo51nMRJL4H1VDISW+Ty3w9Y1lDZ1vK6APDaXYHWX1Kc0RaX0kX1zD 6uxnP4ensZwsepIACXxhXegs1Cp6Z9yfECP+njlCGaomoZlThfBIuy7K3OV2FJi0YFYD RBEg== X-Gm-Message-State: ALoCoQlwPTVbE+NKHUvRHLkGL8cHjk0XrnoKwvP2MdB6ZTdG2CuuAKTG0CW2jTHQYjRLPMlmwnAl X-Received: by 10.182.125.68 with SMTP id mo4mr1287280obb.49.1408716565379; Fri, 22 Aug 2014 07:09:25 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.109.246 with SMTP id l109ls1247724qgf.1.gmail; Fri, 22 Aug 2014 07:09:25 -0700 (PDT) X-Received: by 10.221.68.135 with SMTP id xy7mr34138vcb.65.1408716565138; Fri, 22 Aug 2014 07:09:25 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id px7si13640566vdb.47.2014.08.22.07.09.25 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 22 Aug 2014 07:09:25 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id lf12so12467345vcb.12 for <patchwork-forward@linaro.org>; Fri, 22 Aug 2014 07:09:25 -0700 (PDT) X-Received: by 10.52.3.40 with SMTP id 8mr3535396vdz.24.1408716565042; Fri, 22 Aug 2014 07:09:25 -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.221.45.67 with SMTP id uj3csp20043vcb; Fri, 22 Aug 2014 07:09:24 -0700 (PDT) X-Received: by 10.70.45.74 with SMTP id k10mr6898903pdm.78.1408716564188; Fri, 22 Aug 2014 07:09:24 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x14si41059163pas.25.2014.08.22.07.09.23 for <multiple recipients>; Fri, 22 Aug 2014 07:09:24 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932616AbaHVOGc (ORCPT <rfc822;yazen.ghannam@linaro.org> + 21 others); Fri, 22 Aug 2014 10:06:32 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:58902 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756538AbaHVOG1 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 22 Aug 2014 10:06:27 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s7ME5woG014957; Fri, 22 Aug 2014 09:05:58 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s7ME5wY4026191; Fri, 22 Aug 2014 09:05:58 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Fri, 22 Aug 2014 09:05:58 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s7ME5wla021139; Fri, 22 Aug 2014 09:05:58 -0500 From: Nishanth Menon <nm@ti.com> To: Tony Lindgren <tony@atomide.com>, Tero Kristo <t-kristo@ti.com>, Paul Walmsley <paul@pwsan.com>, =?UTF-8?q?Beno=C3=AEt=20Cousson?= <bcousson@baylibre.com> CC: Kevin Hilman <khilman@deeprootsystems.com>, <linux-arm-kernel@lists.infradead.org>, <linux-omap@vger.kernel.org>, <linux-kernel@vger.kernel.org>, Keerthy <j-keerthy@ti.com>, Santosh Shilimkar <santosh.shilimkar@ti.com>, <devicetree@vger.kernel.org>, Nishanth Menon <nm@ti.com> Subject: [PATCH 3/6] ARM: dts: DRA7: switch to compatible pinctrl Date: Fri, 22 Aug 2014 09:03:52 -0500 Message-ID: <1408716235-26164-4-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1408716235-26164-1-git-send-email-nm@ti.com> References: <1408716235-26164-1-git-send-email-nm@ti.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: <patchwork-forward.linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: nm@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 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 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> Content-Type: text/plain |
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi index 7a3e011..4e4ce96 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi @@ -218,10 +218,12 @@ }; dra7_pmx_core: pinmux@4a003400 { - compatible = "pinctrl-single"; + compatible = "ti,dra7-padconf", "pinctrl-single"; reg = <0x4a003400 0x0464>; #address-cells = <1>; #size-cells = <0>; + #interrupt-cells = <1>; + interrupt-controller; pinctrl-single,register-width = <32>; pinctrl-single,function-mask = <0x3fffffff>; };
Now that ti,dra7-padconf is available, switch over to that compatible property. Retain pinctrl-single for legacy support. While at it, mark pinctrl as interrupt controller so that it can be used with interrupts-extended property for wakeup events. Signed-off-by: Nishanth Menon <nm@ti.com> --- arch/arm/boot/dts/dra7.dtsi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)