aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts
diff options
context:
space:
mode:
authorBarry Song <Baohua.Song@csr.com>2011-09-05 01:15:17 -0400
committerBarry Song <21cnbao@gmail.com>2011-09-10 21:14:15 -0400
commitc915bedf221ad4f017710865fc963b1e0dda1390 (patch)
tree4212de1ef80147e09499f595bfdda979e6e3b9df /arch/arm/boot/dts
parent073adf4fa7f91a91f64a88af278a5d2b075c1e83 (diff)
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>
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r--arch/arm/boot/dts/prima2-cb.dts2
1 files changed, 1 insertions, 1 deletions
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 @@
279 gpio: gpio-controller@b0120000 { 279 gpio: gpio-controller@b0120000 {
280 #gpio-cells = <2>; 280 #gpio-cells = <2>;
281 #interrupt-cells = <2>; 281 #interrupt-cells = <2>;
282 compatible = "sirf,prima2-gpio"; 282 compatible = "sirf,prima2-gpio-pinmux";
283 reg = <0xb0120000 0x10000>; 283 reg = <0xb0120000 0x10000>;
284 gpio-controller; 284 gpio-controller;
285 interrupt-controller; 285 interrupt-controller;