mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Nishanth Menon <nm@ti.com>
To: "Tony Lindgren" <tony@atomide.com>,
	"Tero Kristo" <t-kristo@ti.com>, "Paul Walmsley" <paul@pwsan.com>,
	"Benoît Cousson" <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 2/6] ARM: dts: OMAP5: switch to compatible pinctrl
Date: Fri, 22 Aug 2014 09:03:51 -0500	[thread overview]
Message-ID: <1408716235-26164-3-git-send-email-nm@ti.com> (raw)
In-Reply-To: <1408716235-26164-1-git-send-email-nm@ti.com>

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 <nm@ti.com>
---
 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>;
 		};
-- 
1.7.9.5


  parent reply	other threads:[~2014-08-22 14:06 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-22 14:03 [PATCH 0/6] ARM: dts: OMAP5+: Fixes for pinctrl support Nishanth Menon
2014-08-22 14:03 ` [PATCH 1/6] ARM: dts: OMAP3+: Add PRM interrupt Nishanth Menon
2014-09-09  0:58   ` Tony Lindgren
2014-08-22 14:03 ` Nishanth Menon [this message]
2014-08-22 14:03 ` [PATCH 3/6] ARM: dts: DRA7: switch to compatible pinctrl Nishanth Menon
2014-08-22 14:03 ` [PATCH 4/6] ARM: dts: AM437x: " Nishanth Menon
2014-08-22 14:03 ` [PATCH 5/6] ARM: dts: OMAP5/DRA7: switch over to interrupts-extended property for UART Nishanth Menon
2014-08-22 14:03 ` [PATCH 6/6] ARM: dts: dra7-evm: Mark uart1 rxd as wakeup capable Nishanth Menon
2014-09-08 18:47   ` Nishanth Menon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1408716235-26164-3-git-send-email-nm@ti.com \
    --to=nm@ti.com \
    --cc=bcousson@baylibre.com \
    --cc=devicetree@vger.kernel.org \
    --cc=j-keerthy@ti.com \
    --cc=khilman@deeprootsystems.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=paul@pwsan.com \
    --cc=santosh.shilimkar@ti.com \
    --cc=t-kristo@ti.com \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome