Skip to content

Commit

Permalink
ARM: Dove: Convert to DT GPIO and pinctrl
Browse files Browse the repository at this point in the history
Following the ongoing conversion of Orion SoCs to DT, make use of
gpio and pinctrl drivers through DT. The main dtsi for Dove is prepared
to allow board specific descriptors to make use of pinctrl muxing.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
  • Loading branch information
Sebastian Hesselbarth authored and Jason Cooper committed Nov 24, 2012
1 parent 63ace07 commit 9139acd
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
2 changes: 2 additions & 0 deletions arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,8 @@ config ARCH_DOVE
select CPU_V7
select GENERIC_CLOCKEVENTS
select MIGHT_HAVE_PCI
select PINCTRL
select PINCTRL_DOVE
select PLAT_ORION_LEGACY
select USB_ARCH_HAS_EHCI
help
Expand Down
19 changes: 16 additions & 3 deletions arch/arm/boot/dts/dove.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
compatible = "marvell,dove";
model = "Marvell Armada 88AP510 SoC";

aliases {
gpio0 = &gpio0;
gpio1 = &gpio1;
gpio2 = &gpio2;
};

soc@f1000000 {
compatible = "simple-bus";
#address-cells = <1>;
Expand Down Expand Up @@ -72,7 +78,8 @@
#gpio-cells = <2>;
gpio-controller;
reg = <0xd0400 0x20>;
ngpio = <32>;
ngpios = <32>;
interrupt-controller;
interrupts = <12>, <13>, <14>, <60>;
};

Expand All @@ -81,7 +88,8 @@
#gpio-cells = <2>;
gpio-controller;
reg = <0xd0420 0x20>;
ngpio = <32>;
ngpios = <32>;
interrupt-controller;
interrupts = <61>;
};

Expand All @@ -90,7 +98,12 @@
#gpio-cells = <2>;
gpio-controller;
reg = <0xe8400 0x0c>;
ngpio = <8>;
ngpios = <8>;
};

pinctrl: pinctrl@d0200 {
compatible = "marvell,dove-pinctrl";
reg = <0xd0200 0x10>;
};

spi0: spi@10600 {
Expand Down

0 comments on commit 9139acd

Please sign in to comment.