diff options
| author | Barry Song <Baohua.Song@csr.com> | 2011-09-04 22:15:17 -0700 |
|---|---|---|
| committer | Barry Song <21cnbao@gmail.com> | 2011-09-11 09:14:15 +0800 |
| commit | c915bedf221ad4f017710865fc963b1e0dda1390 (patch) | |
| tree | 4212de1ef80147e09499f595bfdda979e6e3b9df /arch/arm/boot | |
| parent | 073adf4fa7f91a91f64a88af278a5d2b075c1e83 (diff) | |
| download | talos-obmc-linux-c915bedf221ad4f017710865fc963b1e0dda1390.tar.gz talos-obmc-linux-c915bedf221ad4f017710865fc963b1e0dda1390.zip | |
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')
| -rw-r--r-- | arch/arm/boot/dts/prima2-cb.dts | 2 |
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 @@ 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; |
