From patchwork Sat Jun 4 22:29:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Likely X-Patchwork-Id: 1743 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:55:15 -0000 Delivered-To: patches@linaro.org Received: by 10.52.181.10 with SMTP id ds10cs77035vdc; Sat, 4 Jun 2011 15:29:52 -0700 (PDT) Received: by 10.42.137.130 with SMTP id y2mr5932613ict.370.1307226591333; Sat, 04 Jun 2011 15:29:51 -0700 (PDT) Received: from mail-px0-f172.google.com (mail-px0-f172.google.com [209.85.212.172]) by mx.google.com with ESMTPS id i6si19068146icv.68.2011.06.04.15.29.49 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 04 Jun 2011 15:29:50 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of glikely@secretlab.ca) client-ip=209.85.212.172; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of glikely@secretlab.ca) smtp.mail=glikely@secretlab.ca Received: by pxi6 with SMTP id 6so1800328pxi.17 for ; Sat, 04 Jun 2011 15:29:49 -0700 (PDT) Received: by 10.142.151.41 with SMTP id y41mr518307wfd.94.1307226588897; Sat, 04 Jun 2011 15:29:48 -0700 (PDT) Received: from localhost (S01060002b3d79728.cg.shawcable.net [70.72.87.49]) by mx.google.com with ESMTPS id c3sm2505847pbk.29.2011.06.04.15.29.47 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 04 Jun 2011 15:29:47 -0700 (PDT) Sender: Grant Likely Received: by localhost (Postfix, from userid 1000) id 4F93E180B92; Sat, 4 Jun 2011 16:29:46 -0600 (MDT) Date: Sat, 4 Jun 2011 16:29:46 -0600 From: Grant Likely To: Shawn Guo Cc: linux-kernel@vger.kernel.org, arnd@arndb.de, kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org, patches@linaro.org Subject: Re: [PATCH v3 1/3] gpio: gpio-mxs: copy mach-mxs/gpio.c into drivers/gpio Message-ID: <20110604222946.GA31236@ponder.secretlab.ca> References: <1307184940-16291-1-git-send-email-shawn.guo@linaro.org> <1307184940-16291-2-git-send-email-shawn.guo@linaro.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1307184940-16291-2-git-send-email-shawn.guo@linaro.org> User-Agent: Mutt/1.5.21 (2010-09-15) On Sat, Jun 04, 2011 at 06:55:38PM +0800, Shawn Guo wrote: > As the first patch of the series that moves mach-mxc gpio driver into > drivers/gpio, it copies arch/arm/mach-mxs/gpio.c into > drivers/gpio/gpio-mxs.c. The later patches will make necessary > changes to the driver, migrate the existing users to it, and lastly > deletes mach-mxs gpio driver. > > Signed-off-by: Shawn Guo > --- > drivers/gpio/gpio-mxs.c | 331 +++++++++++++++++++++++++++++++++++++++++++++++ [sigh] I fear we are having a communication breakdown. Since your /moving/ a file, you need to make it easy for readers to understand what has changed and why. That means using 1 patch to move the file with only the changes absolutely necessary to ensure bisectability, and then followup patches for the clean up. Adding a new copy in one patch, and then removing the old copy in the other patch does not make it easy for a reader to understand what changed. Below is what you're first patch should look like (using the -M flag to show the actual changes which are only #include differences). I've build tested this patch and have it sitting in the gpio/next branch of git://git.secretlab.ca/git/linux-2.6 at the moment if you want to build the rest of your series on top of it. g. --- commit e084f5b06ca7f3d94d9d042d288a3311398e5c49 Author: Grant Likely Date: Sat Jun 4 16:18:59 2011 -0600 gpio/mxs: Move Freescale mxs gpio driver to drivers/gpio GPIO drivers are getting moved to drivers/gpio for cleanup and consolidation. This patch moves the mxs driver. Follow up patches will clean it up and make it a fine upstanding example of a gpio driver. Signed-off-by: Grant Likely arch/arm/mach-mxs/Makefile | 2 +- .../mach-mxs/{gpio.h => include/mach/gpio-mxs.h} | 0 arch/arm/mach-mxs/mach-mx28evk.c | 2 +- drivers/gpio/Kconfig | 4 ++++ drivers/gpio/Makefile | 1 + .../arm/mach-mxs/gpio.c => drivers/gpio/gpio-mxs.c | 3 +-- 6 files changed, 8 insertions(+), 4 deletions(-) > 1 files changed, 331 insertions(+), 0 deletions(-) > create mode 100644 drivers/gpio/gpio-mxs.c > > diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c > new file mode 100644 > index 0000000..2c950fe > --- /dev/null > +++ b/drivers/gpio/gpio-mxs.c > @@ -0,0 +1,331 @@ > +/* > + * MXC GPIO support. (c) 2008 Daniel Mack > + * Copyright 2008 Juergen Beisert, kernel@pengutronix.de > + * > + * Based on code from Freescale, > + * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved. > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License > + * as published by the Free Software Foundation; either version 2 > + * of the License, or (at your option) any later version. > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, > + * MA 02110-1301, USA. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "gpio.h" > + > +static struct mxs_gpio_port *mxs_gpio_ports; > +static int gpio_table_size; > + > +#define PINCTRL_DOUT(n) ((cpu_is_mx23() ? 0x0500 : 0x0700) + (n) * 0x10) > +#define PINCTRL_DIN(n) ((cpu_is_mx23() ? 0x0600 : 0x0900) + (n) * 0x10) > +#define PINCTRL_DOE(n) ((cpu_is_mx23() ? 0x0700 : 0x0b00) + (n) * 0x10) > +#define PINCTRL_PIN2IRQ(n) ((cpu_is_mx23() ? 0x0800 : 0x1000) + (n) * 0x10) > +#define PINCTRL_IRQEN(n) ((cpu_is_mx23() ? 0x0900 : 0x1100) + (n) * 0x10) > +#define PINCTRL_IRQLEV(n) ((cpu_is_mx23() ? 0x0a00 : 0x1200) + (n) * 0x10) > +#define PINCTRL_IRQPOL(n) ((cpu_is_mx23() ? 0x0b00 : 0x1300) + (n) * 0x10) > +#define PINCTRL_IRQSTAT(n) ((cpu_is_mx23() ? 0x0c00 : 0x1400) + (n) * 0x10) > + > +#define GPIO_INT_FALL_EDGE 0x0 > +#define GPIO_INT_LOW_LEV 0x1 > +#define GPIO_INT_RISE_EDGE 0x2 > +#define GPIO_INT_HIGH_LEV 0x3 > +#define GPIO_INT_LEV_MASK (1 << 0) > +#define GPIO_INT_POL_MASK (1 << 1) > + > +/* Note: This driver assumes 32 GPIOs are handled in one register */ > + > +static void clear_gpio_irqstatus(struct mxs_gpio_port *port, u32 index) > +{ > + __mxs_clrl(1 << index, port->base + PINCTRL_IRQSTAT(port->id)); > +} > + > +static void set_gpio_irqenable(struct mxs_gpio_port *port, u32 index, > + int enable) > +{ > + if (enable) { > + __mxs_setl(1 << index, port->base + PINCTRL_IRQEN(port->id)); > + __mxs_setl(1 << index, port->base + PINCTRL_PIN2IRQ(port->id)); > + } else { > + __mxs_clrl(1 << index, port->base + PINCTRL_IRQEN(port->id)); > + } > +} > + > +static void mxs_gpio_ack_irq(struct irq_data *d) > +{ > + u32 gpio = irq_to_gpio(d->irq); > + clear_gpio_irqstatus(&mxs_gpio_ports[gpio / 32], gpio & 0x1f); > +} > + > +static void mxs_gpio_mask_irq(struct irq_data *d) > +{ > + u32 gpio = irq_to_gpio(d->irq); > + set_gpio_irqenable(&mxs_gpio_ports[gpio / 32], gpio & 0x1f, 0); > +} > + > +static void mxs_gpio_unmask_irq(struct irq_data *d) > +{ > + u32 gpio = irq_to_gpio(d->irq); > + set_gpio_irqenable(&mxs_gpio_ports[gpio / 32], gpio & 0x1f, 1); > +} > + > +static int mxs_gpio_get(struct gpio_chip *chip, unsigned offset); > + > +static int mxs_gpio_set_irq_type(struct irq_data *d, unsigned int type) > +{ > + u32 gpio = irq_to_gpio(d->irq); > + u32 pin_mask = 1 << (gpio & 31); > + struct mxs_gpio_port *port = &mxs_gpio_ports[gpio / 32]; > + void __iomem *pin_addr; > + int edge; > + > + switch (type) { > + case IRQ_TYPE_EDGE_RISING: > + edge = GPIO_INT_RISE_EDGE; > + break; > + case IRQ_TYPE_EDGE_FALLING: > + edge = GPIO_INT_FALL_EDGE; > + break; > + case IRQ_TYPE_LEVEL_LOW: > + edge = GPIO_INT_LOW_LEV; > + break; > + case IRQ_TYPE_LEVEL_HIGH: > + edge = GPIO_INT_HIGH_LEV; > + break; > + default: > + return -EINVAL; > + } > + > + /* set level or edge */ > + pin_addr = port->base + PINCTRL_IRQLEV(port->id); > + if (edge & GPIO_INT_LEV_MASK) > + __mxs_setl(pin_mask, pin_addr); > + else > + __mxs_clrl(pin_mask, pin_addr); > + > + /* set polarity */ > + pin_addr = port->base + PINCTRL_IRQPOL(port->id); > + if (edge & GPIO_INT_POL_MASK) > + __mxs_setl(pin_mask, pin_addr); > + else > + __mxs_clrl(pin_mask, pin_addr); > + > + clear_gpio_irqstatus(port, gpio & 0x1f); > + > + return 0; > +} > + > +/* MXS has one interrupt *per* gpio port */ > +static void mxs_gpio_irq_handler(u32 irq, struct irq_desc *desc) > +{ > + u32 irq_stat; > + struct mxs_gpio_port *port = (struct mxs_gpio_port *)irq_get_handler_data(irq); > + u32 gpio_irq_no_base = port->virtual_irq_start; > + > + desc->irq_data.chip->irq_ack(&desc->irq_data); > + > + irq_stat = __raw_readl(port->base + PINCTRL_IRQSTAT(port->id)) & > + __raw_readl(port->base + PINCTRL_IRQEN(port->id)); > + > + while (irq_stat != 0) { > + int irqoffset = fls(irq_stat) - 1; > + generic_handle_irq(gpio_irq_no_base + irqoffset); > + irq_stat &= ~(1 << irqoffset); > + } > +} > + > +/* > + * Set interrupt number "irq" in the GPIO as a wake-up source. > + * While system is running, all registered GPIO interrupts need to have > + * wake-up enabled. When system is suspended, only selected GPIO interrupts > + * need to have wake-up enabled. > + * @param irq interrupt source number > + * @param enable enable as wake-up if equal to non-zero > + * @return This function returns 0 on success. > + */ > +static int mxs_gpio_set_wake_irq(struct irq_data *d, unsigned int enable) > +{ > + u32 gpio = irq_to_gpio(d->irq); > + u32 gpio_idx = gpio & 0x1f; > + struct mxs_gpio_port *port = &mxs_gpio_ports[gpio / 32]; > + > + if (enable) { > + if (port->irq_high && (gpio_idx >= 16)) > + enable_irq_wake(port->irq_high); > + else > + enable_irq_wake(port->irq); > + } else { > + if (port->irq_high && (gpio_idx >= 16)) > + disable_irq_wake(port->irq_high); > + else > + disable_irq_wake(port->irq); > + } > + > + return 0; > +} > + > +static struct irq_chip gpio_irq_chip = { > + .name = "mxs gpio", > + .irq_ack = mxs_gpio_ack_irq, > + .irq_mask = mxs_gpio_mask_irq, > + .irq_unmask = mxs_gpio_unmask_irq, > + .irq_set_type = mxs_gpio_set_irq_type, > + .irq_set_wake = mxs_gpio_set_wake_irq, > +}; > + > +static void mxs_set_gpio_direction(struct gpio_chip *chip, unsigned offset, > + int dir) > +{ > + struct mxs_gpio_port *port = > + container_of(chip, struct mxs_gpio_port, chip); > + void __iomem *pin_addr = port->base + PINCTRL_DOE(port->id); > + > + if (dir) > + __mxs_setl(1 << offset, pin_addr); > + else > + __mxs_clrl(1 << offset, pin_addr); > +} > + > +static int mxs_gpio_get(struct gpio_chip *chip, unsigned offset) > +{ > + struct mxs_gpio_port *port = > + container_of(chip, struct mxs_gpio_port, chip); > + > + return (__raw_readl(port->base + PINCTRL_DIN(port->id)) >> offset) & 1; > +} > + > +static void mxs_gpio_set(struct gpio_chip *chip, unsigned offset, int value) > +{ > + struct mxs_gpio_port *port = > + container_of(chip, struct mxs_gpio_port, chip); > + void __iomem *pin_addr = port->base + PINCTRL_DOUT(port->id); > + > + if (value) > + __mxs_setl(1 << offset, pin_addr); > + else > + __mxs_clrl(1 << offset, pin_addr); > +} > + > +static int mxs_gpio_to_irq(struct gpio_chip *chip, unsigned offset) > +{ > + struct mxs_gpio_port *port = > + container_of(chip, struct mxs_gpio_port, chip); > + > + return port->virtual_irq_start + offset; > +} > + > +static int mxs_gpio_direction_input(struct gpio_chip *chip, unsigned offset) > +{ > + mxs_set_gpio_direction(chip, offset, 0); > + return 0; > +} > + > +static int mxs_gpio_direction_output(struct gpio_chip *chip, > + unsigned offset, int value) > +{ > + mxs_gpio_set(chip, offset, value); > + mxs_set_gpio_direction(chip, offset, 1); > + return 0; > +} > + > +int __init mxs_gpio_init(struct mxs_gpio_port *port, int cnt) > +{ > + int i, j; > + > + /* save for local usage */ > + mxs_gpio_ports = port; > + gpio_table_size = cnt; > + > + pr_info("MXS GPIO hardware\n"); > + > + for (i = 0; i < cnt; i++) { > + /* disable the interrupt and clear the status */ > + __raw_writel(0, port[i].base + PINCTRL_PIN2IRQ(i)); > + __raw_writel(0, port[i].base + PINCTRL_IRQEN(i)); > + > + /* clear address has to be used to clear IRQSTAT bits */ > + __mxs_clrl(~0U, port[i].base + PINCTRL_IRQSTAT(i)); > + > + for (j = port[i].virtual_irq_start; > + j < port[i].virtual_irq_start + 32; j++) { > + irq_set_chip_and_handler(j, &gpio_irq_chip, > + handle_level_irq); > + set_irq_flags(j, IRQF_VALID); > + } > + > + /* setup one handler for each entry */ > + irq_set_chained_handler(port[i].irq, mxs_gpio_irq_handler); > + irq_set_handler_data(port[i].irq, &port[i]); > + > + /* register gpio chip */ > + port[i].chip.direction_input = mxs_gpio_direction_input; > + port[i].chip.direction_output = mxs_gpio_direction_output; > + port[i].chip.get = mxs_gpio_get; > + port[i].chip.set = mxs_gpio_set; > + port[i].chip.to_irq = mxs_gpio_to_irq; > + port[i].chip.base = i * 32; > + port[i].chip.ngpio = 32; > + > + /* its a serious configuration bug when it fails */ > + BUG_ON(gpiochip_add(&port[i].chip) < 0); > + } > + > + return 0; > +} > + > +#define MX23_GPIO_BASE MX23_IO_ADDRESS(MX23_PINCTRL_BASE_ADDR) > +#define MX28_GPIO_BASE MX28_IO_ADDRESS(MX28_PINCTRL_BASE_ADDR) > + > +#define DEFINE_MXS_GPIO_PORT(_base, _irq, _id) \ > + { \ > + .chip.label = "gpio-" #_id, \ > + .id = _id, \ > + .irq = _irq, \ > + .base = _base, \ > + .virtual_irq_start = MXS_GPIO_IRQ_START + (_id) * 32, \ > + } > + > +#ifdef CONFIG_SOC_IMX23 > +static struct mxs_gpio_port mx23_gpio_ports[] = { > + DEFINE_MXS_GPIO_PORT(MX23_GPIO_BASE, MX23_INT_GPIO0, 0), > + DEFINE_MXS_GPIO_PORT(MX23_GPIO_BASE, MX23_INT_GPIO1, 1), > + DEFINE_MXS_GPIO_PORT(MX23_GPIO_BASE, MX23_INT_GPIO2, 2), > +}; > + > +int __init mx23_register_gpios(void) > +{ > + return mxs_gpio_init(mx23_gpio_ports, ARRAY_SIZE(mx23_gpio_ports)); > +} > +#endif > + > +#ifdef CONFIG_SOC_IMX28 > +static struct mxs_gpio_port mx28_gpio_ports[] = { > + DEFINE_MXS_GPIO_PORT(MX28_GPIO_BASE, MX28_INT_GPIO0, 0), > + DEFINE_MXS_GPIO_PORT(MX28_GPIO_BASE, MX28_INT_GPIO1, 1), > + DEFINE_MXS_GPIO_PORT(MX28_GPIO_BASE, MX28_INT_GPIO2, 2), > + DEFINE_MXS_GPIO_PORT(MX28_GPIO_BASE, MX28_INT_GPIO3, 3), > + DEFINE_MXS_GPIO_PORT(MX28_GPIO_BASE, MX28_INT_GPIO4, 4), > +}; > + > +int __init mx28_register_gpios(void) > +{ > + return mxs_gpio_init(mx28_gpio_ports, ARRAY_SIZE(mx28_gpio_ports)); > +} > +#endif > -- > 1.7.4.1 > diff --git a/arch/arm/mach-mxs/Makefile b/arch/arm/mach-mxs/Makefile index 58e8923..6c38262 100644 --- a/arch/arm/mach-mxs/Makefile +++ b/arch/arm/mach-mxs/Makefile @@ -1,5 +1,5 @@ # Common support -obj-y := clock.o devices.o gpio.o icoll.o iomux.o system.o timer.o +obj-y := clock.o devices.o icoll.o iomux.o system.o timer.o obj-$(CONFIG_MXS_OCOTP) += ocotp.o obj-$(CONFIG_PM) += pm.o diff --git a/arch/arm/mach-mxs/gpio.h b/arch/arm/mach-mxs/include/mach/gpio-mxs.h similarity index 100% rename from arch/arm/mach-mxs/gpio.h rename to arch/arm/mach-mxs/include/mach/gpio-mxs.h diff --git a/arch/arm/mach-mxs/mach-mx28evk.c b/arch/arm/mach-mxs/mach-mx28evk.c index eacdc6b..347cf35 100644 --- a/arch/arm/mach-mxs/mach-mx28evk.c +++ b/arch/arm/mach-mxs/mach-mx28evk.c @@ -24,9 +24,9 @@ #include #include +#include #include "devices-mx28.h" -#include "gpio.h" #define MX28EVK_FLEXCAN_SWITCH MXS_GPIO_NR(2, 13) #define MX28EVK_FEC_PHY_POWER MXS_GPIO_NR(2, 15) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 21271a5..afe44aa 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -94,6 +94,10 @@ config GPIO_EXYNOS4 def_bool y depends on CPU_EXYNOS4210 +config GPIO_MXS + def_bool y + depends on ARCH_MXS + config GPIO_PLAT_SAMSUNG def_bool y depends on SAMSUNG_GPIOLIB_4BIT diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index e6e5032..8733d02 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -10,6 +10,7 @@ obj-$(CONFIG_GPIO_BASIC_MMIO_CORE) += basic_mmio_gpio.o obj-$(CONFIG_GPIO_BASIC_MMIO) += basic_mmio_gpio.o obj-$(CONFIG_GPIO_EP93XX) += gpio-ep93xx.o obj-$(CONFIG_GPIO_EXYNOS4) += gpio-exynos4.o +obj-$(CONFIG_GPIO_MXS) += gpio-mxs.o obj-$(CONFIG_GPIO_PLAT_SAMSUNG) += gpio-plat-samsung.o obj-$(CONFIG_GPIO_S5PC100) += gpio-s5pc100.o obj-$(CONFIG_GPIO_S5PV210) += gpio-s5pv210.o diff --git a/arch/arm/mach-mxs/gpio.c b/drivers/gpio/gpio-mxs.c similarity index 99% rename from arch/arm/mach-mxs/gpio.c rename to drivers/gpio/gpio-mxs.c index 2c950fe..bac7b6b 100644 --- a/arch/arm/mach-mxs/gpio.c +++ b/drivers/gpio/gpio-mxs.c @@ -27,10 +27,9 @@ #include #include #include +#include #include -#include "gpio.h" - static struct mxs_gpio_port *mxs_gpio_ports; static int gpio_table_size;