From patchwork Fri Aug 22 14:03:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 35849 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oi0-f70.google.com (mail-oi0-f70.google.com [209.85.218.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5D0ED2057E for ; Fri, 22 Aug 2014 14:06:37 +0000 (UTC) Received: by mail-oi0-f70.google.com with SMTP id u20sf54848249oif.1 for ; Fri, 22 Aug 2014 07:06:37 -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=W11NIFL7KashjToXJUfglHNPzK3dQF/kTsn34tJ97UU=; b=P3p2LH+oFJuS2WIzPaoKYitbodLC1TkTTaBtPaVk4jN0/lZoDdJHhJkIL9CS847kA+ awEa72uITXGWKJPwDtofIGMGra0fPtbDIuk+cAcu5t486rokid+sltpBEE+3n4ymq5/D XfE9eHDDJZ5B5FrXBpI/yNNm2JOpAiUSWb4Mhxb/Rks2fyi8Ej8QiL3I2nyjOeEzIbph tycaH1f+9aIEjFZW/J3p+nD/6c2Sa6kNIjKAm1z+nO277LT5sL46gcvOvqqsU1eh/Av7 qyGtf+81cQe5NbP85sVTI1YHovQ/SQYJHAm81uzDCyVQUSZnXGzKfbBuWTw8buCHax6A WQ3g== X-Gm-Message-State: ALoCoQkIAga6arXY2+9DV7p61IaxtaBFAr1GirW30wHHaVghuOnGEbXysPwyzZFL9V7KybfYwj+M X-Received: by 10.182.29.10 with SMTP id f10mr3324275obh.23.1408716396950; Fri, 22 Aug 2014 07:06:36 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.82.75 with SMTP id g69ls1152634qgd.53.gmail; Fri, 22 Aug 2014 07:06:36 -0700 (PDT) X-Received: by 10.52.170.69 with SMTP id ak5mr166406vdc.63.1408716396806; Fri, 22 Aug 2014 07:06:36 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id b11si13628704vdv.62.2014.08.22.07.06.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 22 Aug 2014 07:06:36 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id ij19so12430955vcb.11 for ; Fri, 22 Aug 2014 07:06:36 -0700 (PDT) X-Received: by 10.52.248.232 with SMTP id yp8mr5695vdc.83.1408716396710; Fri, 22 Aug 2014 07:06:36 -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 uj3csp19823vcb; Fri, 22 Aug 2014 07:06:36 -0700 (PDT) X-Received: by 10.68.69.8 with SMTP id a8mr4407665pbu.165.1408716395862; Fri, 22 Aug 2014 07:06:35 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id hl1si39145044pac.42.2014.08.22.07.06.35 for ; Fri, 22 Aug 2014 07:06:35 -0700 (PDT) Received-SPF: none (google.com: devicetree-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 S932617AbaHVOGd (ORCPT + 6 others); Fri, 22 Aug 2014 10:06:33 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:44121 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756532AbaHVOG0 (ORCPT ); Fri, 22 Aug 2014 10:06:26 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s7ME5wX1014974; Fri, 22 Aug 2014 09:05:58 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s7ME5wSX026196; Fri, 22 Aug 2014 09:05:58 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE72.ent.ti.com (128.247.5.109) 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 dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s7ME5wt3028808; Fri, 22 Aug 2014 09:05:58 -0500 From: Nishanth Menon To: Tony Lindgren , Tero Kristo , Paul Walmsley , =?UTF-8?q?Beno=C3=AEt=20Cousson?= CC: Kevin Hilman , , , , Keerthy , Santosh Shilimkar , , Nishanth Menon Subject: [PATCH 2/6] ARM: dts: OMAP5: switch to compatible pinctrl Date: Fri, 22 Aug 2014 09:03:51 -0500 Message-ID: <1408716235-26164-3-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: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@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.180 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: , List-Help: , List-Archive: List-Unsubscribe: , Now that ti,omap5-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 --- arch/arm/boot/dts/omap5.dtsi | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi index df0a09b..04acda6 100644 --- a/arch/arm/boot/dts/omap5.dtsi +++ b/arch/arm/boot/dts/omap5.dtsi @@ -188,18 +188,22 @@ }; omap5_pmx_core: pinmux@4a002840 { - compatible = "ti,omap4-padconf", "pinctrl-single"; + compatible = "ti,omap5-padconf", "pinctrl-single"; reg = <0x4a002840 0x01b6>; #address-cells = <1>; #size-cells = <0>; + #interrupt-cells = <1>; + interrupt-controller; pinctrl-single,register-width = <16>; pinctrl-single,function-mask = <0x7fff>; }; omap5_pmx_wkup: pinmux@4ae0c840 { - compatible = "ti,omap4-padconf", "pinctrl-single"; + compatible = "ti,omap5-padconf", "pinctrl-single"; reg = <0x4ae0c840 0x0038>; #address-cells = <1>; #size-cells = <0>; + #interrupt-cells = <1>; + interrupt-controller; pinctrl-single,register-width = <16>; pinctrl-single,function-mask = <0x7fff>; };