From 834353ea867a84649d452bac03b97ce32dc6e318 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 11 Nov 2011 12:45:24 +0100 Subject: [PATCH 03/70] MIPS: lantiq: change ltq_request_gpio() call signature ltq_request_gpio() was using alt0/1 to multiplex the function of GPIO pins. This was XWAY specific. In order to also accomodate SoCs that require more bits we use a 32bit mask instead. This way the call signature is consistent between XWAY and FALC-ON. Signed-off-by: John Crispin Signed-off-by: Thomas Langer --- .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 4 +- arch/mips/lantiq/xway/gpio.c | 8 ++-- arch/mips/lantiq/xway/gpio_stp.c | 6 ++-- arch/mips/pci/pci-lantiq.c | 36 +++++++++---------- 4 files changed, 26 insertions(+), 28 deletions(-) diff --git a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h index 9b7ee366..87f6d24 100644 --- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h +++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h @@ -135,8 +135,8 @@ extern __iomem void *ltq_ebu_membase; extern __iomem void *ltq_cgu_membase; /* request a non-gpio and set the PIO config */ -extern int ltq_gpio_request(unsigned int pin, unsigned int alt0, - unsigned int alt1, unsigned int dir, const char *name); +extern int ltq_gpio_request(unsigned int pin, unsigned int mux, + unsigned int dir, const char *name); extern void ltq_pmu_enable(unsigned int module); extern void ltq_pmu_disable(unsigned int module); extern void ltq_cgu_enable(unsigned int clk); diff --git a/arch/mips/lantiq/xway/gpio.c b/arch/mips/lantiq/xway/gpio.c index d2fa98f..f204f6c 100644 --- a/arch/mips/lantiq/xway/gpio.c +++ b/arch/mips/lantiq/xway/gpio.c @@ -48,8 +48,8 @@ int irq_to_gpio(unsigned int gpio) } EXPORT_SYMBOL(irq_to_gpio); -int ltq_gpio_request(unsigned int pin, unsigned int alt0, - unsigned int alt1, unsigned int dir, const char *name) +int ltq_gpio_request(unsigned int pin, unsigned int mux, + unsigned int dir, const char *name) { int id = 0; @@ -67,13 +67,13 @@ int ltq_gpio_request(unsigned int pin, unsigned int alt0, pin -= PINS_PER_PORT; id++; } - if (alt0) + if (mux & 0x2) ltq_gpio_setbit(ltq_gpio_port[id].membase, LTQ_GPIO_ALTSEL0, pin); else ltq_gpio_clearbit(ltq_gpio_port[id].membase, LTQ_GPIO_ALTSEL0, pin); - if (alt1) + if (mux & 0x1) ltq_gpio_setbit(ltq_gpio_port[id].membase, LTQ_GPIO_ALTSEL1, pin); else diff --git a/arch/mips/lantiq/xway/gpio_stp.c b/arch/mips/lantiq/xway/gpio_stp.c index ff9991c..2c78660 100644 --- a/arch/mips/lantiq/xway/gpio_stp.c +++ b/arch/mips/lantiq/xway/gpio_stp.c @@ -79,9 +79,9 @@ static struct gpio_chip ltq_stp_chip = { static int ltq_stp_hw_init(void) { /* the 3 pins used to control the external stp */ - ltq_gpio_request(4, 1, 0, 1, "stp-st"); - ltq_gpio_request(5, 1, 0, 1, "stp-d"); - ltq_gpio_request(6, 1, 0, 1, "stp-sh"); + ltq_gpio_request(4, 2, 1, "stp-st"); + ltq_gpio_request(5, 2, 1, "stp-d"); + ltq_gpio_request(6, 2, 1, "stp-sh"); /* sane defaults */ ltq_stp_w32(0, LTQ_STP_AR); diff --git a/arch/mips/pci/pci-lantiq.c b/arch/mips/pci/pci-lantiq.c index be1e1af..c001c5a 100644 --- a/arch/mips/pci/pci-lantiq.c +++ b/arch/mips/pci/pci-lantiq.c @@ -70,28 +70,27 @@ struct ltq_pci_gpio_map { int pin; - int alt0; - int alt1; + int mux; int dir; char *name; }; /* the pci core can make use of the following gpios */ static struct ltq_pci_gpio_map ltq_pci_gpio_map[] = { - { 0, 1, 0, 0, "pci-exin0" }, - { 1, 1, 0, 0, "pci-exin1" }, - { 2, 1, 0, 0, "pci-exin2" }, - { 39, 1, 0, 0, "pci-exin3" }, - { 10, 1, 0, 0, "pci-exin4" }, - { 9, 1, 0, 0, "pci-exin5" }, - { 30, 1, 0, 1, "pci-gnt1" }, - { 23, 1, 0, 1, "pci-gnt2" }, - { 19, 1, 0, 1, "pci-gnt3" }, - { 38, 1, 0, 1, "pci-gnt4" }, - { 29, 1, 0, 0, "pci-req1" }, - { 31, 1, 0, 0, "pci-req2" }, - { 3, 1, 0, 0, "pci-req3" }, - { 37, 1, 0, 0, "pci-req4" }, + { 0, 2, 0, "pci-exin0" }, + { 1, 2, 0, "pci-exin1" }, + { 2, 2, 0, "pci-exin2" }, + { 39, 2, 0, "pci-exin3" }, + { 10, 2, 0, "pci-exin4" }, + { 9, 2, 0, "pci-exin5" }, + { 30, 2, 1, "pci-gnt1" }, + { 23, 2, 1, "pci-gnt2" }, + { 19, 2, 1, "pci-gnt3" }, + { 38, 2, 1, "pci-gnt4" }, + { 29, 2, 0, "pci-req1" }, + { 31, 2, 0, "pci-req2" }, + { 3, 2, 0, "pci-req3" }, + { 37, 2, 0, "pci-req4" }, }; __iomem void *ltq_pci_mapped_cfg; @@ -157,13 +156,12 @@ static void ltq_pci_setup_gpio(int gpio) for (i = 0; i < ARRAY_SIZE(ltq_pci_gpio_map); i++) { if (gpio & (1 << i)) { ltq_gpio_request(ltq_pci_gpio_map[i].pin, - ltq_pci_gpio_map[i].alt0, - ltq_pci_gpio_map[i].alt1, + ltq_pci_gpio_map[i].mux, ltq_pci_gpio_map[i].dir, ltq_pci_gpio_map[i].name); } } - ltq_gpio_request(21, 0, 0, 1, "pci-reset"); + ltq_gpio_request(21, 0, 1, "pci-reset"); ltq_pci_req_mask = (gpio >> PCI_REQ_SHIFT) & PCI_REQ_MASK; } -- 1.7.9.1