From: Barry Song <Baohua.Song@csr.com>
Date: Mon, 5 Sep 2011 05:15:17 +0000 (-0700)
Subject: ARM: CSR: extend the compatibility of gpio controller to pinmux in dts
X-Git-Tag: v3.2-rc1~39^2~6
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=c915bedf221ad4f017710865fc963b1e0dda1390;p=linux-2.6-block.git

ARM: CSR: extend the compatibility of gpio controller to pinmux in dts

gpio controller handles the switch of gpio and pinmux. And drivers/pinctrl/pinmux-sirf.c
will contain both gpio and pinmux.

Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
---

diff --git a/arch/arm/boot/dts/prima2-cb.dts b/arch/arm/boot/dts/prima2-cb.dts
index a0a423d1d573..af86931bdcc6 100644
--- a/arch/arm/boot/dts/prima2-cb.dts
+++ b/arch/arm/boot/dts/prima2-cb.dts
@@ -279,7 +279,7 @@
 			gpio: gpio-controller@b0120000 {
 				#gpio-cells = <2>;
 				#interrupt-cells = <2>;
-				compatible = "sirf,prima2-gpio";
+				compatible = "sirf,prima2-gpio-pinmux";
 				reg = <0xb0120000 0x10000>;
 				gpio-controller;
 				interrupt-controller;