From c915bedf221ad4f017710865fc963b1e0dda1390 Mon Sep 17 00:00:00 2001 From: Barry Song Date: Sun, 4 Sep 2011 22:15:17 -0700 Subject: [PATCH] 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 Signed-off-by: Barry Song --- arch/arm/boot/dts/prima2-cb.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/prima2-cb.dts b/arch/arm/boot/dts/prima2-cb.dts index a0a423d..af86931 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; -- 2.7.4