From b7109864f13983f2531fb5d498940332b128099a Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Fri, 11 May 2012 18:48:39 +0200
Subject: [PATCH] --- yaml --- r: 309086 b: refs/heads/master c:
 5238f7bc356670ba702057c7de7f07909133f788 h: refs/heads/master v: v3

---
 [refs]                                         |  2 +-
 trunk/arch/mips/lantiq/xway/Makefile           |  2 +-
 trunk/drivers/gpio/Kconfig                     | 18 ++++++++++++++++++
 trunk/drivers/gpio/Makefile                    |  2 ++
 .../gpio/gpio-mm-lantiq.c}                     |  0
 .../gpio/gpio-stp-xway.c}                      |  0
 6 files changed, 22 insertions(+), 2 deletions(-)
 rename trunk/{arch/mips/lantiq/xway/gpio_ebu.c => drivers/gpio/gpio-mm-lantiq.c} (100%)
 rename trunk/{arch/mips/lantiq/xway/gpio_stp.c => drivers/gpio/gpio-stp-xway.c} (100%)

diff --git a/[refs] b/[refs]
index a821df59aa48..26581969b281 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57c8cb8f242988b8048a7058cd1edde025c6f232
+refs/heads/master: 5238f7bc356670ba702057c7de7f07909133f788
diff --git a/trunk/arch/mips/lantiq/xway/Makefile b/trunk/arch/mips/lantiq/xway/Makefile
index edef6c582fce..dc3194f6ee42 100644
--- a/trunk/arch/mips/lantiq/xway/Makefile
+++ b/trunk/arch/mips/lantiq/xway/Makefile
@@ -1 +1 @@
-obj-y := prom.o sysctrl.o clk.o reset.o gpio.o gpio_stp.o gpio_ebu.o dma.o
+obj-y := prom.o sysctrl.o clk.o reset.o gpio.o dma.o
diff --git a/trunk/drivers/gpio/Kconfig b/trunk/drivers/gpio/Kconfig
index e03653d69357..8fae07935cd1 100644
--- a/trunk/drivers/gpio/Kconfig
+++ b/trunk/drivers/gpio/Kconfig
@@ -96,6 +96,14 @@ config GPIO_EP93XX
 	depends on ARCH_EP93XX
 	select GPIO_GENERIC
 
+config GPIO_MM_LANTIQ
+	bool "Lantiq Memory mapped GPIOs"
+	depends on LANTIQ && SOC_XWAY
+	help
+	  This enables support for memory mapped GPIOs on the External Bus Unit
+	  (EBU) found on Lantiq SoCs. The gpios are output only as they are
+	  created by attaching a 16bit latch to the bus.
+
 config GPIO_MPC5200
 	def_bool y
 	depends on PPC_MPC52xx
@@ -306,6 +314,16 @@ config GPIO_STMPE
 	  This enables support for the GPIOs found on the STMPE I/O
 	  Expanders.
 
+config GPIO_STP_XWAY
+	bool "XWAY STP GPIOs"
+	depends on SOC_XWAY
+	help
+	  This enables support for the Serial To Parallel (STP) unit found on
+	  XWAY SoC. The STP allows the SoC to drive a shift registers cascade,
+	  that can be up to 24 bit. This peripheral is aimed at driving leds.
+	  Some of the gpios/leds can be auto updated by the soc with dsl and
+	  phy status.
+
 config GPIO_TC3589X
 	bool "TC3589X GPIOs"
 	depends on MFD_TC3589X
diff --git a/trunk/drivers/gpio/Makefile b/trunk/drivers/gpio/Makefile
index 007f54bd0081..ed1c96db404b 100644
--- a/trunk/drivers/gpio/Makefile
+++ b/trunk/drivers/gpio/Makefile
@@ -30,6 +30,7 @@ obj-$(CONFIG_GPIO_MC33880)	+= gpio-mc33880.o
 obj-$(CONFIG_GPIO_MC9S08DZ60)	+= gpio-mc9s08dz60.o
 obj-$(CONFIG_GPIO_MCP23S08)	+= gpio-mcp23s08.o
 obj-$(CONFIG_GPIO_ML_IOH)	+= gpio-ml-ioh.o
+obj-$(CONFIG_GPIO_MM_LANTIQ)	+= gpio-mm-lantiq.o
 obj-$(CONFIG_GPIO_MPC5200)	+= gpio-mpc5200.o
 obj-$(CONFIG_GPIO_MPC8XXX)	+= gpio-mpc8xxx.o
 obj-$(CONFIG_GPIO_MSM_V1)	+= gpio-msm-v1.o
@@ -49,6 +50,7 @@ obj-$(CONFIG_ARCH_SA1100)	+= gpio-sa1100.o
 obj-$(CONFIG_GPIO_SCH)		+= gpio-sch.o
 obj-$(CONFIG_GPIO_SODAVILLE)	+= gpio-sodaville.o
 obj-$(CONFIG_GPIO_STMPE)	+= gpio-stmpe.o
+obj-$(CONFIG_GPIO_STP_XWAY)	+= gpio-stp-xway.o
 obj-$(CONFIG_GPIO_SX150X)	+= gpio-sx150x.o
 obj-$(CONFIG_GPIO_TC3589X)	+= gpio-tc3589x.o
 obj-$(CONFIG_ARCH_TEGRA)	+= gpio-tegra.o
diff --git a/trunk/arch/mips/lantiq/xway/gpio_ebu.c b/trunk/drivers/gpio/gpio-mm-lantiq.c
similarity index 100%
rename from trunk/arch/mips/lantiq/xway/gpio_ebu.c
rename to trunk/drivers/gpio/gpio-mm-lantiq.c
diff --git a/trunk/arch/mips/lantiq/xway/gpio_stp.c b/trunk/drivers/gpio/gpio-stp-xway.c
similarity index 100%
rename from trunk/arch/mips/lantiq/xway/gpio_stp.c
rename to trunk/drivers/gpio/gpio-stp-xway.c