diff options
| author |   Patrice Chotard <patrice.chotard@stericsson.com> | 2012-10-08 16:35:09 +0200 |
|---|---|---|
| committer |   Linus Walleij <linus.walleij@linaro.org> | 2012-10-28 21:16:15 +0100 |
| commit | f64228ee23975d3703121a3d27dac488c3c813e9 (patch) | |
| tree | da422e440ad4ef069a86021894b62d3a9455a7f6 | |
| parent | ARM: plat-nomadik: Introduce new DB8540 GPIO registers (diff) | |
| download | linux-dev-f64228ee23975d3703121a3d27dac488c3c813e9.tar.xz linux-dev-f64228ee23975d3703121a3d27dac488c3c813e9.zip | |
ARM: plat-nomadik: move NMK_GPIO_PER_CHIP into gpio-nomadik.h
Move NMK_GPIO_PER_CHIP to gpio-nomadik.h and define it with a
shift operator.
Signed-off-by: Patrice Chotard <patrice.chotard@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | arch/arm/plat-nomadik/include/plat/gpio-nomadik.h | 3 | ||||
| -rw-r--r-- | drivers/pinctrl/pinctrl-nomadik.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/plat-nomadik/include/plat/gpio-nomadik.h b/arch/arm/plat-nomadik/include/plat/gpio-nomadik.h index cf81111b79a6..a74999438de4 100644 --- a/arch/arm/plat-nomadik/include/plat/gpio-nomadik.h +++ b/arch/arm/plat-nomadik/include/plat/gpio-nomadik.h @@ -18,6 +18,9 @@ * the "gpio" namespace for generic and cross-machine functions */ +#define GPIO_BLOCK_SHIFT 5 +#define NMK_GPIO_PER_CHIP (1 << GPIO_BLOCK_SHIFT) + /* Register in the logic block */ #define NMK_GPIO_DAT 0x00 #define NMK_GPIO_DATS 0x04 diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c index cf82d9ce4dee..f5c0da1f3b30 100644 --- a/drivers/pinctrl/pinctrl-nomadik.c +++ b/drivers/pinctrl/pinctrl-nomadik.c @@ -60,8 +60,6 @@ static inline void prcmu_write_masked(unsigned int reg, u32 mask, u32 value) {} * Symbols in this file are called "nmk_gpio" for "nomadik gpio" */ -#define NMK_GPIO_PER_CHIP 32 - struct nmk_gpio_chip { struct gpio_chip chip; struct irq_domain *domain; |