* [PATCH 1/2] gpio/mxs: save the unnecessary function mxs_gpio_to_irq
@ 2011-06-06 6:20 Shawn Guo
2011-06-06 6:20 ` [PATCH 2/2] gpio/mxs: convert gpio-mxs to use basic_mmio_gpio library Shawn Guo
2011-06-06 8:02 ` [PATCH 1/2] gpio/mxs: save the unnecessary function mxs_gpio_to_irq Sascha Hauer
0 siblings, 2 replies; 6+ messages in thread
From: Shawn Guo @ 2011-06-06 6:20 UTC (permalink / raw)
To: linux-arm-kernel
The irq number can be easily calculated from the sum of
MXS_GPIO_IRQ_START and gpio number. The patch directly defines
gpio_to_irq for it and removes mxs_gpio_to_irq to simplify the
the driver.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
arch/arm/mach-mxs/include/mach/gpio.h | 2 +-
drivers/gpio/gpio-mxs.c | 9 ---------
2 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/arch/arm/mach-mxs/include/mach/gpio.h b/arch/arm/mach-mxs/include/mach/gpio.h
index 828cccc..18017c5 100644
--- a/arch/arm/mach-mxs/include/mach/gpio.h
+++ b/arch/arm/mach-mxs/include/mach/gpio.h
@@ -28,8 +28,8 @@
#define gpio_get_value __gpio_get_value
#define gpio_set_value __gpio_set_value
#define gpio_cansleep __gpio_cansleep
-#define gpio_to_irq __gpio_to_irq
#define irq_to_gpio(irq) ((irq) - MXS_GPIO_IRQ_START)
+#define gpio_to_irq(gpio) (MXS_GPIO_IRQ_START + (gpio))
#endif /* __MACH_MXS_GPIO_H__ */
diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c
index a287614..d01f046 100644
--- a/drivers/gpio/gpio-mxs.c
+++ b/drivers/gpio/gpio-mxs.c
@@ -236,14 +236,6 @@ static void mxs_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
writel(1 << offset, pin_addr + MXS_CLR);
}
-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);
@@ -327,7 +319,6 @@ static int __devinit mxs_gpio_probe(struct platform_device *pdev)
port->chip.direction_output = mxs_gpio_direction_output;
port->chip.get = mxs_gpio_get;
port->chip.set = mxs_gpio_set;
- port->chip.to_irq = mxs_gpio_to_irq;
port->chip.base = port->id * 32;
port->chip.ngpio = 32;
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] gpio/mxs: convert gpio-mxs to use basic_mmio_gpio library
2011-06-06 6:20 [PATCH 1/2] gpio/mxs: save the unnecessary function mxs_gpio_to_irq Shawn Guo
@ 2011-06-06 6:20 ` Shawn Guo
2011-06-06 8:19 ` Grant Likely
2011-06-06 8:02 ` [PATCH 1/2] gpio/mxs: save the unnecessary function mxs_gpio_to_irq Sascha Hauer
1 sibling, 1 reply; 6+ messages in thread
From: Shawn Guo @ 2011-06-06 6:20 UTC (permalink / raw)
To: linux-arm-kernel
The gpio-mxs controller complies with basic_mmio_gpio library. This
patch converts the driver to use the library.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
drivers/gpio/Kconfig | 1 +
drivers/gpio/gpio-mxs.c | 73 +++++++++--------------------------------------
2 files changed, 15 insertions(+), 59 deletions(-)
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index daaef0f..0b858e5 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -96,6 +96,7 @@ config GPIO_EXYNOS4
config GPIO_MXS
def_bool y
depends on ARCH_MXS
+ select GPIO_BASIC_MMIO_CORE
config GPIO_PLAT_SAMSUNG
bool "Samsung SoCs GPIO library support"
diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c
index d01f046..9897641 100644
--- a/drivers/gpio/gpio-mxs.c
+++ b/drivers/gpio/gpio-mxs.c
@@ -27,6 +27,7 @@
#include <linux/gpio.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
+#include <linux/basic_mmio_gpio.h>
#include <mach/mxs.h>
#define MXS_SET 0x4
@@ -54,7 +55,7 @@ struct mxs_gpio_port {
int irq;
int irq_high;
int virtual_irq_start;
- struct gpio_chip chip;
+ struct bgpio_chip bgc;
};
/* Note: This driver assumes 32 GPIOs are handled in one register */
@@ -99,8 +100,6 @@ static void mxs_gpio_unmask_irq(struct irq_data *d)
set_gpio_irqenable(port, 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);
@@ -203,53 +202,6 @@ static struct irq_chip gpio_irq_chip = {
.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)
- writel(1 << offset, pin_addr + MXS_SET);
- else
- writel(1 << offset, pin_addr + MXS_CLR);
-}
-
-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 (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)
- writel(1 << offset, pin_addr + MXS_SET);
- else
- writel(1 << offset, pin_addr + MXS_CLR);
-}
-
-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;
-}
-
static int __devinit mxs_gpio_probe(struct platform_device *pdev)
{
static void __iomem *base;
@@ -314,20 +266,23 @@ static int __devinit mxs_gpio_probe(struct platform_device *pdev)
irq_set_chained_handler(port->irq, mxs_gpio_irq_handler);
irq_set_handler_data(port->irq, port);
- /* register gpio chip */
- port->chip.direction_input = mxs_gpio_direction_input;
- port->chip.direction_output = mxs_gpio_direction_output;
- port->chip.get = mxs_gpio_get;
- port->chip.set = mxs_gpio_set;
- port->chip.base = port->id * 32;
- port->chip.ngpio = 32;
-
- err = gpiochip_add(&port->chip);
+ err = bgpio_init(&port->bgc, &pdev->dev, 4,
+ port->base + PINCTRL_DIN(port->id),
+ port->base + PINCTRL_DOUT(port->id), NULL,
+ port->base + PINCTRL_DOE(port->id), NULL, false);
if (err)
goto out_iounmap;
+ port->bgc.gc.base = port->id * 32;
+
+ err = gpiochip_add(&port->bgc.gc);
+ if (err)
+ goto out_bgpio_remove;
+
return 0;
+out_bgpio_remove:
+ bgpio_remove(&port->bgc);
out_iounmap:
if (iores)
iounmap(port->base);
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 1/2] gpio/mxs: save the unnecessary function mxs_gpio_to_irq
2011-06-06 6:20 [PATCH 1/2] gpio/mxs: save the unnecessary function mxs_gpio_to_irq Shawn Guo
2011-06-06 6:20 ` [PATCH 2/2] gpio/mxs: convert gpio-mxs to use basic_mmio_gpio library Shawn Guo
@ 2011-06-06 8:02 ` Sascha Hauer
2011-06-06 12:30 ` Shawn Guo
1 sibling, 1 reply; 6+ messages in thread
From: Sascha Hauer @ 2011-06-06 8:02 UTC (permalink / raw)
To: linux-arm-kernel
Hi Shawn,
On Mon, Jun 06, 2011 at 02:20:46PM +0800, Shawn Guo wrote:
> The irq number can be easily calculated from the sum of
> MXS_GPIO_IRQ_START and gpio number. The patch directly defines
> gpio_to_irq for it and removes mxs_gpio_to_irq to simplify the
> the driver.
>
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> ---
> arch/arm/mach-mxs/include/mach/gpio.h | 2 +-
> drivers/gpio/gpio-mxs.c | 9 ---------
> 2 files changed, 1 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm/mach-mxs/include/mach/gpio.h b/arch/arm/mach-mxs/include/mach/gpio.h
> index 828cccc..18017c5 100644
> --- a/arch/arm/mach-mxs/include/mach/gpio.h
> +++ b/arch/arm/mach-mxs/include/mach/gpio.h
> @@ -28,8 +28,8 @@
> #define gpio_get_value __gpio_get_value
> #define gpio_set_value __gpio_set_value
> #define gpio_cansleep __gpio_cansleep
> -#define gpio_to_irq __gpio_to_irq
>
> #define irq_to_gpio(irq) ((irq) - MXS_GPIO_IRQ_START)
> +#define gpio_to_irq(gpio) (MXS_GPIO_IRQ_START + (gpio))
NACK
This is no good idea. __gpio_to_irq also works correctly for i2c gpio
expanders and the like whereas your patch limits the gio_to_irq usage to
internal gpios. Better to keep it like it is.
Sascha
>
> #endif /* __MACH_MXS_GPIO_H__ */
> diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c
> index a287614..d01f046 100644
> --- a/drivers/gpio/gpio-mxs.c
> +++ b/drivers/gpio/gpio-mxs.c
> @@ -236,14 +236,6 @@ static void mxs_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
> writel(1 << offset, pin_addr + MXS_CLR);
> }
>
> -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);
> @@ -327,7 +319,6 @@ static int __devinit mxs_gpio_probe(struct platform_device *pdev)
> port->chip.direction_output = mxs_gpio_direction_output;
> port->chip.get = mxs_gpio_get;
> port->chip.set = mxs_gpio_set;
> - port->chip.to_irq = mxs_gpio_to_irq;
> port->chip.base = port->id * 32;
> port->chip.ngpio = 32;
>
> --
> 1.7.4.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] gpio/mxs: convert gpio-mxs to use basic_mmio_gpio library
2011-06-06 6:20 ` [PATCH 2/2] gpio/mxs: convert gpio-mxs to use basic_mmio_gpio library Shawn Guo
@ 2011-06-06 8:19 ` Grant Likely
2011-06-06 8:47 ` Shawn Guo
0 siblings, 1 reply; 6+ messages in thread
From: Grant Likely @ 2011-06-06 8:19 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jun 06, 2011 at 02:20:47PM +0800, Shawn Guo wrote:
> The gpio-mxs controller complies with basic_mmio_gpio library. This
> patch converts the driver to use the library.
>
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Given that patch 1 was nacked, I'm assuming I should ignore this patch?
g.
> ---
> drivers/gpio/Kconfig | 1 +
> drivers/gpio/gpio-mxs.c | 73 +++++++++--------------------------------------
> 2 files changed, 15 insertions(+), 59 deletions(-)
>
> diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
> index daaef0f..0b858e5 100644
> --- a/drivers/gpio/Kconfig
> +++ b/drivers/gpio/Kconfig
> @@ -96,6 +96,7 @@ config GPIO_EXYNOS4
> config GPIO_MXS
> def_bool y
> depends on ARCH_MXS
> + select GPIO_BASIC_MMIO_CORE
>
> config GPIO_PLAT_SAMSUNG
> bool "Samsung SoCs GPIO library support"
> diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c
> index d01f046..9897641 100644
> --- a/drivers/gpio/gpio-mxs.c
> +++ b/drivers/gpio/gpio-mxs.c
> @@ -27,6 +27,7 @@
> #include <linux/gpio.h>
> #include <linux/platform_device.h>
> #include <linux/slab.h>
> +#include <linux/basic_mmio_gpio.h>
> #include <mach/mxs.h>
>
> #define MXS_SET 0x4
> @@ -54,7 +55,7 @@ struct mxs_gpio_port {
> int irq;
> int irq_high;
> int virtual_irq_start;
> - struct gpio_chip chip;
> + struct bgpio_chip bgc;
> };
>
> /* Note: This driver assumes 32 GPIOs are handled in one register */
> @@ -99,8 +100,6 @@ static void mxs_gpio_unmask_irq(struct irq_data *d)
> set_gpio_irqenable(port, 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);
> @@ -203,53 +202,6 @@ static struct irq_chip gpio_irq_chip = {
> .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)
> - writel(1 << offset, pin_addr + MXS_SET);
> - else
> - writel(1 << offset, pin_addr + MXS_CLR);
> -}
> -
> -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 (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)
> - writel(1 << offset, pin_addr + MXS_SET);
> - else
> - writel(1 << offset, pin_addr + MXS_CLR);
> -}
> -
> -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;
> -}
> -
> static int __devinit mxs_gpio_probe(struct platform_device *pdev)
> {
> static void __iomem *base;
> @@ -314,20 +266,23 @@ static int __devinit mxs_gpio_probe(struct platform_device *pdev)
> irq_set_chained_handler(port->irq, mxs_gpio_irq_handler);
> irq_set_handler_data(port->irq, port);
>
> - /* register gpio chip */
> - port->chip.direction_input = mxs_gpio_direction_input;
> - port->chip.direction_output = mxs_gpio_direction_output;
> - port->chip.get = mxs_gpio_get;
> - port->chip.set = mxs_gpio_set;
> - port->chip.base = port->id * 32;
> - port->chip.ngpio = 32;
> -
> - err = gpiochip_add(&port->chip);
> + err = bgpio_init(&port->bgc, &pdev->dev, 4,
> + port->base + PINCTRL_DIN(port->id),
> + port->base + PINCTRL_DOUT(port->id), NULL,
> + port->base + PINCTRL_DOE(port->id), NULL, false);
> if (err)
> goto out_iounmap;
>
> + port->bgc.gc.base = port->id * 32;
> +
> + err = gpiochip_add(&port->bgc.gc);
> + if (err)
> + goto out_bgpio_remove;
> +
> return 0;
>
> +out_bgpio_remove:
> + bgpio_remove(&port->bgc);
> out_iounmap:
> if (iores)
> iounmap(port->base);
> --
> 1.7.4.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] gpio/mxs: convert gpio-mxs to use basic_mmio_gpio library
2011-06-06 8:19 ` Grant Likely
@ 2011-06-06 8:47 ` Shawn Guo
0 siblings, 0 replies; 6+ messages in thread
From: Shawn Guo @ 2011-06-06 8:47 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jun 06, 2011 at 02:19:35AM -0600, Grant Likely wrote:
> On Mon, Jun 06, 2011 at 02:20:47PM +0800, Shawn Guo wrote:
> > The gpio-mxs controller complies with basic_mmio_gpio library. This
> > patch converts the driver to use the library.
> >
> > Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
>
> Given that patch 1 was nacked, I'm assuming I should ignore this patch?
>
Yes. I will send a v2 of this patch.
--
Regards,
Shawn
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] gpio/mxs: save the unnecessary function mxs_gpio_to_irq
2011-06-06 8:02 ` [PATCH 1/2] gpio/mxs: save the unnecessary function mxs_gpio_to_irq Sascha Hauer
@ 2011-06-06 12:30 ` Shawn Guo
0 siblings, 0 replies; 6+ messages in thread
From: Shawn Guo @ 2011-06-06 12:30 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jun 06, 2011 at 10:02:16AM +0200, Sascha Hauer wrote:
> Hi Shawn,
>
> On Mon, Jun 06, 2011 at 02:20:46PM +0800, Shawn Guo wrote:
> > The irq number can be easily calculated from the sum of
> > MXS_GPIO_IRQ_START and gpio number. The patch directly defines
> > gpio_to_irq for it and removes mxs_gpio_to_irq to simplify the
> > the driver.
> >
> > Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> > ---
> > arch/arm/mach-mxs/include/mach/gpio.h | 2 +-
> > drivers/gpio/gpio-mxs.c | 9 ---------
> > 2 files changed, 1 insertions(+), 10 deletions(-)
> >
> > diff --git a/arch/arm/mach-mxs/include/mach/gpio.h b/arch/arm/mach-mxs/include/mach/gpio.h
> > index 828cccc..18017c5 100644
> > --- a/arch/arm/mach-mxs/include/mach/gpio.h
> > +++ b/arch/arm/mach-mxs/include/mach/gpio.h
> > @@ -28,8 +28,8 @@
> > #define gpio_get_value __gpio_get_value
> > #define gpio_set_value __gpio_set_value
> > #define gpio_cansleep __gpio_cansleep
> > -#define gpio_to_irq __gpio_to_irq
> >
> > #define irq_to_gpio(irq) ((irq) - MXS_GPIO_IRQ_START)
> > +#define gpio_to_irq(gpio) (MXS_GPIO_IRQ_START + (gpio))
>
> NACK
>
> This is no good idea. __gpio_to_irq also works correctly for i2c gpio
> expanders and the like whereas your patch limits the gio_to_irq usage to
> internal gpios. Better to keep it like it is.
>
What I was trying to do is moving gpio-mxs one step closer to
gpio-mxc. I thought what gpio-mxc is doing should have been proved
fine by a wider users/platforms. But you are telling this is one
step backward. Then I will drop the patch.
--
Regards,
Shawn
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-06-06 12:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-06-06 6:20 [PATCH 1/2] gpio/mxs: save the unnecessary function mxs_gpio_to_irq Shawn Guo
2011-06-06 6:20 ` [PATCH 2/2] gpio/mxs: convert gpio-mxs to use basic_mmio_gpio library Shawn Guo
2011-06-06 8:19 ` Grant Likely
2011-06-06 8:47 ` Shawn Guo
2011-06-06 8:02 ` [PATCH 1/2] gpio/mxs: save the unnecessary function mxs_gpio_to_irq Sascha Hauer
2011-06-06 12:30 ` Shawn Guo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.