Skip to content

Commit

Permalink
OF: pinctrl: MIPS: lantiq: implement lantiq/xway pinctrl support
Browse files Browse the repository at this point in the history
Implement support for pinctrl on lantiq/xway socs. The IO core found on these
socs has the registers for pinctrl, pinconf and gpio mixed up in the same
register range. As the gpio_chip handling is only a few lines, the driver also
implements the gpio functionality. This obseletes the old gpio driver that was
located in the arch/ folder.

Signed-off-by: John Crispin <blogic@openwrt.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Cc: devicetree-discuss@lists.ozlabs.org
Cc: linux-kernel@vger.kernel.org
  • Loading branch information
John Crispin committed Sep 13, 2012
1 parent 30404ae commit 3f8c50c
Show file tree
Hide file tree
Showing 9 changed files with 1,334 additions and 184 deletions.
2 changes: 2 additions & 0 deletions arch/mips/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,8 @@ config LANTIQ
select HAVE_MACH_CLKDEV
select CLKDEV_LOOKUP
select USE_OF
select PINCTRL
select PINCTRL_LANTIQ

config LASAT
bool "LASAT Networks platforms"
Expand Down
1 change: 1 addition & 0 deletions arch/mips/lantiq/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ if LANTIQ

config SOC_TYPE_XWAY
bool
select PINCTRL_XWAY
default n

choice
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/lantiq/xway/Makefile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
obj-y := prom.o sysctrl.o clk.o reset.o gpio.o dma.o gptu.o
obj-y := prom.o sysctrl.o clk.o reset.o dma.o gptu.o
183 changes: 0 additions & 183 deletions arch/mips/lantiq/xway/gpio.c

This file was deleted.

11 changes: 11 additions & 0 deletions drivers/pinctrl/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ config PINCTRL_IMX6Q
help
Say Y here to enable the imx6q pinctrl driver

config PINCTRL_LANTIQ
bool
depends on LANTIQ
select PINMUX
select PINCONF

config PINCTRL_PXA3xx
bool
select PINMUX
Expand Down Expand Up @@ -147,6 +153,11 @@ config PINCTRL_COH901

source "drivers/pinctrl/spear/Kconfig"

config PINCTRL_XWAY
bool
depends on SOC_TYPE_XWAY
depends on PINCTRL_LANTIQ

endmenu

endif
2 changes: 2 additions & 0 deletions drivers/pinctrl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,7 @@ obj-$(CONFIG_PINCTRL_TEGRA20) += pinctrl-tegra20.o
obj-$(CONFIG_PINCTRL_TEGRA30) += pinctrl-tegra30.o
obj-$(CONFIG_PINCTRL_U300) += pinctrl-u300.o
obj-$(CONFIG_PINCTRL_COH901) += pinctrl-coh901.o
obj-$(CONFIG_PINCTRL_XWAY) += pinctrl-xway.o
obj-$(CONFIG_PINCTRL_LANTIQ) += pinctrl-lantiq.o

obj-$(CONFIG_PLAT_SPEAR) += spear/
Loading

0 comments on commit 3f8c50c

Please sign in to comment.