* [PATCH 0/3] Cleanup MSM_GPIOMUX and add device-tree support for
@ 2013-05-21 18:32 Rohit Vaswani
2013-05-21 18:32 ` [PATCH 1/3] ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs Rohit Vaswani
` (3 more replies)
0 siblings, 4 replies; 13+ messages in thread
From: Rohit Vaswani @ 2013-05-21 18:32 UTC (permalink / raw)
To: David Brown, Linus Walleij
Cc: Rohit Vaswani, Daniel Walker, Bryan Huntsman, Russell King,
Grant Likely, linux-arm-msm, linux-kernel
Hi Linus,
Could this series go through David's tree or is there a better way to do this?
It would be great if I can have you ack for the gpio patch.
Thanks,
Rohit
Rohit Vaswani (3):
ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs
ARM: msm: Remove unused and unmapped MSM_TLMM_BASE for 8x60
gpio: msm: Add device tree and irqdomain support for gpio-msm-v2
.../devicetree/bindings/gpio/gpio-msm.txt | 26 ++++
arch/arm/boot/dts/msm8660-surf.dts | 11 ++
arch/arm/boot/dts/msm8960-cdp.dts | 11 ++
arch/arm/mach-msm/Kconfig | 13 +-
arch/arm/mach-msm/Makefile | 6 +-
arch/arm/mach-msm/gpiomux-8x60.c | 19 ---
arch/arm/mach-msm/gpiomux-v2.c | 25 ---
arch/arm/mach-msm/gpiomux-v2.h | 61 --------
arch/arm/mach-msm/gpiomux.c | 15 ++
arch/arm/mach-msm/gpiomux.h | 5 -
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 4 -
drivers/gpio/Kconfig | 2 +-
drivers/gpio/gpio-msm-v2.c | 158 ++++++++++++++------
13 files changed, 183 insertions(+), 173 deletions(-)
create mode 100644 Documentation/devicetree/bindings/gpio/gpio-msm.txt
delete mode 100644 arch/arm/mach-msm/gpiomux-8x60.c
delete mode 100644 arch/arm/mach-msm/gpiomux-v2.c
delete mode 100644 arch/arm/mach-msm/gpiomux-v2.h
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 1/3] ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs
2013-05-21 18:32 [PATCH 0/3] Cleanup MSM_GPIOMUX and add device-tree support for Rohit Vaswani
@ 2013-05-21 18:32 ` Rohit Vaswani
2013-05-30 17:53 ` Linus Walleij
2013-05-21 18:32 ` [PATCH 2/3] ARM: msm: Remove unused and unmapped MSM_TLMM_BASE for 8x60 Rohit Vaswani
` (2 subsequent siblings)
3 siblings, 1 reply; 13+ messages in thread
From: Rohit Vaswani @ 2013-05-21 18:32 UTC (permalink / raw)
To: David Brown
Cc: Rohit Vaswani, Daniel Walker, Bryan Huntsman, Russell King,
Grant Likely, Linus Walleij, linux-arm-msm, linux-kernel
Remove gpiomux-v2 as it's not being used and make way for future improvements.
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
---
arch/arm/mach-msm/Kconfig | 13 +++-----
arch/arm/mach-msm/Makefile | 6 +--
arch/arm/mach-msm/gpiomux-8x60.c | 19 ------------
arch/arm/mach-msm/gpiomux-v2.c | 25 ---------------
arch/arm/mach-msm/gpiomux-v2.h | 61 --------------------------------------
arch/arm/mach-msm/gpiomux.c | 15 +++++++++
arch/arm/mach-msm/gpiomux.h | 5 ---
drivers/gpio/gpio-msm-v2.c | 5 +--
8 files changed, 24 insertions(+), 125 deletions(-)
delete mode 100644 arch/arm/mach-msm/gpiomux-8x60.c
delete mode 100644 arch/arm/mach-msm/gpiomux-v2.c
delete mode 100644 arch/arm/mach-msm/gpiomux-v2.h
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index fceb093..614e41e 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -48,9 +48,7 @@ config ARCH_MSM8X60
select CPU_V7
select GPIO_MSM_V2
select HAVE_SMP
- select MSM_GPIOMUX
select MSM_SCM if SMP
- select MSM_V2_TLMM
select USE_OF
config ARCH_MSM8960
@@ -58,9 +56,8 @@ config ARCH_MSM8960
select ARM_GIC
select CPU_V7
select HAVE_SMP
- select MSM_GPIOMUX
+ select GPIO_MSM_V2
select MSM_SCM if SMP
- select MSM_V2_TLMM
select USE_OF
config MSM_HAS_DEBUG_UART_HS
@@ -124,10 +121,10 @@ config MSM_SMD
bool
config MSM_GPIOMUX
- bool
-
-config MSM_V2_TLMM
- bool
+ depends on !(ARCH_MSM8X60 || ARCH_MSM8960)
+ bool "MSM V1 TLMM GPIOMUX architecture"
+ help
+ Support for MSM V1 TLMM GPIOMUX architecture.
config MSM_SCM
bool
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 17519fa..1a26d04 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -27,7 +27,5 @@ obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o
obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o
obj-$(CONFIG_ARCH_MSM8X60) += board-dt-8660.o
obj-$(CONFIG_ARCH_MSM8960) += board-dt-8960.o
-
-obj-$(CONFIG_ARCH_MSM7X30) += gpiomux-v1.o gpiomux.o
-obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o gpiomux-v1.o gpiomux.o
-obj-$(CONFIG_ARCH_MSM8X60) += gpiomux-8x60.o gpiomux-v2.o gpiomux.o
+obj-$(CONFIG_MSM_GPIOMUX) += gpiomux.o
+obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o
diff --git a/arch/arm/mach-msm/gpiomux-8x60.c b/arch/arm/mach-msm/gpiomux-8x60.c
deleted file mode 100644
index 7b380b3..0000000
--- a/arch/arm/mach-msm/gpiomux-8x60.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright (c) 2010, Code Aurora Forum. 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 version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * 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 "gpiomux.h"
-
-struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS] = {};
diff --git a/arch/arm/mach-msm/gpiomux-v2.c b/arch/arm/mach-msm/gpiomux-v2.c
deleted file mode 100644
index 273396d..0000000
--- a/arch/arm/mach-msm/gpiomux-v2.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright (c) 2010, Code Aurora Forum. 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 version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * 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 <linux/io.h>
-#include <mach/msm_iomap.h>
-#include "gpiomux.h"
-
-void __msm_gpiomux_write(unsigned gpio, gpiomux_config_t val)
-{
- writel(val & ~GPIOMUX_CTL_MASK,
- MSM_TLMM_BASE + 0x1000 + (0x10 * gpio));
-}
diff --git a/arch/arm/mach-msm/gpiomux-v2.h b/arch/arm/mach-msm/gpiomux-v2.h
deleted file mode 100644
index 3bf10e7..0000000
--- a/arch/arm/mach-msm/gpiomux-v2.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright (c) 2010, Code Aurora Forum. 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 version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * 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.
- */
-#ifndef __ARCH_ARM_MACH_MSM_GPIOMUX_V2_H
-#define __ARCH_ARM_MACH_MSM_GPIOMUX_V2_H
-
-#define GPIOMUX_NGPIOS 173
-
-typedef u16 gpiomux_config_t;
-
-enum {
- GPIOMUX_DRV_2MA = 0UL << 6,
- GPIOMUX_DRV_4MA = 1UL << 6,
- GPIOMUX_DRV_6MA = 2UL << 6,
- GPIOMUX_DRV_8MA = 3UL << 6,
- GPIOMUX_DRV_10MA = 4UL << 6,
- GPIOMUX_DRV_12MA = 5UL << 6,
- GPIOMUX_DRV_14MA = 6UL << 6,
- GPIOMUX_DRV_16MA = 7UL << 6,
-};
-
-enum {
- GPIOMUX_FUNC_GPIO = 0UL << 2,
- GPIOMUX_FUNC_1 = 1UL << 2,
- GPIOMUX_FUNC_2 = 2UL << 2,
- GPIOMUX_FUNC_3 = 3UL << 2,
- GPIOMUX_FUNC_4 = 4UL << 2,
- GPIOMUX_FUNC_5 = 5UL << 2,
- GPIOMUX_FUNC_6 = 6UL << 2,
- GPIOMUX_FUNC_7 = 7UL << 2,
- GPIOMUX_FUNC_8 = 8UL << 2,
- GPIOMUX_FUNC_9 = 9UL << 2,
- GPIOMUX_FUNC_A = 10UL << 2,
- GPIOMUX_FUNC_B = 11UL << 2,
- GPIOMUX_FUNC_C = 12UL << 2,
- GPIOMUX_FUNC_D = 13UL << 2,
- GPIOMUX_FUNC_E = 14UL << 2,
- GPIOMUX_FUNC_F = 15UL << 2,
-};
-
-enum {
- GPIOMUX_PULL_NONE = 0UL,
- GPIOMUX_PULL_DOWN = 1UL,
- GPIOMUX_PULL_KEEPER = 2UL,
- GPIOMUX_PULL_UP = 3UL,
-};
-
-#endif
diff --git a/arch/arm/mach-msm/gpiomux.c b/arch/arm/mach-msm/gpiomux.c
index 53af21a..2b8e2d2 100644
--- a/arch/arm/mach-msm/gpiomux.c
+++ b/arch/arm/mach-msm/gpiomux.c
@@ -17,9 +17,24 @@
#include <linux/module.h>
#include <linux/spinlock.h>
#include "gpiomux.h"
+#include "proc_comm.h"
static DEFINE_SPINLOCK(gpiomux_lock);
+static void __msm_gpiomux_write(unsigned gpio, gpiomux_config_t val)
+{
+ unsigned tlmm_config = (val & ~GPIOMUX_CTL_MASK) |
+ ((gpio & 0x3ff) << 4);
+ unsigned tlmm_disable = 0;
+ int rc;
+
+ rc = msm_proc_comm(PCOM_RPC_GPIO_TLMM_CONFIG_EX,
+ &tlmm_config, &tlmm_disable);
+ if (rc)
+ pr_err("%s: unexpected proc_comm failure %d: %08x %08x\n",
+ __func__, rc, tlmm_config, tlmm_disable);
+}
+
int msm_gpiomux_write(unsigned gpio,
gpiomux_config_t active,
gpiomux_config_t suspended)
diff --git a/arch/arm/mach-msm/gpiomux.h b/arch/arm/mach-msm/gpiomux.h
index 00459f6..8e82f41 100644
--- a/arch/arm/mach-msm/gpiomux.h
+++ b/arch/arm/mach-msm/gpiomux.h
@@ -20,12 +20,7 @@
#include <linux/bitops.h>
#include <linux/errno.h>
#include <mach/msm_gpiomux.h>
-
-#if defined(CONFIG_MSM_V2_TLMM)
-#include "gpiomux-v2.h"
-#else
#include "gpiomux-v1.h"
-#endif
/**
* struct msm_gpiomux_config: gpiomux settings for one gpio line.
diff --git a/drivers/gpio/gpio-msm-v2.c b/drivers/gpio/gpio-msm-v2.c
index dd2edde..75cc821 100644
--- a/drivers/gpio/gpio-msm-v2.c
+++ b/drivers/gpio/gpio-msm-v2.c
@@ -29,7 +29,6 @@
#include <linux/platform_device.h>
#include <linux/spinlock.h>
-#include <mach/msm_gpiomux.h>
#include <mach/msm_iomap.h>
/* Bits of interest in the GPIO_IN_OUT register.
@@ -159,12 +158,12 @@ static int msm_gpio_direction_output(struct gpio_chip *chip,
static int msm_gpio_request(struct gpio_chip *chip, unsigned offset)
{
- return msm_gpiomux_get(chip->base + offset);
+ return 0;
}
static void msm_gpio_free(struct gpio_chip *chip, unsigned offset)
{
- msm_gpiomux_put(chip->base + offset);
+ return;
}
static int msm_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 2/3] ARM: msm: Remove unused and unmapped MSM_TLMM_BASE for 8x60
2013-05-21 18:32 [PATCH 0/3] Cleanup MSM_GPIOMUX and add device-tree support for Rohit Vaswani
2013-05-21 18:32 ` [PATCH 1/3] ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs Rohit Vaswani
@ 2013-05-21 18:32 ` Rohit Vaswani
2013-05-21 18:32 ` [PATCH 3/3] gpio: msm: Add device tree and irqdomain support for gpio-msm-v2 Rohit Vaswani
2013-05-30 17:54 ` [PATCH 0/3] Cleanup MSM_GPIOMUX and add device-tree support for Linus Walleij
3 siblings, 0 replies; 13+ messages in thread
From: Rohit Vaswani @ 2013-05-21 18:32 UTC (permalink / raw)
To: David Brown
Cc: Rohit Vaswani, Daniel Walker, Bryan Huntsman, Russell King,
linux-arm-msm, linux-kernel
MSM_TLMM_BASE is currently not mapped by 8x60. Remove it.
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
---
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
index 199372e..cf24b5c 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
@@ -41,10 +41,6 @@
#define MSM8X60_QGIC_CPU_PHYS 0x02081000
#define MSM8X60_QGIC_CPU_SIZE SZ_4K
-#define MSM_TLMM_BASE IOMEM(0xF0004000)
-#define MSM_TLMM_PHYS 0x00800000
-#define MSM_TLMM_SIZE SZ_16K
-
#define MSM8X60_TMR_PHYS 0x02000000
#define MSM8X60_TMR_SIZE SZ_4K
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 3/3] gpio: msm: Add device tree and irqdomain support for gpio-msm-v2
2013-05-21 18:32 [PATCH 0/3] Cleanup MSM_GPIOMUX and add device-tree support for Rohit Vaswani
2013-05-21 18:32 ` [PATCH 1/3] ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs Rohit Vaswani
2013-05-21 18:32 ` [PATCH 2/3] ARM: msm: Remove unused and unmapped MSM_TLMM_BASE for 8x60 Rohit Vaswani
@ 2013-05-21 18:32 ` Rohit Vaswani
2013-05-21 21:06 ` Stephen Boyd
2013-05-22 9:36 ` Stanimir Varbanov
2013-05-30 17:54 ` [PATCH 0/3] Cleanup MSM_GPIOMUX and add device-tree support for Linus Walleij
3 siblings, 2 replies; 13+ messages in thread
From: Rohit Vaswani @ 2013-05-21 18:32 UTC (permalink / raw)
To: Linus Walleij
Cc: Rohit Vaswani, Grant Likely, Rob Herring, Rob Landley,
Russell King, David Brown, Bryan Huntsman, linux-doc,
linux-kernel
This cleans up the gpio-msm-v2 driver of all the global define usage.
The number of gpios are now defined in the device tree. This enables
adding irqdomain support as well.
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
---
.../devicetree/bindings/gpio/gpio-msm.txt | 26 ++++
arch/arm/boot/dts/msm8660-surf.dts | 11 ++
arch/arm/boot/dts/msm8960-cdp.dts | 11 ++
drivers/gpio/Kconfig | 2 +-
drivers/gpio/gpio-msm-v2.c | 153 ++++++++++++++------
5 files changed, 159 insertions(+), 44 deletions(-)
create mode 100644 Documentation/devicetree/bindings/gpio/gpio-msm.txt
diff --git a/Documentation/devicetree/bindings/gpio/gpio-msm.txt b/Documentation/devicetree/bindings/gpio/gpio-msm.txt
new file mode 100644
index 0000000..ac20e68
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpio/gpio-msm.txt
@@ -0,0 +1,26 @@
+MSM GPIO controller bindings
+
+Required properties:
+- compatible:
+ - "qcom,msm-gpio" for MSM controllers
+- #gpio-cells : Should be two.
+ - first cell is the pin number
+ - second cell is used to specify optional parameters (unused)
+- gpio-controller : Marks the device node as a GPIO controller.
+- #interrupt-cells : Should be 2.
+- interrupt-controller: Mark the device node as an interrupt controller
+- interrupts : Specify the TLMM summary interrupt number
+- ngpio : Specify the number of MSM GPIOs
+
+Example:
+
+ msmgpio: gpio@fd510000 {
+ compatible = "qcom,msm-gpio";
+ gpio-controller;
+ #gpio-cells = <2>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ reg = <0xfd510000 0x4000>;
+ interrupts = <0 208 0>;
+ ngpio = <150>;
+ };
diff --git a/arch/arm/boot/dts/msm8660-surf.dts b/arch/arm/boot/dts/msm8660-surf.dts
index 9bf49b3..8931906 100644
--- a/arch/arm/boot/dts/msm8660-surf.dts
+++ b/arch/arm/boot/dts/msm8660-surf.dts
@@ -26,6 +26,17 @@
cpu-offset = <0x40000>;
};
+ msmgpio: gpio@800000 {
+ compatible = "qcom,msm-gpio";
+ reg = <0x00800000 0x1000>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ ngpio = <173>;
+ interrupts = <0 32 0x4>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+
serial@19c400000 {
compatible = "qcom,msm-hsuart", "qcom,msm-uart";
reg = <0x19c40000 0x1000>,
diff --git a/arch/arm/boot/dts/msm8960-cdp.dts b/arch/arm/boot/dts/msm8960-cdp.dts
index 2e4d87a..52fe253 100644
--- a/arch/arm/boot/dts/msm8960-cdp.dts
+++ b/arch/arm/boot/dts/msm8960-cdp.dts
@@ -26,6 +26,17 @@
cpu-offset = <0x80000>;
};
+ msmgpio: gpio@fd510000 {
+ compatible = "qcom,msm-gpio";
+ gpio-controller;
+ #gpio-cells = <2>;
+ ngpio = <150>;
+ interrupts = <0 32 0x4>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ reg = <0xfd510000 0x4000>;
+ };
+
serial@19c400000 {
compatible = "qcom,msm-hsuart", "qcom,msm-uart";
reg = <0x16440000 0x1000>,
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 87d5670..f3c1978 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -165,7 +165,7 @@ config GPIO_MSM_V1
config GPIO_MSM_V2
tristate "Qualcomm MSM GPIO v2"
- depends on GPIOLIB && ARCH_MSM
+ depends on GPIOLIB && ARCH_MSM && OF
help
Say yes here to support the GPIO interface on ARM v7 based
Qualcomm MSM chips. Most of the pins on the MSM can be
diff --git a/drivers/gpio/gpio-msm-v2.c b/drivers/gpio/gpio-msm-v2.c
index 75cc821..2ed9dee 100644
--- a/drivers/gpio/gpio-msm-v2.c
+++ b/drivers/gpio/gpio-msm-v2.c
@@ -25,11 +25,15 @@
#include <linux/io.h>
#include <linux/irqchip/chained_irq.h>
#include <linux/irq.h>
+#include <linux/irqdomain.h>
#include <linux/module.h>
+#include <linux/of_address.h>
#include <linux/platform_device.h>
#include <linux/spinlock.h>
+#include <linux/slab.h>
-#include <mach/msm_iomap.h>
+static int summary_irq;
+void __iomem *msm_tlmm_base;
/* Bits of interest in the GPIO_IN_OUT register.
*/
@@ -77,11 +81,11 @@ enum {
};
-#define GPIO_INTR_CFG_SU(gpio) (MSM_TLMM_BASE + 0x0400 + (0x04 * (gpio)))
-#define GPIO_CONFIG(gpio) (MSM_TLMM_BASE + 0x1000 + (0x10 * (gpio)))
-#define GPIO_IN_OUT(gpio) (MSM_TLMM_BASE + 0x1004 + (0x10 * (gpio)))
-#define GPIO_INTR_CFG(gpio) (MSM_TLMM_BASE + 0x1008 + (0x10 * (gpio)))
-#define GPIO_INTR_STATUS(gpio) (MSM_TLMM_BASE + 0x100c + (0x10 * (gpio)))
+#define GPIO_INTR_CFG_SU(gpio) (msm_tlmm_base + 0x0400 + (0x04 * (gpio)))
+#define GPIO_CONFIG(gpio) (msm_tlmm_base + 0x1000 + (0x10 * (gpio)))
+#define GPIO_IN_OUT(gpio) (msm_tlmm_base + 0x1004 + (0x10 * (gpio)))
+#define GPIO_INTR_CFG(gpio) (msm_tlmm_base + 0x1008 + (0x10 * (gpio)))
+#define GPIO_INTR_STATUS(gpio) (msm_tlmm_base + 0x100c + (0x10 * (gpio)))
/**
* struct msm_gpio_dev: the MSM8660 SoC GPIO device structure
@@ -101,9 +105,10 @@ enum {
*/
struct msm_gpio_dev {
struct gpio_chip gpio_chip;
- DECLARE_BITMAP(enabled_irqs, NR_GPIO_IRQS);
- DECLARE_BITMAP(wake_irqs, NR_GPIO_IRQS);
- DECLARE_BITMAP(dual_edge_irqs, NR_GPIO_IRQS);
+ unsigned long *enabled_irqs;
+ unsigned long *wake_irqs;
+ unsigned long *dual_edge_irqs;
+ struct irq_domain *domain;
};
static DEFINE_SPINLOCK(tlmm_lock);
@@ -168,18 +173,20 @@ static void msm_gpio_free(struct gpio_chip *chip, unsigned offset)
static int msm_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
{
- return MSM_GPIO_TO_INT(chip->base + offset);
+ struct msm_gpio_dev *g_dev = to_msm_gpio_dev(chip);
+ struct irq_domain *domain = g_dev->domain;
+ return irq_create_mapping(domain, offset);
}
static inline int msm_irq_to_gpio(struct gpio_chip *chip, unsigned irq)
{
- return irq - MSM_GPIO_TO_INT(chip->base);
+ struct irq_data *irq_data = irq_get_irq_data(irq);
+ return irq_data->hwirq;
}
static struct msm_gpio_dev msm_gpio = {
.gpio_chip = {
.base = 0,
- .ngpio = NR_GPIO_IRQS,
.direction_input = msm_gpio_direction_input,
.direction_output = msm_gpio_direction_output,
.get = msm_gpio_get,
@@ -222,7 +229,6 @@ static void msm_gpio_update_dual_edge_pos(unsigned gpio)
else
set_gpio_bits(BIT(INTR_POL_CTL), GPIO_INTR_CFG(gpio));
val2 = readl(GPIO_IN_OUT(gpio)) & BIT(GPIO_IN);
- intstat = readl(GPIO_INTR_STATUS(gpio)) & BIT(INTR_STATUS);
if (intstat || val == val2)
return;
} while (loop_limit-- > 0);
@@ -312,10 +318,11 @@ static void msm_summary_irq_handler(unsigned int irq, struct irq_desc *desc)
{
unsigned long i;
struct irq_chip *chip = irq_desc_get_chip(desc);
+ int ngpio = msm_gpio.gpio_chip.ngpio;
chained_irq_enter(chip, desc);
- for_each_set_bit(i, msm_gpio.enabled_irqs, NR_GPIO_IRQS) {
+ for_each_set_bit(i, msm_gpio.enabled_irqs, ngpio) {
if (readl(GPIO_INTR_STATUS(i)) & BIT(INTR_STATUS))
generic_handle_irq(msm_gpio_to_irq(&msm_gpio.gpio_chip,
i));
@@ -327,15 +334,16 @@ static void msm_summary_irq_handler(unsigned int irq, struct irq_desc *desc)
static int msm_gpio_irq_set_wake(struct irq_data *d, unsigned int on)
{
int gpio = msm_irq_to_gpio(&msm_gpio.gpio_chip, d->irq);
+ int ngpio = msm_gpio.gpio_chip.ngpio;
if (on) {
- if (bitmap_empty(msm_gpio.wake_irqs, NR_GPIO_IRQS))
- irq_set_irq_wake(TLMM_SCSS_SUMMARY_IRQ, 1);
+ if (bitmap_empty(msm_gpio.wake_irqs, ngpio))
+ irq_set_irq_wake(summary_irq, 1);
set_bit(gpio, msm_gpio.wake_irqs);
} else {
clear_bit(gpio, msm_gpio.wake_irqs);
- if (bitmap_empty(msm_gpio.wake_irqs, NR_GPIO_IRQS))
- irq_set_irq_wake(TLMM_SCSS_SUMMARY_IRQ, 0);
+ if (bitmap_empty(msm_gpio.wake_irqs, ngpio))
+ irq_set_irq_wake(summary_irq, 0);
}
return 0;
@@ -350,30 +358,103 @@ static struct irq_chip msm_gpio_irq_chip = {
.irq_set_wake = msm_gpio_irq_set_wake,
};
-static int msm_gpio_probe(struct platform_device *dev)
+static struct lock_class_key msm_gpio_lock_class;
+
+static int msm_gpio_irq_domain_map(struct irq_domain *d, unsigned int irq,
+ irq_hw_number_t hwirq)
+{
+ irq_set_lockdep_class(irq, &msm_gpio_lock_class);
+ irq_set_chip_and_handler(irq, &msm_gpio_irq_chip,
+ handle_level_irq);
+ set_irq_flags(irq, IRQF_VALID);
+
+ return 0;
+}
+
+static const struct irq_domain_ops msm_gpio_irq_domain_ops = {
+ .xlate = irq_domain_xlate_twocell,
+ .map = msm_gpio_irq_domain_map,
+};
+
+static int msm_gpio_irqdomain_init(struct device_node *node, int ngpio)
{
- int i, irq, ret;
+ msm_gpio.domain = irq_domain_add_linear(node, ngpio,
+ &msm_gpio_irq_domain_ops, &msm_gpio);
+ if (!msm_gpio.domain) {
+ WARN(1, "Cannot allocate irq_domain\n");
+ return -ENOMEM;
+ }
+
+ return 0;
+}
+
+static int msm_gpio_probe(struct platform_device *pdev)
+{
+ int i, irq, ret, ngpio;
+ struct resource *res;
+
+ msm_gpio.gpio_chip.label = pdev->name;
+ msm_gpio.gpio_chip.dev = &pdev->dev;
+ of_property_read_u32(pdev->dev.of_node, "ngpio", &ngpio);
+ msm_gpio.gpio_chip.ngpio = ngpio;
+
+ res = platform_get_resource(&pdev->dev, IORESOURCE_MEM, 0);
+ if (!res) {
+ dev_err(&pdev->dev, "%s: no mem resource\n", __func__);
+ return -EINVAL;
+ }
+
+ msm_tlmm_base = devm_ioremap_resource(pdev->dev, res);
+ if (!msm_tlmm_base) {
+ dev_err(&pdev->dev, "Couldn't allocate memory for msm tlmm base\n");
+ return -ENOMEM;
+ }
+
+ msm_gpio.enabled_irqs = devm_kzalloc(&pdev->dev,
+ sizeof(unsigned long) * ngpio,
+ GFP_KERNEL);
+ msm_gpio.wake_irqs = devm_kzalloc(&pdev->dev,
+ sizeof(unsigned long) * ngpio,
+ GFP_KERNEL);
+ msm_gpio.dual_edge_irqs = devm_kzalloc(&pdev->dev,
+ sizeof(unsigned long) * ngpio,
+ GFP_KERNEL);
+ bitmap_zero(msm_gpio.enabled_irqs, ngpio);
+ bitmap_zero(msm_gpio.wake_irqs, ngpio);
+ bitmap_zero(msm_gpio.dual_edge_irqs, ngpio);
- bitmap_zero(msm_gpio.enabled_irqs, NR_GPIO_IRQS);
- bitmap_zero(msm_gpio.wake_irqs, NR_GPIO_IRQS);
- bitmap_zero(msm_gpio.dual_edge_irqs, NR_GPIO_IRQS);
- msm_gpio.gpio_chip.label = dev->name;
ret = gpiochip_add(&msm_gpio.gpio_chip);
- if (ret < 0)
+ if (ret < 0) {
+ dev_err(&pdev->dev, "gpiochip_add failed with error %d\n", ret);
return ret;
+ }
+
+ summary_irq = platform_get_irq(pdev, 0);
+ if (summary_irq < 0) {
+ dev_err(&pdev->dev, "No Summary irq defined for msmgpio\n");
+ return summary_irq;
+ }
+
+ msm_gpio_irqdomain_init(pdev->dev.of_node, msm_gpio.gpio_chip.ngpio);
for (i = 0; i < msm_gpio.gpio_chip.ngpio; ++i) {
irq = msm_gpio_to_irq(&msm_gpio.gpio_chip, i);
+ irq_set_lockdep_class(irq, &msm_gpio_lock_class);
irq_set_chip_and_handler(irq, &msm_gpio_irq_chip,
handle_level_irq);
set_irq_flags(irq, IRQF_VALID);
}
- irq_set_chained_handler(TLMM_SCSS_SUMMARY_IRQ,
- msm_summary_irq_handler);
+ irq_set_chained_handler(summary_irq, msm_summary_irq_handler);
+
return 0;
}
+static struct of_device_id msm_gpio_of_match[] = {
+ { .compatible = "qcom,msm-gpio", },
+ { },
+};
+
static int msm_gpio_remove(struct platform_device *dev)
{
int ret = gpiochip_remove(&msm_gpio.gpio_chip);
@@ -392,31 +473,17 @@ static struct platform_driver msm_gpio_driver = {
.driver = {
.name = "msmgpio",
.owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(msm_gpio_of_match),
},
};
-static struct platform_device msm_device_gpio = {
- .name = "msmgpio",
- .id = -1,
-};
-
static int __init msm_gpio_init(void)
{
- int rc;
-
- rc = platform_driver_register(&msm_gpio_driver);
- if (!rc) {
- rc = platform_device_register(&msm_device_gpio);
- if (rc)
- platform_driver_unregister(&msm_gpio_driver);
- }
-
- return rc;
+ return platform_driver_register(&msm_gpio_driver);
}
static void __exit msm_gpio_exit(void)
{
- platform_device_unregister(&msm_device_gpio);
platform_driver_unregister(&msm_gpio_driver);
}
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 3/3] gpio: msm: Add device tree and irqdomain support for gpio-msm-v2
2013-05-21 18:32 ` [PATCH 3/3] gpio: msm: Add device tree and irqdomain support for gpio-msm-v2 Rohit Vaswani
@ 2013-05-21 21:06 ` Stephen Boyd
2013-05-22 19:29 ` Rohit Vaswani
2013-05-22 9:36 ` Stanimir Varbanov
1 sibling, 1 reply; 13+ messages in thread
From: Stephen Boyd @ 2013-05-21 21:06 UTC (permalink / raw)
To: Rohit Vaswani
Cc: Linus Walleij, Grant Likely, Rob Herring, Rob Landley,
Russell King, David Brown, Bryan Huntsman, linux-doc,
linux-kernel
> diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
> index 87d5670..f3c1978 100644
> --- a/drivers/gpio/Kconfig
> +++ b/drivers/gpio/Kconfig
> @@ -165,7 +165,7 @@ config GPIO_MSM_V1
>
> config GPIO_MSM_V2
> tristate "Qualcomm MSM GPIO v2"
> - depends on GPIOLIB && ARCH_MSM
> + depends on GPIOLIB && ARCH_MSM && OF
This doesn't actually rely on ARCH_MSM anymore so I think we can
drop that dependency.
> help
> Say yes here to support the GPIO interface on ARM v7 based
> Qualcomm MSM chips. Most of the pins on the MSM can be
> @@ -222,7 +229,6 @@ static void msm_gpio_update_dual_edge_pos(unsigned gpio)
> else
> set_gpio_bits(BIT(INTR_POL_CTL), GPIO_INTR_CFG(gpio));
> val2 = readl(GPIO_IN_OUT(gpio)) & BIT(GPIO_IN);
> - intstat = readl(GPIO_INTR_STATUS(gpio)) & BIT(INTR_STATUS);
> if (intstat || val == val2)
Looks like intstat is used uninitialized now?
> +
> +static int msm_gpio_probe(struct platform_device *pdev)
> +{
> + int i, irq, ret, ngpio;
> + struct resource *res;
> +
> + msm_gpio.gpio_chip.label = pdev->name;
> + msm_gpio.gpio_chip.dev = &pdev->dev;
> + of_property_read_u32(pdev->dev.of_node, "ngpio", &ngpio);
Fail probe if the property isn't there?
> + msm_gpio.gpio_chip.ngpio = ngpio;
> +
> + res = platform_get_resource(&pdev->dev, IORESOURCE_MEM, 0);
> + if (!res) {
> + dev_err(&pdev->dev, "%s: no mem resource\n", __func__);
> + return -EINVAL;
> + }
> +
> + msm_tlmm_base = devm_ioremap_resource(pdev->dev, res);
> + if (!msm_tlmm_base) {
> + dev_err(&pdev->dev, "Couldn't allocate memory for msm tlmm base\n");
> + return -ENOMEM;
> + }
devm_ioremap_resource() returns an ERR_PTR on failure, not NULL.
Also, it already prints messages on errors so you can drop all the
prints around this. Just do
res = platform_get_resource(&pdev->dev, IORESOURCE_MEM, 0);
msm_tlmm_base = devm_ioremap_resource(pdev->dev, res);
if (IS_ERR(msm_tlmm_base))
return ERR_PTR(msm_tlmm_base);
> static int __init msm_gpio_init(void)
> {
> - int rc;
> -
> - rc = platform_driver_register(&msm_gpio_driver);
> - if (!rc) {
> - rc = platform_device_register(&msm_device_gpio);
> - if (rc)
> - platform_driver_unregister(&msm_gpio_driver);
> - }
> -
> - return rc;
> + return platform_driver_register(&msm_gpio_driver);
> }
>
> static void __exit msm_gpio_exit(void)
> {
> - platform_device_unregister(&msm_device_gpio);
> platform_driver_unregister(&msm_gpio_driver);
> }
You could use module_platform_driver here now too.
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/3] gpio: msm: Add device tree and irqdomain support for gpio-msm-v2
2013-05-21 18:32 ` [PATCH 3/3] gpio: msm: Add device tree and irqdomain support for gpio-msm-v2 Rohit Vaswani
2013-05-21 21:06 ` Stephen Boyd
@ 2013-05-22 9:36 ` Stanimir Varbanov
2013-05-22 19:27 ` Rohit Vaswani
1 sibling, 1 reply; 13+ messages in thread
From: Stanimir Varbanov @ 2013-05-22 9:36 UTC (permalink / raw)
To: Rohit Vaswani
Cc: Linus Walleij, Grant Likely, Rob Herring, Rob Landley,
Russell King, David Brown, Bryan Huntsman, linux-doc,
linux-kernel
Hi, Rohit
Thanks for the patch!
On 05/21/2013 09:32 PM, Rohit Vaswani wrote:
> This cleans up the gpio-msm-v2 driver of all the global define usage.
> The number of gpios are now defined in the device tree. This enables
> adding irqdomain support as well.
>
> Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
> ---
<cut>
>
> static DEFINE_SPINLOCK(tlmm_lock);
> @@ -168,18 +173,20 @@ static void msm_gpio_free(struct gpio_chip *chip, unsigned offset)
>
> static int msm_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
> {
> - return MSM_GPIO_TO_INT(chip->base + offset);
> + struct msm_gpio_dev *g_dev = to_msm_gpio_dev(chip);
> + struct irq_domain *domain = g_dev->domain;
> + return irq_create_mapping(domain, offset);
IMO here you should use irq_find_mapping() and create irq mapping once
in .probe. See below comment.
> }
>
<cut>
> -static int msm_gpio_probe(struct platform_device *dev)
> +static struct lock_class_key msm_gpio_lock_class;
> +
> +static int msm_gpio_irq_domain_map(struct irq_domain *d, unsigned int irq,
> + irq_hw_number_t hwirq)
> +{
> + irq_set_lockdep_class(irq, &msm_gpio_lock_class);
> + irq_set_chip_and_handler(irq, &msm_gpio_irq_chip,
> + handle_level_irq);
> + set_irq_flags(irq, IRQF_VALID);
> +
> + return 0;
> +}
> +
> +static const struct irq_domain_ops msm_gpio_irq_domain_ops = {
> + .xlate = irq_domain_xlate_twocell,
> + .map = msm_gpio_irq_domain_map,
> +};
> +
> +static int msm_gpio_irqdomain_init(struct device_node *node, int ngpio)
> {
> - int i, irq, ret;
> + msm_gpio.domain = irq_domain_add_linear(node, ngpio,
> + &msm_gpio_irq_domain_ops, &msm_gpio);
> + if (!msm_gpio.domain) {
> + WARN(1, "Cannot allocate irq_domain\n");
Are you sure that we want to WARN if no memory? I'd return an error and
fail the probe if the driver can't works without interrupts.
> + return -ENOMEM;
> + }
> +
> + return 0;
> +}
> +
> +static int msm_gpio_probe(struct platform_device *pdev)
> +{
> + int i, irq, ret, ngpio;
> + struct resource *res;
> +
> + msm_gpio.gpio_chip.label = pdev->name;
> + msm_gpio.gpio_chip.dev = &pdev->dev;
> + of_property_read_u32(pdev->dev.of_node, "ngpio", &ngpio);
> + msm_gpio.gpio_chip.ngpio = ngpio;
> +
> + res = platform_get_resource(&pdev->dev, IORESOURCE_MEM, 0);
> + if (!res) {
> + dev_err(&pdev->dev, "%s: no mem resource\n", __func__);
> + return -EINVAL;
> + }
> +
> + msm_tlmm_base = devm_ioremap_resource(pdev->dev, res);
> + if (!msm_tlmm_base) {
> + dev_err(&pdev->dev, "Couldn't allocate memory for msm tlmm base\n");
> + return -ENOMEM;
> + }
> +
> + msm_gpio.enabled_irqs = devm_kzalloc(&pdev->dev,
> + sizeof(unsigned long) * ngpio,
> + GFP_KERNEL);
> + msm_gpio.wake_irqs = devm_kzalloc(&pdev->dev,
> + sizeof(unsigned long) * ngpio,
> + GFP_KERNEL);
> + msm_gpio.dual_edge_irqs = devm_kzalloc(&pdev->dev,
> + sizeof(unsigned long) * ngpio,
> + GFP_KERNEL);
> + bitmap_zero(msm_gpio.enabled_irqs, ngpio);
> + bitmap_zero(msm_gpio.wake_irqs, ngpio);
> + bitmap_zero(msm_gpio.dual_edge_irqs, ngpio);
>
> - bitmap_zero(msm_gpio.enabled_irqs, NR_GPIO_IRQS);
> - bitmap_zero(msm_gpio.wake_irqs, NR_GPIO_IRQS);
> - bitmap_zero(msm_gpio.dual_edge_irqs, NR_GPIO_IRQS);
> - msm_gpio.gpio_chip.label = dev->name;
> ret = gpiochip_add(&msm_gpio.gpio_chip);
> - if (ret < 0)
> + if (ret < 0) {
> + dev_err(&pdev->dev, "gpiochip_add failed with error %d\n", ret);
> return ret;
> + }
> +
> + summary_irq = platform_get_irq(pdev, 0);
> + if (summary_irq < 0) {
> + dev_err(&pdev->dev, "No Summary irq defined for msmgpio\n");
> + return summary_irq;
> + }
> +
> + msm_gpio_irqdomain_init(pdev->dev.of_node, msm_gpio.gpio_chip.ngpio);
Adding irqdomain might fail, could you check the return value. And if
irqdomain init fail do we need to set up chained handler for summary_irq
at all?
>
> for (i = 0; i < msm_gpio.gpio_chip.ngpio; ++i) {
> irq = msm_gpio_to_irq(&msm_gpio.gpio_chip, i);
I'd call irq_create_mapping() instead. This way the mapping will be
created once in .probe and use irq_find_mapping() in gpio_to_irq.
> + irq_set_lockdep_class(irq, &msm_gpio_lock_class);
> irq_set_chip_and_handler(irq, &msm_gpio_irq_chip,
> handle_level_irq);
> set_irq_flags(irq, IRQF_VALID);
These three function calls are not needed anymore because
irq_create_mapping() will call internally irqdomain .map operation. The
.map already calls these three functions.
> }
>
> - irq_set_chained_handler(TLMM_SCSS_SUMMARY_IRQ,
> - msm_summary_irq_handler);
> + irq_set_chained_handler(summary_irq, msm_summary_irq_handler);
> +
> return 0;
> }
>
- Stan
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/3] gpio: msm: Add device tree and irqdomain support for gpio-msm-v2
2013-05-22 9:36 ` Stanimir Varbanov
@ 2013-05-22 19:27 ` Rohit Vaswani
0 siblings, 0 replies; 13+ messages in thread
From: Rohit Vaswani @ 2013-05-22 19:27 UTC (permalink / raw)
To: Stanimir Varbanov
Cc: Linus Walleij, Grant Likely, Rob Herring, Rob Landley,
Russell King, David Brown, Bryan Huntsman, linux-doc,
linux-kernel
On 5/22/2013 2:36 AM, Stanimir Varbanov wrote:
> Hi, Rohit
>
> Thanks for the patch!
Thanks for the comments... more below
>
> On 05/21/2013 09:32 PM, Rohit Vaswani wrote:
>> This cleans up the gpio-msm-v2 driver of all the global define usage.
>> The number of gpios are now defined in the device tree. This enables
>> adding irqdomain support as well.
>>
>> Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
>> ---
> <cut>
>
>>
>> static DEFINE_SPINLOCK(tlmm_lock);
>> @@ -168,18 +173,20 @@ static void msm_gpio_free(struct gpio_chip *chip, unsigned offset)
>>
>> static int msm_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
>> {
>> - return MSM_GPIO_TO_INT(chip->base + offset);
>> + struct msm_gpio_dev *g_dev = to_msm_gpio_dev(chip);
>> + struct irq_domain *domain = g_dev->domain;
>> + return irq_create_mapping(domain, offset);
> IMO here you should use irq_find_mapping() and create irq mapping once
> in .probe. See below comment.
Looking at this more, I would prefer to get rid of the entire for loop
and the irq_create_mapping in probe and
just have the irq_create_mapping in msm_gpio_to_irq. This way we are not
allocating a descriptor for every gpio and only for the ones that call
the msm_gpio_to_irq.
>
>> }
>>
> <cut>
>
>> -static int msm_gpio_probe(struct platform_device *dev)
>> +static struct lock_class_key msm_gpio_lock_class;
>> +
>> +static int msm_gpio_irq_domain_map(struct irq_domain *d, unsigned int irq,
>> + irq_hw_number_t hwirq)
>> +{
>> + irq_set_lockdep_class(irq, &msm_gpio_lock_class);
>> + irq_set_chip_and_handler(irq, &msm_gpio_irq_chip,
>> + handle_level_irq);
>> + set_irq_flags(irq, IRQF_VALID);
>> +
>> + return 0;
>> +}
>> +
>> +static const struct irq_domain_ops msm_gpio_irq_domain_ops = {
>> + .xlate = irq_domain_xlate_twocell,
>> + .map = msm_gpio_irq_domain_map,
>> +};
>> +
>> +static int msm_gpio_irqdomain_init(struct device_node *node, int ngpio)
>> {
>> - int i, irq, ret;
>> + msm_gpio.domain = irq_domain_add_linear(node, ngpio,
>> + &msm_gpio_irq_domain_ops, &msm_gpio);
>> + if (!msm_gpio.domain) {
>> + WARN(1, "Cannot allocate irq_domain\n");
> Are you sure that we want to WARN if no memory? I'd return an error and
> fail the probe if the driver can't works without interrupts.
Done.
>
>> + return -ENOMEM;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static int msm_gpio_probe(struct platform_device *pdev)
>> +{
>> + int i, irq, ret, ngpio;
>> + struct resource *res;
>> +
>> + msm_gpio.gpio_chip.label = pdev->name;
>> + msm_gpio.gpio_chip.dev = &pdev->dev;
>> + of_property_read_u32(pdev->dev.of_node, "ngpio", &ngpio);
>> + msm_gpio.gpio_chip.ngpio = ngpio;
>> +
>> + res = platform_get_resource(&pdev->dev, IORESOURCE_MEM, 0);
>> + if (!res) {
>> + dev_err(&pdev->dev, "%s: no mem resource\n", __func__);
>> + return -EINVAL;
>> + }
>> +
>> + msm_tlmm_base = devm_ioremap_resource(pdev->dev, res);
>> + if (!msm_tlmm_base) {
>> + dev_err(&pdev->dev, "Couldn't allocate memory for msm tlmm base\n");
>> + return -ENOMEM;
>> + }
>> +
>> + msm_gpio.enabled_irqs = devm_kzalloc(&pdev->dev,
>> + sizeof(unsigned long) * ngpio,
>> + GFP_KERNEL);
>> + msm_gpio.wake_irqs = devm_kzalloc(&pdev->dev,
>> + sizeof(unsigned long) * ngpio,
>> + GFP_KERNEL);
>> + msm_gpio.dual_edge_irqs = devm_kzalloc(&pdev->dev,
>> + sizeof(unsigned long) * ngpio,
>> + GFP_KERNEL);
>> + bitmap_zero(msm_gpio.enabled_irqs, ngpio);
>> + bitmap_zero(msm_gpio.wake_irqs, ngpio);
>> + bitmap_zero(msm_gpio.dual_edge_irqs, ngpio);
>>
>> - bitmap_zero(msm_gpio.enabled_irqs, NR_GPIO_IRQS);
>> - bitmap_zero(msm_gpio.wake_irqs, NR_GPIO_IRQS);
>> - bitmap_zero(msm_gpio.dual_edge_irqs, NR_GPIO_IRQS);
>> - msm_gpio.gpio_chip.label = dev->name;
>> ret = gpiochip_add(&msm_gpio.gpio_chip);
>> - if (ret < 0)
>> + if (ret < 0) {
>> + dev_err(&pdev->dev, "gpiochip_add failed with error %d\n", ret);
>> return ret;
>> + }
>> +
>> + summary_irq = platform_get_irq(pdev, 0);
>> + if (summary_irq < 0) {
>> + dev_err(&pdev->dev, "No Summary irq defined for msmgpio\n");
>> + return summary_irq;
>> + }
>> +
>> + msm_gpio_irqdomain_init(pdev->dev.of_node, msm_gpio.gpio_chip.ngpio);
> Adding irqdomain might fail, could you check the return value. And if
> irqdomain init fail do we need to set up chained handler for summary_irq
> at all?
Done.
>
>>
>> for (i = 0; i < msm_gpio.gpio_chip.ngpio; ++i) {
>> irq = msm_gpio_to_irq(&msm_gpio.gpio_chip, i);
> I'd call irq_create_mapping() instead. This way the mapping will be
> created once in .probe and use irq_find_mapping() in gpio_to_irq.
Will get rid of this for loop as mentioned above. Thanks for catching this.
>
>> + irq_set_lockdep_class(irq, &msm_gpio_lock_class);
>> irq_set_chip_and_handler(irq, &msm_gpio_irq_chip,
>> handle_level_irq);
>> set_irq_flags(irq, IRQF_VALID);
> These three function calls are not needed anymore because
> irq_create_mapping() will call internally irqdomain .map operation. The
> .map already calls these three functions.
Done.
>
>> }
>>
>> - irq_set_chained_handler(TLMM_SCSS_SUMMARY_IRQ,
>> - msm_summary_irq_handler);
>> + irq_set_chained_handler(summary_irq, msm_summary_irq_handler);
>> +
>> return 0;
>> }
>>
> - Stan
Thanks,
Rohit Vaswani
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/3] gpio: msm: Add device tree and irqdomain support for gpio-msm-v2
2013-05-21 21:06 ` Stephen Boyd
@ 2013-05-22 19:29 ` Rohit Vaswani
0 siblings, 0 replies; 13+ messages in thread
From: Rohit Vaswani @ 2013-05-22 19:29 UTC (permalink / raw)
To: Stephen Boyd
Cc: Linus Walleij, Grant Likely, Rob Herring, Rob Landley,
Russell King, David Brown, Bryan Huntsman, linux-doc,
linux-kernel
On 5/21/2013 2:06 PM, Stephen Boyd wrote:
>> diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
>> index 87d5670..f3c1978 100644
>> --- a/drivers/gpio/Kconfig
>> +++ b/drivers/gpio/Kconfig
>> @@ -165,7 +165,7 @@ config GPIO_MSM_V1
>>
>> config GPIO_MSM_V2
>> tristate "Qualcomm MSM GPIO v2"
>> - depends on GPIOLIB && ARCH_MSM
>> + depends on GPIOLIB && ARCH_MSM && OF
> This doesn't actually rely on ARCH_MSM anymore so I think we can
> drop that dependency.
Done.
>
>> help
>> Say yes here to support the GPIO interface on ARM v7 based
>> Qualcomm MSM chips. Most of the pins on the MSM can be
>> @@ -222,7 +229,6 @@ static void msm_gpio_update_dual_edge_pos(unsigned gpio)
>> else
>> set_gpio_bits(BIT(INTR_POL_CTL), GPIO_INTR_CFG(gpio));
>> val2 = readl(GPIO_IN_OUT(gpio)) & BIT(GPIO_IN);
>> - intstat = readl(GPIO_INTR_STATUS(gpio)) & BIT(INTR_STATUS);
>> if (intstat || val == val2)
> Looks like intstat is used uninitialized now?
Thanks for catching this. Will fix this.
>
>> +
>> +static int msm_gpio_probe(struct platform_device *pdev)
>> +{
>> + int i, irq, ret, ngpio;
>> + struct resource *res;
>> +
>> + msm_gpio.gpio_chip.label = pdev->name;
>> + msm_gpio.gpio_chip.dev = &pdev->dev;
>> + of_property_read_u32(pdev->dev.of_node, "ngpio", &ngpio);
> Fail probe if the property isn't there?
Done.
>
>> + msm_gpio.gpio_chip.ngpio = ngpio;
>> +
>> + res = platform_get_resource(&pdev->dev, IORESOURCE_MEM, 0);
>> + if (!res) {
>> + dev_err(&pdev->dev, "%s: no mem resource\n", __func__);
>> + return -EINVAL;
>> + }
>> +
>> + msm_tlmm_base = devm_ioremap_resource(pdev->dev, res);
>> + if (!msm_tlmm_base) {
>> + dev_err(&pdev->dev, "Couldn't allocate memory for msm tlmm base\n");
>> + return -ENOMEM;
>> + }
> devm_ioremap_resource() returns an ERR_PTR on failure, not NULL.
> Also, it already prints messages on errors so you can drop all the
> prints around this. Just do
>
> res = platform_get_resource(&pdev->dev, IORESOURCE_MEM, 0);
> msm_tlmm_base = devm_ioremap_resource(pdev->dev, res);
> if (IS_ERR(msm_tlmm_base))
> return ERR_PTR(msm_tlmm_base);
>
Done.
>> static int __init msm_gpio_init(void)
>> {
>> - int rc;
>> -
>> - rc = platform_driver_register(&msm_gpio_driver);
>> - if (!rc) {
>> - rc = platform_device_register(&msm_device_gpio);
>> - if (rc)
>> - platform_driver_unregister(&msm_gpio_driver);
>> - }
>> -
>> - return rc;
>> + return platform_driver_register(&msm_gpio_driver);
>> }
>>
>> static void __exit msm_gpio_exit(void)
>> {
>> - platform_device_unregister(&msm_device_gpio);
>> platform_driver_unregister(&msm_gpio_driver);
>> }
> You could use module_platform_driver here now too.
>
Done. Thanks for the comments.
Thanks,
Rohit Vaswani
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/3] ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs
2013-05-21 18:32 ` [PATCH 1/3] ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs Rohit Vaswani
@ 2013-05-30 17:53 ` Linus Walleij
0 siblings, 0 replies; 13+ messages in thread
From: Linus Walleij @ 2013-05-30 17:53 UTC (permalink / raw)
To: Rohit Vaswani
Cc: David Brown, Daniel Walker, Bryan Huntsman, Russell King,
Grant Likely, linux-arm-msm, linux-kernel
On Tue, May 21, 2013 at 8:32 PM, Rohit Vaswani <rvaswani@codeaurora.org> wrote:
> Remove gpiomux-v2 as it's not being used and make way for future improvements.
>
> Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
OK less problems in my world -> good.
Acked-by: Linus Walleij <linus.walleij@linaro.org>
I hope "future improvements" mean "we're switching to pin control".
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/3] Cleanup MSM_GPIOMUX and add device-tree support for
2013-05-21 18:32 [PATCH 0/3] Cleanup MSM_GPIOMUX and add device-tree support for Rohit Vaswani
` (2 preceding siblings ...)
2013-05-21 18:32 ` [PATCH 3/3] gpio: msm: Add device tree and irqdomain support for gpio-msm-v2 Rohit Vaswani
@ 2013-05-30 17:54 ` Linus Walleij
3 siblings, 0 replies; 13+ messages in thread
From: Linus Walleij @ 2013-05-30 17:54 UTC (permalink / raw)
To: Rohit Vaswani
Cc: David Brown, Daniel Walker, Bryan Huntsman, Russell King,
Grant Likely, linux-arm-msm, linux-kernel
On Tue, May 21, 2013 at 8:32 PM, Rohit Vaswani <rvaswani@codeaurora.org> wrote:
> Hi Linus,
> Could this series go through David's tree or is there a better way to do this?
> It would be great if I can have you ack for the gpio patch.
Yep ACKed, go ahead.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/3] gpio: msm: Add device tree and irqdomain support for gpio-msm-v2
2013-06-10 22:50 ` [PATCH 3/3] gpio: msm: Add device tree and irqdomain support for gpio-msm-v2 Rohit Vaswani
@ 2013-06-11 12:45 ` Grant Likely
0 siblings, 0 replies; 13+ messages in thread
From: Grant Likely @ 2013-06-11 12:45 UTC (permalink / raw)
To: Linus Walleij
Cc: Rohit Vaswani, Rob Herring, Rob Landley, Russell King,
David Brown, Bryan Huntsman, linux-doc, linux-kernel,
linux-arm-msm
On Mon, 10 Jun 2013 15:50:21 -0700, Rohit Vaswani <rvaswani@codeaurora.org> wrote:
> This cleans up the gpio-msm-v2 driver of all the global define usage.
> The number of gpios are now defined in the device tree. This enables
> adding irqdomain support as well.
>
> Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
Looks good to me. Go ahead and take it through the same tree as patches
1/3 and 2/3 with my ack since it appears that the patches need to be
applied together.
Acked-by: Grant Likely <grant.likely@linaro.org>
g.
> ---
> .../devicetree/bindings/gpio/gpio-msm.txt | 26 +++
> arch/arm/boot/dts/msm8660-surf.dts | 11 ++
> arch/arm/boot/dts/msm8960-cdp.dts | 11 ++
> drivers/gpio/Kconfig | 2 +-
> drivers/gpio/gpio-msm-v2.c | 190 ++++++++++++--------
> 5 files changed, 162 insertions(+), 78 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/gpio/gpio-msm.txt
>
> diff --git a/Documentation/devicetree/bindings/gpio/gpio-msm.txt b/Documentation/devicetree/bindings/gpio/gpio-msm.txt
> new file mode 100644
> index 0000000..ac20e68
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/gpio/gpio-msm.txt
> @@ -0,0 +1,26 @@
> +MSM GPIO controller bindings
> +
> +Required properties:
> +- compatible:
> + - "qcom,msm-gpio" for MSM controllers
> +- #gpio-cells : Should be two.
> + - first cell is the pin number
> + - second cell is used to specify optional parameters (unused)
> +- gpio-controller : Marks the device node as a GPIO controller.
> +- #interrupt-cells : Should be 2.
> +- interrupt-controller: Mark the device node as an interrupt controller
> +- interrupts : Specify the TLMM summary interrupt number
> +- ngpio : Specify the number of MSM GPIOs
> +
> +Example:
> +
> + msmgpio: gpio@fd510000 {
> + compatible = "qcom,msm-gpio";
> + gpio-controller;
> + #gpio-cells = <2>;
> + interrupt-controller;
> + #interrupt-cells = <2>;
> + reg = <0xfd510000 0x4000>;
> + interrupts = <0 208 0>;
> + ngpio = <150>;
> + };
> diff --git a/arch/arm/boot/dts/msm8660-surf.dts b/arch/arm/boot/dts/msm8660-surf.dts
> index 9bf49b3..8931906 100644
> --- a/arch/arm/boot/dts/msm8660-surf.dts
> +++ b/arch/arm/boot/dts/msm8660-surf.dts
> @@ -26,6 +26,17 @@
> cpu-offset = <0x40000>;
> };
>
> + msmgpio: gpio@800000 {
> + compatible = "qcom,msm-gpio";
> + reg = <0x00800000 0x1000>;
> + gpio-controller;
> + #gpio-cells = <2>;
> + ngpio = <173>;
> + interrupts = <0 32 0x4>;
> + interrupt-controller;
> + #interrupt-cells = <2>;
> + };
> +
> serial@19c400000 {
> compatible = "qcom,msm-hsuart", "qcom,msm-uart";
> reg = <0x19c40000 0x1000>,
> diff --git a/arch/arm/boot/dts/msm8960-cdp.dts b/arch/arm/boot/dts/msm8960-cdp.dts
> index 2e4d87a..52fe253 100644
> --- a/arch/arm/boot/dts/msm8960-cdp.dts
> +++ b/arch/arm/boot/dts/msm8960-cdp.dts
> @@ -26,6 +26,17 @@
> cpu-offset = <0x80000>;
> };
>
> + msmgpio: gpio@fd510000 {
> + compatible = "qcom,msm-gpio";
> + gpio-controller;
> + #gpio-cells = <2>;
> + ngpio = <150>;
> + interrupts = <0 32 0x4>;
> + interrupt-controller;
> + #interrupt-cells = <2>;
> + reg = <0xfd510000 0x4000>;
> + };
> +
> serial@19c400000 {
> compatible = "qcom,msm-hsuart", "qcom,msm-uart";
> reg = <0x16440000 0x1000>,
> diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
> index 87d5670..6d61a12 100644
> --- a/drivers/gpio/Kconfig
> +++ b/drivers/gpio/Kconfig
> @@ -165,7 +165,7 @@ config GPIO_MSM_V1
>
> config GPIO_MSM_V2
> tristate "Qualcomm MSM GPIO v2"
> - depends on GPIOLIB && ARCH_MSM
> + depends on GPIOLIB && OF && ARCH_MSM
> help
> Say yes here to support the GPIO interface on ARM v7 based
> Qualcomm MSM chips. Most of the pins on the MSM can be
> diff --git a/drivers/gpio/gpio-msm-v2.c b/drivers/gpio/gpio-msm-v2.c
> index 75cc821..f4491a4 100644
> --- a/drivers/gpio/gpio-msm-v2.c
> +++ b/drivers/gpio/gpio-msm-v2.c
> @@ -19,17 +19,21 @@
>
> #include <linux/bitmap.h>
> #include <linux/bitops.h>
> +#include <linux/err.h>
> #include <linux/gpio.h>
> #include <linux/init.h>
> #include <linux/interrupt.h>
> #include <linux/io.h>
> #include <linux/irqchip/chained_irq.h>
> #include <linux/irq.h>
> +#include <linux/irqdomain.h>
> #include <linux/module.h>
> +#include <linux/of_address.h>
> #include <linux/platform_device.h>
> #include <linux/spinlock.h>
> +#include <linux/slab.h>
>
> -#include <mach/msm_iomap.h>
> +#define MAX_NR_GPIO 300
>
> /* Bits of interest in the GPIO_IN_OUT register.
> */
> @@ -76,13 +80,6 @@ enum {
> TARGET_PROC_NONE = 7,
> };
>
> -
> -#define GPIO_INTR_CFG_SU(gpio) (MSM_TLMM_BASE + 0x0400 + (0x04 * (gpio)))
> -#define GPIO_CONFIG(gpio) (MSM_TLMM_BASE + 0x1000 + (0x10 * (gpio)))
> -#define GPIO_IN_OUT(gpio) (MSM_TLMM_BASE + 0x1004 + (0x10 * (gpio)))
> -#define GPIO_INTR_CFG(gpio) (MSM_TLMM_BASE + 0x1008 + (0x10 * (gpio)))
> -#define GPIO_INTR_STATUS(gpio) (MSM_TLMM_BASE + 0x100c + (0x10 * (gpio)))
> -
> /**
> * struct msm_gpio_dev: the MSM8660 SoC GPIO device structure
> *
> @@ -101,11 +98,27 @@ enum {
> */
> struct msm_gpio_dev {
> struct gpio_chip gpio_chip;
> - DECLARE_BITMAP(enabled_irqs, NR_GPIO_IRQS);
> - DECLARE_BITMAP(wake_irqs, NR_GPIO_IRQS);
> - DECLARE_BITMAP(dual_edge_irqs, NR_GPIO_IRQS);
> + DECLARE_BITMAP(enabled_irqs, MAX_NR_GPIO);
> + DECLARE_BITMAP(wake_irqs, MAX_NR_GPIO);
> + DECLARE_BITMAP(dual_edge_irqs, MAX_NR_GPIO);
> + struct irq_domain *domain;
> + unsigned int summary_irq;
> + void __iomem *msm_tlmm_base;
> };
>
> +struct msm_gpio_dev msm_gpio;
As commented before; this is okay for now, but you should have a
follow-on patch to make msm_gpio allocated dymically in the probe
function.
> +
> +#define GPIO_INTR_CFG_SU(gpio) (msm_gpio.msm_tlmm_base + 0x0400 + \
> + (0x04 * (gpio)))
> +#define GPIO_CONFIG(gpio) (msm_gpio.msm_tlmm_base + 0x1000 + \
> + (0x10 * (gpio)))
> +#define GPIO_IN_OUT(gpio) (msm_gpio.msm_tlmm_base + 0x1004 + \
> + (0x10 * (gpio)))
> +#define GPIO_INTR_CFG(gpio) (msm_gpio.msm_tlmm_base + 0x1008 + \
> + (0x10 * (gpio)))
> +#define GPIO_INTR_STATUS(gpio) (msm_gpio.msm_tlmm_base + 0x100c + \
> + (0x10 * (gpio)))
> +
> static DEFINE_SPINLOCK(tlmm_lock);
>
> static inline struct msm_gpio_dev *to_msm_gpio_dev(struct gpio_chip *chip)
> @@ -168,27 +181,19 @@ static void msm_gpio_free(struct gpio_chip *chip, unsigned offset)
>
> static int msm_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
> {
> - return MSM_GPIO_TO_INT(chip->base + offset);
> + struct msm_gpio_dev *g_dev = to_msm_gpio_dev(chip);
> + struct irq_domain *domain = g_dev->domain;
> +
> + return irq_create_mapping(domain, offset);
> }
>
> static inline int msm_irq_to_gpio(struct gpio_chip *chip, unsigned irq)
> {
> - return irq - MSM_GPIO_TO_INT(chip->base);
> + struct irq_data *irq_data = irq_get_irq_data(irq);
> +
> + return irq_data->hwirq;
> }
>
> -static struct msm_gpio_dev msm_gpio = {
> - .gpio_chip = {
> - .base = 0,
> - .ngpio = NR_GPIO_IRQS,
> - .direction_input = msm_gpio_direction_input,
> - .direction_output = msm_gpio_direction_output,
> - .get = msm_gpio_get,
> - .set = msm_gpio_set,
> - .to_irq = msm_gpio_to_irq,
> - .request = msm_gpio_request,
> - .free = msm_gpio_free,
> - },
> -};
This block has been deleted and replaced by open-coding the assignments
in msm_gpio_probe(). It is true that some of the values need to be set
at runtime (.ngpio for example), but the majority of them
>
> /* For dual-edge interrupts in software, since the hardware has no
> * such support:
> @@ -226,9 +231,9 @@ static void msm_gpio_update_dual_edge_pos(unsigned gpio)
> if (intstat || val == val2)
> return;
> } while (loop_limit-- > 0);
> - pr_err("dual-edge irq failed to stabilize, "
> + pr_err("%s: dual-edge irq failed to stabilize, "
> "interrupts dropped. %#08x != %#08x\n",
> - val, val2);
> + __func__, val, val2);
> }
>
> static void msm_gpio_irq_ack(struct irq_data *d)
> @@ -315,10 +320,10 @@ static void msm_summary_irq_handler(unsigned int irq, struct irq_desc *desc)
>
> chained_irq_enter(chip, desc);
>
> - for_each_set_bit(i, msm_gpio.enabled_irqs, NR_GPIO_IRQS) {
> + for_each_set_bit(i, msm_gpio.enabled_irqs, MAX_NR_GPIO) {
> if (readl(GPIO_INTR_STATUS(i)) & BIT(INTR_STATUS))
> - generic_handle_irq(msm_gpio_to_irq(&msm_gpio.gpio_chip,
> - i));
> + generic_handle_irq(irq_find_mapping(msm_gpio.domain,
> + i));
> }
>
> chained_irq_exit(chip, desc);
> @@ -329,13 +334,13 @@ static int msm_gpio_irq_set_wake(struct irq_data *d, unsigned int on)
> int gpio = msm_irq_to_gpio(&msm_gpio.gpio_chip, d->irq);
>
> if (on) {
> - if (bitmap_empty(msm_gpio.wake_irqs, NR_GPIO_IRQS))
> - irq_set_irq_wake(TLMM_SCSS_SUMMARY_IRQ, 1);
> + if (bitmap_empty(msm_gpio.wake_irqs, MAX_NR_GPIO))
> + irq_set_irq_wake(msm_gpio.summary_irq, 1);
> set_bit(gpio, msm_gpio.wake_irqs);
> } else {
> clear_bit(gpio, msm_gpio.wake_irqs);
> - if (bitmap_empty(msm_gpio.wake_irqs, NR_GPIO_IRQS))
> - irq_set_irq_wake(TLMM_SCSS_SUMMARY_IRQ, 0);
> + if (bitmap_empty(msm_gpio.wake_irqs, MAX_NR_GPIO))
> + irq_set_irq_wake(msm_gpio.summary_irq, 0);
> }
>
> return 0;
> @@ -350,30 +355,86 @@ static struct irq_chip msm_gpio_irq_chip = {
> .irq_set_wake = msm_gpio_irq_set_wake,
> };
>
> -static int msm_gpio_probe(struct platform_device *dev)
> +static struct lock_class_key msm_gpio_lock_class;
> +
> +static int msm_gpio_irq_domain_map(struct irq_domain *d, unsigned int irq,
> + irq_hw_number_t hwirq)
> +{
> + irq_set_lockdep_class(irq, &msm_gpio_lock_class);
> + irq_set_chip_and_handler(irq, &msm_gpio_irq_chip,
> + handle_level_irq);
> + set_irq_flags(irq, IRQF_VALID);
> +
> + return 0;
> +}
> +
> +static const struct irq_domain_ops msm_gpio_irq_domain_ops = {
> + .xlate = irq_domain_xlate_twocell,
> + .map = msm_gpio_irq_domain_map,
> +};
> +
> +static int msm_gpio_probe(struct platform_device *pdev)
> {
> - int i, irq, ret;
> + int ret, ngpio;
> + struct resource *res;
> +
> + if (!of_property_read_u32(pdev->dev.of_node, "ngpio", &ngpio)) {
> + dev_err(&pdev->dev, "%s: ngpio property missing\n", __func__);
> + return -EINVAL;
> + }
> +
> + if (ngpio > MAX_NR_GPIO)
> + WARN(1, "ngpio exceeds the MAX_NR_GPIO. Increase MAX_NR_GPIO\n");
> +
> + bitmap_zero(msm_gpio.enabled_irqs, MAX_NR_GPIO);
> + bitmap_zero(msm_gpio.wake_irqs, MAX_NR_GPIO);
> + bitmap_zero(msm_gpio.dual_edge_irqs, MAX_NR_GPIO);
> +
> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + msm_gpio.msm_tlmm_base = devm_ioremap_resource(&pdev->dev, res);
> + if (IS_ERR(msm_gpio.msm_tlmm_base))
> + return PTR_ERR(msm_gpio.msm_tlmm_base);
> +
> + msm_gpio.gpio_chip.ngpio = ngpio;
> + msm_gpio.gpio_chip.label = pdev->name;
> + msm_gpio.gpio_chip.dev = &pdev->dev;
> + msm_gpio.gpio_chip.base = 0;
> + msm_gpio.gpio_chip.direction_input = msm_gpio_direction_input;
> + msm_gpio.gpio_chip.direction_output = msm_gpio_direction_output;
> + msm_gpio.gpio_chip.get = msm_gpio_get;
> + msm_gpio.gpio_chip.set = msm_gpio_set;
> + msm_gpio.gpio_chip.to_irq = msm_gpio_to_irq;
> + msm_gpio.gpio_chip.request = msm_gpio_request;
> + msm_gpio.gpio_chip.free = msm_gpio_free;
>
> - bitmap_zero(msm_gpio.enabled_irqs, NR_GPIO_IRQS);
> - bitmap_zero(msm_gpio.wake_irqs, NR_GPIO_IRQS);
> - bitmap_zero(msm_gpio.dual_edge_irqs, NR_GPIO_IRQS);
> - msm_gpio.gpio_chip.label = dev->name;
> ret = gpiochip_add(&msm_gpio.gpio_chip);
> - if (ret < 0)
> + if (ret < 0) {
> + dev_err(&pdev->dev, "gpiochip_add failed with error %d\n", ret);
> return ret;
> + }
>
> - for (i = 0; i < msm_gpio.gpio_chip.ngpio; ++i) {
> - irq = msm_gpio_to_irq(&msm_gpio.gpio_chip, i);
> - irq_set_chip_and_handler(irq, &msm_gpio_irq_chip,
> - handle_level_irq);
> - set_irq_flags(irq, IRQF_VALID);
> + msm_gpio.summary_irq = platform_get_irq(pdev, 0);
> + if (msm_gpio.summary_irq < 0) {
> + dev_err(&pdev->dev, "No Summary irq defined for msmgpio\n");
> + return msm_gpio.summary_irq;
> }
>
> - irq_set_chained_handler(TLMM_SCSS_SUMMARY_IRQ,
> - msm_summary_irq_handler);
> + msm_gpio.domain = irq_domain_add_linear(pdev->dev.of_node, ngpio,
> + &msm_gpio_irq_domain_ops,
> + &msm_gpio);
> + if (!msm_gpio.domain)
> + return -ENODEV;
> +
> + irq_set_chained_handler(msm_gpio.summary_irq, msm_summary_irq_handler);
> +
> return 0;
> }
>
> +static struct of_device_id msm_gpio_of_match[] = {
> + { .compatible = "qcom,msm-gpio", },
> + { },
> +};
> +
> static int msm_gpio_remove(struct platform_device *dev)
> {
> int ret = gpiochip_remove(&msm_gpio.gpio_chip);
> @@ -381,7 +442,7 @@ static int msm_gpio_remove(struct platform_device *dev)
> if (ret < 0)
> return ret;
>
> - irq_set_handler(TLMM_SCSS_SUMMARY_IRQ, NULL);
> + irq_set_handler(msm_gpio.summary_irq, NULL);
>
> return 0;
> }
> @@ -392,36 +453,11 @@ static struct platform_driver msm_gpio_driver = {
> .driver = {
> .name = "msmgpio",
> .owner = THIS_MODULE,
> + .of_match_table = msm_gpio_of_match,
> },
> };
>
> -static struct platform_device msm_device_gpio = {
> - .name = "msmgpio",
> - .id = -1,
> -};
> -
> -static int __init msm_gpio_init(void)
> -{
> - int rc;
> -
> - rc = platform_driver_register(&msm_gpio_driver);
> - if (!rc) {
> - rc = platform_device_register(&msm_device_gpio);
> - if (rc)
> - platform_driver_unregister(&msm_gpio_driver);
> - }
> -
> - return rc;
> -}
> -
> -static void __exit msm_gpio_exit(void)
> -{
> - platform_device_unregister(&msm_device_gpio);
> - platform_driver_unregister(&msm_gpio_driver);
> -}
> -
> -postcore_initcall(msm_gpio_init);
> -module_exit(msm_gpio_exit);
> +module_platform_driver(msm_gpio_driver)
>
> MODULE_AUTHOR("Gregory Bean <gbean@codeaurora.org>");
> MODULE_DESCRIPTION("Driver for Qualcomm MSM TLMMv2 SoC GPIOs");
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> hosted by The Linux Foundation
>
--
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies, Ltd.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/3] gpio: msm: Add device tree and irqdomain support for gpio-msm-v2
@ 2013-06-11 12:45 ` Grant Likely
0 siblings, 0 replies; 13+ messages in thread
From: Grant Likely @ 2013-06-11 12:45 UTC (permalink / raw)
To: Rohit Vaswani, Linus Walleij
Cc: Rohit Vaswani, Rob Herring, Rob Landley, Russell King,
David Brown, Bryan Huntsman, linux-doc, linux-kernel,
linux-arm-msm
On Mon, 10 Jun 2013 15:50:21 -0700, Rohit Vaswani <rvaswani@codeaurora.org> wrote:
> This cleans up the gpio-msm-v2 driver of all the global define usage.
> The number of gpios are now defined in the device tree. This enables
> adding irqdomain support as well.
>
> Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
Looks good to me. Go ahead and take it through the same tree as patches
1/3 and 2/3 with my ack since it appears that the patches need to be
applied together.
Acked-by: Grant Likely <grant.likely@linaro.org>
g.
> ---
> .../devicetree/bindings/gpio/gpio-msm.txt | 26 +++
> arch/arm/boot/dts/msm8660-surf.dts | 11 ++
> arch/arm/boot/dts/msm8960-cdp.dts | 11 ++
> drivers/gpio/Kconfig | 2 +-
> drivers/gpio/gpio-msm-v2.c | 190 ++++++++++++--------
> 5 files changed, 162 insertions(+), 78 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/gpio/gpio-msm.txt
>
> diff --git a/Documentation/devicetree/bindings/gpio/gpio-msm.txt b/Documentation/devicetree/bindings/gpio/gpio-msm.txt
> new file mode 100644
> index 0000000..ac20e68
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/gpio/gpio-msm.txt
> @@ -0,0 +1,26 @@
> +MSM GPIO controller bindings
> +
> +Required properties:
> +- compatible:
> + - "qcom,msm-gpio" for MSM controllers
> +- #gpio-cells : Should be two.
> + - first cell is the pin number
> + - second cell is used to specify optional parameters (unused)
> +- gpio-controller : Marks the device node as a GPIO controller.
> +- #interrupt-cells : Should be 2.
> +- interrupt-controller: Mark the device node as an interrupt controller
> +- interrupts : Specify the TLMM summary interrupt number
> +- ngpio : Specify the number of MSM GPIOs
> +
> +Example:
> +
> + msmgpio: gpio@fd510000 {
> + compatible = "qcom,msm-gpio";
> + gpio-controller;
> + #gpio-cells = <2>;
> + interrupt-controller;
> + #interrupt-cells = <2>;
> + reg = <0xfd510000 0x4000>;
> + interrupts = <0 208 0>;
> + ngpio = <150>;
> + };
> diff --git a/arch/arm/boot/dts/msm8660-surf.dts b/arch/arm/boot/dts/msm8660-surf.dts
> index 9bf49b3..8931906 100644
> --- a/arch/arm/boot/dts/msm8660-surf.dts
> +++ b/arch/arm/boot/dts/msm8660-surf.dts
> @@ -26,6 +26,17 @@
> cpu-offset = <0x40000>;
> };
>
> + msmgpio: gpio@800000 {
> + compatible = "qcom,msm-gpio";
> + reg = <0x00800000 0x1000>;
> + gpio-controller;
> + #gpio-cells = <2>;
> + ngpio = <173>;
> + interrupts = <0 32 0x4>;
> + interrupt-controller;
> + #interrupt-cells = <2>;
> + };
> +
> serial@19c400000 {
> compatible = "qcom,msm-hsuart", "qcom,msm-uart";
> reg = <0x19c40000 0x1000>,
> diff --git a/arch/arm/boot/dts/msm8960-cdp.dts b/arch/arm/boot/dts/msm8960-cdp.dts
> index 2e4d87a..52fe253 100644
> --- a/arch/arm/boot/dts/msm8960-cdp.dts
> +++ b/arch/arm/boot/dts/msm8960-cdp.dts
> @@ -26,6 +26,17 @@
> cpu-offset = <0x80000>;
> };
>
> + msmgpio: gpio@fd510000 {
> + compatible = "qcom,msm-gpio";
> + gpio-controller;
> + #gpio-cells = <2>;
> + ngpio = <150>;
> + interrupts = <0 32 0x4>;
> + interrupt-controller;
> + #interrupt-cells = <2>;
> + reg = <0xfd510000 0x4000>;
> + };
> +
> serial@19c400000 {
> compatible = "qcom,msm-hsuart", "qcom,msm-uart";
> reg = <0x16440000 0x1000>,
> diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
> index 87d5670..6d61a12 100644
> --- a/drivers/gpio/Kconfig
> +++ b/drivers/gpio/Kconfig
> @@ -165,7 +165,7 @@ config GPIO_MSM_V1
>
> config GPIO_MSM_V2
> tristate "Qualcomm MSM GPIO v2"
> - depends on GPIOLIB && ARCH_MSM
> + depends on GPIOLIB && OF && ARCH_MSM
> help
> Say yes here to support the GPIO interface on ARM v7 based
> Qualcomm MSM chips. Most of the pins on the MSM can be
> diff --git a/drivers/gpio/gpio-msm-v2.c b/drivers/gpio/gpio-msm-v2.c
> index 75cc821..f4491a4 100644
> --- a/drivers/gpio/gpio-msm-v2.c
> +++ b/drivers/gpio/gpio-msm-v2.c
> @@ -19,17 +19,21 @@
>
> #include <linux/bitmap.h>
> #include <linux/bitops.h>
> +#include <linux/err.h>
> #include <linux/gpio.h>
> #include <linux/init.h>
> #include <linux/interrupt.h>
> #include <linux/io.h>
> #include <linux/irqchip/chained_irq.h>
> #include <linux/irq.h>
> +#include <linux/irqdomain.h>
> #include <linux/module.h>
> +#include <linux/of_address.h>
> #include <linux/platform_device.h>
> #include <linux/spinlock.h>
> +#include <linux/slab.h>
>
> -#include <mach/msm_iomap.h>
> +#define MAX_NR_GPIO 300
>
> /* Bits of interest in the GPIO_IN_OUT register.
> */
> @@ -76,13 +80,6 @@ enum {
> TARGET_PROC_NONE = 7,
> };
>
> -
> -#define GPIO_INTR_CFG_SU(gpio) (MSM_TLMM_BASE + 0x0400 + (0x04 * (gpio)))
> -#define GPIO_CONFIG(gpio) (MSM_TLMM_BASE + 0x1000 + (0x10 * (gpio)))
> -#define GPIO_IN_OUT(gpio) (MSM_TLMM_BASE + 0x1004 + (0x10 * (gpio)))
> -#define GPIO_INTR_CFG(gpio) (MSM_TLMM_BASE + 0x1008 + (0x10 * (gpio)))
> -#define GPIO_INTR_STATUS(gpio) (MSM_TLMM_BASE + 0x100c + (0x10 * (gpio)))
> -
> /**
> * struct msm_gpio_dev: the MSM8660 SoC GPIO device structure
> *
> @@ -101,11 +98,27 @@ enum {
> */
> struct msm_gpio_dev {
> struct gpio_chip gpio_chip;
> - DECLARE_BITMAP(enabled_irqs, NR_GPIO_IRQS);
> - DECLARE_BITMAP(wake_irqs, NR_GPIO_IRQS);
> - DECLARE_BITMAP(dual_edge_irqs, NR_GPIO_IRQS);
> + DECLARE_BITMAP(enabled_irqs, MAX_NR_GPIO);
> + DECLARE_BITMAP(wake_irqs, MAX_NR_GPIO);
> + DECLARE_BITMAP(dual_edge_irqs, MAX_NR_GPIO);
> + struct irq_domain *domain;
> + unsigned int summary_irq;
> + void __iomem *msm_tlmm_base;
> };
>
> +struct msm_gpio_dev msm_gpio;
As commented before; this is okay for now, but you should have a
follow-on patch to make msm_gpio allocated dymically in the probe
function.
> +
> +#define GPIO_INTR_CFG_SU(gpio) (msm_gpio.msm_tlmm_base + 0x0400 + \
> + (0x04 * (gpio)))
> +#define GPIO_CONFIG(gpio) (msm_gpio.msm_tlmm_base + 0x1000 + \
> + (0x10 * (gpio)))
> +#define GPIO_IN_OUT(gpio) (msm_gpio.msm_tlmm_base + 0x1004 + \
> + (0x10 * (gpio)))
> +#define GPIO_INTR_CFG(gpio) (msm_gpio.msm_tlmm_base + 0x1008 + \
> + (0x10 * (gpio)))
> +#define GPIO_INTR_STATUS(gpio) (msm_gpio.msm_tlmm_base + 0x100c + \
> + (0x10 * (gpio)))
> +
> static DEFINE_SPINLOCK(tlmm_lock);
>
> static inline struct msm_gpio_dev *to_msm_gpio_dev(struct gpio_chip *chip)
> @@ -168,27 +181,19 @@ static void msm_gpio_free(struct gpio_chip *chip, unsigned offset)
>
> static int msm_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
> {
> - return MSM_GPIO_TO_INT(chip->base + offset);
> + struct msm_gpio_dev *g_dev = to_msm_gpio_dev(chip);
> + struct irq_domain *domain = g_dev->domain;
> +
> + return irq_create_mapping(domain, offset);
> }
>
> static inline int msm_irq_to_gpio(struct gpio_chip *chip, unsigned irq)
> {
> - return irq - MSM_GPIO_TO_INT(chip->base);
> + struct irq_data *irq_data = irq_get_irq_data(irq);
> +
> + return irq_data->hwirq;
> }
>
> -static struct msm_gpio_dev msm_gpio = {
> - .gpio_chip = {
> - .base = 0,
> - .ngpio = NR_GPIO_IRQS,
> - .direction_input = msm_gpio_direction_input,
> - .direction_output = msm_gpio_direction_output,
> - .get = msm_gpio_get,
> - .set = msm_gpio_set,
> - .to_irq = msm_gpio_to_irq,
> - .request = msm_gpio_request,
> - .free = msm_gpio_free,
> - },
> -};
This block has been deleted and replaced by open-coding the assignments
in msm_gpio_probe(). It is true that some of the values need to be set
at runtime (.ngpio for example), but the majority of them
>
> /* For dual-edge interrupts in software, since the hardware has no
> * such support:
> @@ -226,9 +231,9 @@ static void msm_gpio_update_dual_edge_pos(unsigned gpio)
> if (intstat || val == val2)
> return;
> } while (loop_limit-- > 0);
> - pr_err("dual-edge irq failed to stabilize, "
> + pr_err("%s: dual-edge irq failed to stabilize, "
> "interrupts dropped. %#08x != %#08x\n",
> - val, val2);
> + __func__, val, val2);
> }
>
> static void msm_gpio_irq_ack(struct irq_data *d)
> @@ -315,10 +320,10 @@ static void msm_summary_irq_handler(unsigned int irq, struct irq_desc *desc)
>
> chained_irq_enter(chip, desc);
>
> - for_each_set_bit(i, msm_gpio.enabled_irqs, NR_GPIO_IRQS) {
> + for_each_set_bit(i, msm_gpio.enabled_irqs, MAX_NR_GPIO) {
> if (readl(GPIO_INTR_STATUS(i)) & BIT(INTR_STATUS))
> - generic_handle_irq(msm_gpio_to_irq(&msm_gpio.gpio_chip,
> - i));
> + generic_handle_irq(irq_find_mapping(msm_gpio.domain,
> + i));
> }
>
> chained_irq_exit(chip, desc);
> @@ -329,13 +334,13 @@ static int msm_gpio_irq_set_wake(struct irq_data *d, unsigned int on)
> int gpio = msm_irq_to_gpio(&msm_gpio.gpio_chip, d->irq);
>
> if (on) {
> - if (bitmap_empty(msm_gpio.wake_irqs, NR_GPIO_IRQS))
> - irq_set_irq_wake(TLMM_SCSS_SUMMARY_IRQ, 1);
> + if (bitmap_empty(msm_gpio.wake_irqs, MAX_NR_GPIO))
> + irq_set_irq_wake(msm_gpio.summary_irq, 1);
> set_bit(gpio, msm_gpio.wake_irqs);
> } else {
> clear_bit(gpio, msm_gpio.wake_irqs);
> - if (bitmap_empty(msm_gpio.wake_irqs, NR_GPIO_IRQS))
> - irq_set_irq_wake(TLMM_SCSS_SUMMARY_IRQ, 0);
> + if (bitmap_empty(msm_gpio.wake_irqs, MAX_NR_GPIO))
> + irq_set_irq_wake(msm_gpio.summary_irq, 0);
> }
>
> return 0;
> @@ -350,30 +355,86 @@ static struct irq_chip msm_gpio_irq_chip = {
> .irq_set_wake = msm_gpio_irq_set_wake,
> };
>
> -static int msm_gpio_probe(struct platform_device *dev)
> +static struct lock_class_key msm_gpio_lock_class;
> +
> +static int msm_gpio_irq_domain_map(struct irq_domain *d, unsigned int irq,
> + irq_hw_number_t hwirq)
> +{
> + irq_set_lockdep_class(irq, &msm_gpio_lock_class);
> + irq_set_chip_and_handler(irq, &msm_gpio_irq_chip,
> + handle_level_irq);
> + set_irq_flags(irq, IRQF_VALID);
> +
> + return 0;
> +}
> +
> +static const struct irq_domain_ops msm_gpio_irq_domain_ops = {
> + .xlate = irq_domain_xlate_twocell,
> + .map = msm_gpio_irq_domain_map,
> +};
> +
> +static int msm_gpio_probe(struct platform_device *pdev)
> {
> - int i, irq, ret;
> + int ret, ngpio;
> + struct resource *res;
> +
> + if (!of_property_read_u32(pdev->dev.of_node, "ngpio", &ngpio)) {
> + dev_err(&pdev->dev, "%s: ngpio property missing\n", __func__);
> + return -EINVAL;
> + }
> +
> + if (ngpio > MAX_NR_GPIO)
> + WARN(1, "ngpio exceeds the MAX_NR_GPIO. Increase MAX_NR_GPIO\n");
> +
> + bitmap_zero(msm_gpio.enabled_irqs, MAX_NR_GPIO);
> + bitmap_zero(msm_gpio.wake_irqs, MAX_NR_GPIO);
> + bitmap_zero(msm_gpio.dual_edge_irqs, MAX_NR_GPIO);
> +
> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + msm_gpio.msm_tlmm_base = devm_ioremap_resource(&pdev->dev, res);
> + if (IS_ERR(msm_gpio.msm_tlmm_base))
> + return PTR_ERR(msm_gpio.msm_tlmm_base);
> +
> + msm_gpio.gpio_chip.ngpio = ngpio;
> + msm_gpio.gpio_chip.label = pdev->name;
> + msm_gpio.gpio_chip.dev = &pdev->dev;
> + msm_gpio.gpio_chip.base = 0;
> + msm_gpio.gpio_chip.direction_input = msm_gpio_direction_input;
> + msm_gpio.gpio_chip.direction_output = msm_gpio_direction_output;
> + msm_gpio.gpio_chip.get = msm_gpio_get;
> + msm_gpio.gpio_chip.set = msm_gpio_set;
> + msm_gpio.gpio_chip.to_irq = msm_gpio_to_irq;
> + msm_gpio.gpio_chip.request = msm_gpio_request;
> + msm_gpio.gpio_chip.free = msm_gpio_free;
>
> - bitmap_zero(msm_gpio.enabled_irqs, NR_GPIO_IRQS);
> - bitmap_zero(msm_gpio.wake_irqs, NR_GPIO_IRQS);
> - bitmap_zero(msm_gpio.dual_edge_irqs, NR_GPIO_IRQS);
> - msm_gpio.gpio_chip.label = dev->name;
> ret = gpiochip_add(&msm_gpio.gpio_chip);
> - if (ret < 0)
> + if (ret < 0) {
> + dev_err(&pdev->dev, "gpiochip_add failed with error %d\n", ret);
> return ret;
> + }
>
> - for (i = 0; i < msm_gpio.gpio_chip.ngpio; ++i) {
> - irq = msm_gpio_to_irq(&msm_gpio.gpio_chip, i);
> - irq_set_chip_and_handler(irq, &msm_gpio_irq_chip,
> - handle_level_irq);
> - set_irq_flags(irq, IRQF_VALID);
> + msm_gpio.summary_irq = platform_get_irq(pdev, 0);
> + if (msm_gpio.summary_irq < 0) {
> + dev_err(&pdev->dev, "No Summary irq defined for msmgpio\n");
> + return msm_gpio.summary_irq;
> }
>
> - irq_set_chained_handler(TLMM_SCSS_SUMMARY_IRQ,
> - msm_summary_irq_handler);
> + msm_gpio.domain = irq_domain_add_linear(pdev->dev.of_node, ngpio,
> + &msm_gpio_irq_domain_ops,
> + &msm_gpio);
> + if (!msm_gpio.domain)
> + return -ENODEV;
> +
> + irq_set_chained_handler(msm_gpio.summary_irq, msm_summary_irq_handler);
> +
> return 0;
> }
>
> +static struct of_device_id msm_gpio_of_match[] = {
> + { .compatible = "qcom,msm-gpio", },
> + { },
> +};
> +
> static int msm_gpio_remove(struct platform_device *dev)
> {
> int ret = gpiochip_remove(&msm_gpio.gpio_chip);
> @@ -381,7 +442,7 @@ static int msm_gpio_remove(struct platform_device *dev)
> if (ret < 0)
> return ret;
>
> - irq_set_handler(TLMM_SCSS_SUMMARY_IRQ, NULL);
> + irq_set_handler(msm_gpio.summary_irq, NULL);
>
> return 0;
> }
> @@ -392,36 +453,11 @@ static struct platform_driver msm_gpio_driver = {
> .driver = {
> .name = "msmgpio",
> .owner = THIS_MODULE,
> + .of_match_table = msm_gpio_of_match,
> },
> };
>
> -static struct platform_device msm_device_gpio = {
> - .name = "msmgpio",
> - .id = -1,
> -};
> -
> -static int __init msm_gpio_init(void)
> -{
> - int rc;
> -
> - rc = platform_driver_register(&msm_gpio_driver);
> - if (!rc) {
> - rc = platform_device_register(&msm_device_gpio);
> - if (rc)
> - platform_driver_unregister(&msm_gpio_driver);
> - }
> -
> - return rc;
> -}
> -
> -static void __exit msm_gpio_exit(void)
> -{
> - platform_device_unregister(&msm_device_gpio);
> - platform_driver_unregister(&msm_gpio_driver);
> -}
> -
> -postcore_initcall(msm_gpio_init);
> -module_exit(msm_gpio_exit);
> +module_platform_driver(msm_gpio_driver)
>
> MODULE_AUTHOR("Gregory Bean <gbean@codeaurora.org>");
> MODULE_DESCRIPTION("Driver for Qualcomm MSM TLMMv2 SoC GPIOs");
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> hosted by The Linux Foundation
>
--
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies, Ltd.
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 3/3] gpio: msm: Add device tree and irqdomain support for gpio-msm-v2
2013-06-10 22:50 [PATCHv5 0/3] Cleanup MSM_GPIOMUX and add DT support for gpio-msm Rohit Vaswani
@ 2013-06-10 22:50 ` Rohit Vaswani
2013-06-11 12:45 ` Grant Likely
0 siblings, 1 reply; 13+ messages in thread
From: Rohit Vaswani @ 2013-06-10 22:50 UTC (permalink / raw)
To: Linus Walleij
Cc: Rohit Vaswani, Grant Likely, Rob Herring, Rob Landley,
Russell King, David Brown, Bryan Huntsman, linux-doc,
linux-kernel, linux-arm-msm
This cleans up the gpio-msm-v2 driver of all the global define usage.
The number of gpios are now defined in the device tree. This enables
adding irqdomain support as well.
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
---
.../devicetree/bindings/gpio/gpio-msm.txt | 26 +++
arch/arm/boot/dts/msm8660-surf.dts | 11 ++
arch/arm/boot/dts/msm8960-cdp.dts | 11 ++
drivers/gpio/Kconfig | 2 +-
drivers/gpio/gpio-msm-v2.c | 190 ++++++++++++--------
5 files changed, 162 insertions(+), 78 deletions(-)
create mode 100644 Documentation/devicetree/bindings/gpio/gpio-msm.txt
diff --git a/Documentation/devicetree/bindings/gpio/gpio-msm.txt b/Documentation/devicetree/bindings/gpio/gpio-msm.txt
new file mode 100644
index 0000000..ac20e68
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpio/gpio-msm.txt
@@ -0,0 +1,26 @@
+MSM GPIO controller bindings
+
+Required properties:
+- compatible:
+ - "qcom,msm-gpio" for MSM controllers
+- #gpio-cells : Should be two.
+ - first cell is the pin number
+ - second cell is used to specify optional parameters (unused)
+- gpio-controller : Marks the device node as a GPIO controller.
+- #interrupt-cells : Should be 2.
+- interrupt-controller: Mark the device node as an interrupt controller
+- interrupts : Specify the TLMM summary interrupt number
+- ngpio : Specify the number of MSM GPIOs
+
+Example:
+
+ msmgpio: gpio@fd510000 {
+ compatible = "qcom,msm-gpio";
+ gpio-controller;
+ #gpio-cells = <2>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ reg = <0xfd510000 0x4000>;
+ interrupts = <0 208 0>;
+ ngpio = <150>;
+ };
diff --git a/arch/arm/boot/dts/msm8660-surf.dts b/arch/arm/boot/dts/msm8660-surf.dts
index 9bf49b3..8931906 100644
--- a/arch/arm/boot/dts/msm8660-surf.dts
+++ b/arch/arm/boot/dts/msm8660-surf.dts
@@ -26,6 +26,17 @@
cpu-offset = <0x40000>;
};
+ msmgpio: gpio@800000 {
+ compatible = "qcom,msm-gpio";
+ reg = <0x00800000 0x1000>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ ngpio = <173>;
+ interrupts = <0 32 0x4>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+
serial@19c400000 {
compatible = "qcom,msm-hsuart", "qcom,msm-uart";
reg = <0x19c40000 0x1000>,
diff --git a/arch/arm/boot/dts/msm8960-cdp.dts b/arch/arm/boot/dts/msm8960-cdp.dts
index 2e4d87a..52fe253 100644
--- a/arch/arm/boot/dts/msm8960-cdp.dts
+++ b/arch/arm/boot/dts/msm8960-cdp.dts
@@ -26,6 +26,17 @@
cpu-offset = <0x80000>;
};
+ msmgpio: gpio@fd510000 {
+ compatible = "qcom,msm-gpio";
+ gpio-controller;
+ #gpio-cells = <2>;
+ ngpio = <150>;
+ interrupts = <0 32 0x4>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ reg = <0xfd510000 0x4000>;
+ };
+
serial@19c400000 {
compatible = "qcom,msm-hsuart", "qcom,msm-uart";
reg = <0x16440000 0x1000>,
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 87d5670..6d61a12 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -165,7 +165,7 @@ config GPIO_MSM_V1
config GPIO_MSM_V2
tristate "Qualcomm MSM GPIO v2"
- depends on GPIOLIB && ARCH_MSM
+ depends on GPIOLIB && OF && ARCH_MSM
help
Say yes here to support the GPIO interface on ARM v7 based
Qualcomm MSM chips. Most of the pins on the MSM can be
diff --git a/drivers/gpio/gpio-msm-v2.c b/drivers/gpio/gpio-msm-v2.c
index 75cc821..f4491a4 100644
--- a/drivers/gpio/gpio-msm-v2.c
+++ b/drivers/gpio/gpio-msm-v2.c
@@ -19,17 +19,21 @@
#include <linux/bitmap.h>
#include <linux/bitops.h>
+#include <linux/err.h>
#include <linux/gpio.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/irqchip/chained_irq.h>
#include <linux/irq.h>
+#include <linux/irqdomain.h>
#include <linux/module.h>
+#include <linux/of_address.h>
#include <linux/platform_device.h>
#include <linux/spinlock.h>
+#include <linux/slab.h>
-#include <mach/msm_iomap.h>
+#define MAX_NR_GPIO 300
/* Bits of interest in the GPIO_IN_OUT register.
*/
@@ -76,13 +80,6 @@ enum {
TARGET_PROC_NONE = 7,
};
-
-#define GPIO_INTR_CFG_SU(gpio) (MSM_TLMM_BASE + 0x0400 + (0x04 * (gpio)))
-#define GPIO_CONFIG(gpio) (MSM_TLMM_BASE + 0x1000 + (0x10 * (gpio)))
-#define GPIO_IN_OUT(gpio) (MSM_TLMM_BASE + 0x1004 + (0x10 * (gpio)))
-#define GPIO_INTR_CFG(gpio) (MSM_TLMM_BASE + 0x1008 + (0x10 * (gpio)))
-#define GPIO_INTR_STATUS(gpio) (MSM_TLMM_BASE + 0x100c + (0x10 * (gpio)))
-
/**
* struct msm_gpio_dev: the MSM8660 SoC GPIO device structure
*
@@ -101,11 +98,27 @@ enum {
*/
struct msm_gpio_dev {
struct gpio_chip gpio_chip;
- DECLARE_BITMAP(enabled_irqs, NR_GPIO_IRQS);
- DECLARE_BITMAP(wake_irqs, NR_GPIO_IRQS);
- DECLARE_BITMAP(dual_edge_irqs, NR_GPIO_IRQS);
+ DECLARE_BITMAP(enabled_irqs, MAX_NR_GPIO);
+ DECLARE_BITMAP(wake_irqs, MAX_NR_GPIO);
+ DECLARE_BITMAP(dual_edge_irqs, MAX_NR_GPIO);
+ struct irq_domain *domain;
+ unsigned int summary_irq;
+ void __iomem *msm_tlmm_base;
};
+struct msm_gpio_dev msm_gpio;
+
+#define GPIO_INTR_CFG_SU(gpio) (msm_gpio.msm_tlmm_base + 0x0400 + \
+ (0x04 * (gpio)))
+#define GPIO_CONFIG(gpio) (msm_gpio.msm_tlmm_base + 0x1000 + \
+ (0x10 * (gpio)))
+#define GPIO_IN_OUT(gpio) (msm_gpio.msm_tlmm_base + 0x1004 + \
+ (0x10 * (gpio)))
+#define GPIO_INTR_CFG(gpio) (msm_gpio.msm_tlmm_base + 0x1008 + \
+ (0x10 * (gpio)))
+#define GPIO_INTR_STATUS(gpio) (msm_gpio.msm_tlmm_base + 0x100c + \
+ (0x10 * (gpio)))
+
static DEFINE_SPINLOCK(tlmm_lock);
static inline struct msm_gpio_dev *to_msm_gpio_dev(struct gpio_chip *chip)
@@ -168,27 +181,19 @@ static void msm_gpio_free(struct gpio_chip *chip, unsigned offset)
static int msm_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
{
- return MSM_GPIO_TO_INT(chip->base + offset);
+ struct msm_gpio_dev *g_dev = to_msm_gpio_dev(chip);
+ struct irq_domain *domain = g_dev->domain;
+
+ return irq_create_mapping(domain, offset);
}
static inline int msm_irq_to_gpio(struct gpio_chip *chip, unsigned irq)
{
- return irq - MSM_GPIO_TO_INT(chip->base);
+ struct irq_data *irq_data = irq_get_irq_data(irq);
+
+ return irq_data->hwirq;
}
-static struct msm_gpio_dev msm_gpio = {
- .gpio_chip = {
- .base = 0,
- .ngpio = NR_GPIO_IRQS,
- .direction_input = msm_gpio_direction_input,
- .direction_output = msm_gpio_direction_output,
- .get = msm_gpio_get,
- .set = msm_gpio_set,
- .to_irq = msm_gpio_to_irq,
- .request = msm_gpio_request,
- .free = msm_gpio_free,
- },
-};
/* For dual-edge interrupts in software, since the hardware has no
* such support:
@@ -226,9 +231,9 @@ static void msm_gpio_update_dual_edge_pos(unsigned gpio)
if (intstat || val == val2)
return;
} while (loop_limit-- > 0);
- pr_err("dual-edge irq failed to stabilize, "
+ pr_err("%s: dual-edge irq failed to stabilize, "
"interrupts dropped. %#08x != %#08x\n",
- val, val2);
+ __func__, val, val2);
}
static void msm_gpio_irq_ack(struct irq_data *d)
@@ -315,10 +320,10 @@ static void msm_summary_irq_handler(unsigned int irq, struct irq_desc *desc)
chained_irq_enter(chip, desc);
- for_each_set_bit(i, msm_gpio.enabled_irqs, NR_GPIO_IRQS) {
+ for_each_set_bit(i, msm_gpio.enabled_irqs, MAX_NR_GPIO) {
if (readl(GPIO_INTR_STATUS(i)) & BIT(INTR_STATUS))
- generic_handle_irq(msm_gpio_to_irq(&msm_gpio.gpio_chip,
- i));
+ generic_handle_irq(irq_find_mapping(msm_gpio.domain,
+ i));
}
chained_irq_exit(chip, desc);
@@ -329,13 +334,13 @@ static int msm_gpio_irq_set_wake(struct irq_data *d, unsigned int on)
int gpio = msm_irq_to_gpio(&msm_gpio.gpio_chip, d->irq);
if (on) {
- if (bitmap_empty(msm_gpio.wake_irqs, NR_GPIO_IRQS))
- irq_set_irq_wake(TLMM_SCSS_SUMMARY_IRQ, 1);
+ if (bitmap_empty(msm_gpio.wake_irqs, MAX_NR_GPIO))
+ irq_set_irq_wake(msm_gpio.summary_irq, 1);
set_bit(gpio, msm_gpio.wake_irqs);
} else {
clear_bit(gpio, msm_gpio.wake_irqs);
- if (bitmap_empty(msm_gpio.wake_irqs, NR_GPIO_IRQS))
- irq_set_irq_wake(TLMM_SCSS_SUMMARY_IRQ, 0);
+ if (bitmap_empty(msm_gpio.wake_irqs, MAX_NR_GPIO))
+ irq_set_irq_wake(msm_gpio.summary_irq, 0);
}
return 0;
@@ -350,30 +355,86 @@ static struct irq_chip msm_gpio_irq_chip = {
.irq_set_wake = msm_gpio_irq_set_wake,
};
-static int msm_gpio_probe(struct platform_device *dev)
+static struct lock_class_key msm_gpio_lock_class;
+
+static int msm_gpio_irq_domain_map(struct irq_domain *d, unsigned int irq,
+ irq_hw_number_t hwirq)
+{
+ irq_set_lockdep_class(irq, &msm_gpio_lock_class);
+ irq_set_chip_and_handler(irq, &msm_gpio_irq_chip,
+ handle_level_irq);
+ set_irq_flags(irq, IRQF_VALID);
+
+ return 0;
+}
+
+static const struct irq_domain_ops msm_gpio_irq_domain_ops = {
+ .xlate = irq_domain_xlate_twocell,
+ .map = msm_gpio_irq_domain_map,
+};
+
+static int msm_gpio_probe(struct platform_device *pdev)
{
- int i, irq, ret;
+ int ret, ngpio;
+ struct resource *res;
+
+ if (!of_property_read_u32(pdev->dev.of_node, "ngpio", &ngpio)) {
+ dev_err(&pdev->dev, "%s: ngpio property missing\n", __func__);
+ return -EINVAL;
+ }
+
+ if (ngpio > MAX_NR_GPIO)
+ WARN(1, "ngpio exceeds the MAX_NR_GPIO. Increase MAX_NR_GPIO\n");
+
+ bitmap_zero(msm_gpio.enabled_irqs, MAX_NR_GPIO);
+ bitmap_zero(msm_gpio.wake_irqs, MAX_NR_GPIO);
+ bitmap_zero(msm_gpio.dual_edge_irqs, MAX_NR_GPIO);
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ msm_gpio.msm_tlmm_base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(msm_gpio.msm_tlmm_base))
+ return PTR_ERR(msm_gpio.msm_tlmm_base);
+
+ msm_gpio.gpio_chip.ngpio = ngpio;
+ msm_gpio.gpio_chip.label = pdev->name;
+ msm_gpio.gpio_chip.dev = &pdev->dev;
+ msm_gpio.gpio_chip.base = 0;
+ msm_gpio.gpio_chip.direction_input = msm_gpio_direction_input;
+ msm_gpio.gpio_chip.direction_output = msm_gpio_direction_output;
+ msm_gpio.gpio_chip.get = msm_gpio_get;
+ msm_gpio.gpio_chip.set = msm_gpio_set;
+ msm_gpio.gpio_chip.to_irq = msm_gpio_to_irq;
+ msm_gpio.gpio_chip.request = msm_gpio_request;
+ msm_gpio.gpio_chip.free = msm_gpio_free;
- bitmap_zero(msm_gpio.enabled_irqs, NR_GPIO_IRQS);
- bitmap_zero(msm_gpio.wake_irqs, NR_GPIO_IRQS);
- bitmap_zero(msm_gpio.dual_edge_irqs, NR_GPIO_IRQS);
- msm_gpio.gpio_chip.label = dev->name;
ret = gpiochip_add(&msm_gpio.gpio_chip);
- if (ret < 0)
+ if (ret < 0) {
+ dev_err(&pdev->dev, "gpiochip_add failed with error %d\n", ret);
return ret;
+ }
- for (i = 0; i < msm_gpio.gpio_chip.ngpio; ++i) {
- irq = msm_gpio_to_irq(&msm_gpio.gpio_chip, i);
- irq_set_chip_and_handler(irq, &msm_gpio_irq_chip,
- handle_level_irq);
- set_irq_flags(irq, IRQF_VALID);
+ msm_gpio.summary_irq = platform_get_irq(pdev, 0);
+ if (msm_gpio.summary_irq < 0) {
+ dev_err(&pdev->dev, "No Summary irq defined for msmgpio\n");
+ return msm_gpio.summary_irq;
}
- irq_set_chained_handler(TLMM_SCSS_SUMMARY_IRQ,
- msm_summary_irq_handler);
+ msm_gpio.domain = irq_domain_add_linear(pdev->dev.of_node, ngpio,
+ &msm_gpio_irq_domain_ops,
+ &msm_gpio);
+ if (!msm_gpio.domain)
+ return -ENODEV;
+
+ irq_set_chained_handler(msm_gpio.summary_irq, msm_summary_irq_handler);
+
return 0;
}
+static struct of_device_id msm_gpio_of_match[] = {
+ { .compatible = "qcom,msm-gpio", },
+ { },
+};
+
static int msm_gpio_remove(struct platform_device *dev)
{
int ret = gpiochip_remove(&msm_gpio.gpio_chip);
@@ -381,7 +442,7 @@ static int msm_gpio_remove(struct platform_device *dev)
if (ret < 0)
return ret;
- irq_set_handler(TLMM_SCSS_SUMMARY_IRQ, NULL);
+ irq_set_handler(msm_gpio.summary_irq, NULL);
return 0;
}
@@ -392,36 +453,11 @@ static struct platform_driver msm_gpio_driver = {
.driver = {
.name = "msmgpio",
.owner = THIS_MODULE,
+ .of_match_table = msm_gpio_of_match,
},
};
-static struct platform_device msm_device_gpio = {
- .name = "msmgpio",
- .id = -1,
-};
-
-static int __init msm_gpio_init(void)
-{
- int rc;
-
- rc = platform_driver_register(&msm_gpio_driver);
- if (!rc) {
- rc = platform_device_register(&msm_device_gpio);
- if (rc)
- platform_driver_unregister(&msm_gpio_driver);
- }
-
- return rc;
-}
-
-static void __exit msm_gpio_exit(void)
-{
- platform_device_unregister(&msm_device_gpio);
- platform_driver_unregister(&msm_gpio_driver);
-}
-
-postcore_initcall(msm_gpio_init);
-module_exit(msm_gpio_exit);
+module_platform_driver(msm_gpio_driver)
MODULE_AUTHOR("Gregory Bean <gbean@codeaurora.org>");
MODULE_DESCRIPTION("Driver for Qualcomm MSM TLMMv2 SoC GPIOs");
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2013-06-11 12:45 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-05-21 18:32 [PATCH 0/3] Cleanup MSM_GPIOMUX and add device-tree support for Rohit Vaswani
2013-05-21 18:32 ` [PATCH 1/3] ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs Rohit Vaswani
2013-05-30 17:53 ` Linus Walleij
2013-05-21 18:32 ` [PATCH 2/3] ARM: msm: Remove unused and unmapped MSM_TLMM_BASE for 8x60 Rohit Vaswani
2013-05-21 18:32 ` [PATCH 3/3] gpio: msm: Add device tree and irqdomain support for gpio-msm-v2 Rohit Vaswani
2013-05-21 21:06 ` Stephen Boyd
2013-05-22 19:29 ` Rohit Vaswani
2013-05-22 9:36 ` Stanimir Varbanov
2013-05-22 19:27 ` Rohit Vaswani
2013-05-30 17:54 ` [PATCH 0/3] Cleanup MSM_GPIOMUX and add device-tree support for Linus Walleij
2013-06-10 22:50 [PATCHv5 0/3] Cleanup MSM_GPIOMUX and add DT support for gpio-msm Rohit Vaswani
2013-06-10 22:50 ` [PATCH 3/3] gpio: msm: Add device tree and irqdomain support for gpio-msm-v2 Rohit Vaswani
2013-06-11 12:45 ` Grant Likely
2013-06-11 12:45 ` Grant Likely
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.