From patchwork Fri Mar 15 13:31:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 2277681 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 5382E3FC8A for ; Fri, 15 Mar 2013 13:32:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754742Ab3CONcH (ORCPT ); Fri, 15 Mar 2013 09:32:07 -0400 Received: from bhuna.collabora.co.uk ([93.93.135.160]:47850 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754349Ab3CONcG (ORCPT ); Fri, 15 Mar 2013 09:32:06 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: javier) with ESMTPSA id 8CAAA60435C From: Javier Martinez Canillas To: Grant Likely Cc: Rob Landley , Benoit Cousson , Stephen Warren , Jon Hunter , devicetree-discuss@lists.ozlabs.org, linux-omap , Javier Martinez Canillas Subject: [PATCH v3 1/1] gpio: omap: dts: Move interrupt-controller from #interrupt-cells description Date: Fri, 15 Mar 2013 14:31:57 +0100 Message-Id: <1363354317-14985-1-git-send-email-javier.martinez@collabora.co.uk> X-Mailer: git-send-email 1.7.7.6 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The binding documentation for the OMAP GPIO controller has the "#interrupt-cells" property listed before "#interrupt-controller" property but its description after. This is confusing so we move "#interrupt-cells" after the "interrupt-controller" property so is followed by its description. While being there, change the properties order to be consistent with Documentation/devicetree/bindings/interrupt-controller/interrupts.txt and Documentation/devicetree/bindings/gpio/gpio.txt. According with these docs, the order of the properties for a gpio-omap device node should be: gpio-controller; #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; Reported-by: Stephen Warren Signed-off-by: Javier Martinez Canillas Acked-by: Jon Hunter --- Changes since v1: - Change the properties order to be consistent with the rest of the DT bindings docs suggested by Jon Hunter. Changes since v2: - Fix changelog that explained the opposite of what the patch was doing as suggested by Benoit Cousson. .../devicetree/bindings/gpio/gpio-omap.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/gpio/gpio-omap.txt b/Documentation/devicetree/bindings/gpio/gpio-omap.txt index bff51a2..a56e3a5 100644 --- a/Documentation/devicetree/bindings/gpio/gpio-omap.txt +++ b/Documentation/devicetree/bindings/gpio/gpio-omap.txt @@ -5,12 +5,12 @@ Required properties: - "ti,omap2-gpio" for OMAP2 controllers - "ti,omap3-gpio" for OMAP3 controllers - "ti,omap4-gpio" for OMAP4 controllers +- gpio-controller : Marks the device node as a GPIO controller. - #gpio-cells : Should be two. - first cell is the pin number - second cell is used to specify optional parameters (unused) -- gpio-controller : Marks the device node as a GPIO controller. +- interrupt-controller: Mark the device node as an interrupt controller. - #interrupt-cells : Should be 2. -- interrupt-controller: Mark the device node as an interrupt controller The first cell is the GPIO number. The second cell is used to specify flags: bits[3:0] trigger type and level flags: @@ -29,8 +29,8 @@ Example: gpio4: gpio4 { compatible = "ti,omap4-gpio"; ti,hwmods = "gpio4"; - #gpio-cells = <2>; gpio-controller; - #interrupt-cells = <2>; + #gpio-cells = <2>; interrupt-controller; + #interrupt-cells = <2>; };