Skip to content

L
linux
Commit 2ad530d2 authored by Kukjin Kim's avatar Kukjin Kim
Browse files
Options

ARM: S5PC100: Cleanup the GPIOlib code 

This patch clean up the GPIO code and removes useless GPIO addresses.
It can be calculated with offset, the 'base' member of s3c_gpio_chip
is also initialized in the init function.
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 4d9374f3
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 140 deletions
arch/arm/mach-s5pc100/gpiolib.c
View file @ 2ad530d2
/* /* linux/arch/arm/mach-s5pc100/gpiolib.c
* arch/arm/plat-s5pc100/gpiolib.c *
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com
* *
* Copyright 2009 Samsung Electronics Co * Copyright 2009 Samsung Electronics Co
* Kyungmin Park <kyungmin.park@samsung.com> * Kyungmin Park <kyungmin.park@samsung.com>
...@@ -80,217 +82,150 @@ static struct s3c_gpio_cfg gpio_cfg_noint = { ...@@ -80,217 +82,150 @@ static struct s3c_gpio_cfg gpio_cfg_noint = {
.get_pull = s3c_gpio_getpull_updown, .get_pull = s3c_gpio_getpull_updown,
}; };
/*
* GPIO bank's base address given the index of the bank in the
* list of all gpio banks.
*/
#define S5PC100_BANK_BASE(bank_nr) (S5P_VA_GPIO + ((bank_nr) * 0x20))
/*
* Following are the gpio banks in S5PC100.
*
* The 'config' member when left to NULL, is initialized to the default
* structure gpio_cfg in the init function below.
*
* The 'base' member is also initialized in the init function below.
* Note: The initialization of 'base' member of s3c_gpio_chip structure
* uses the above macro and depends on the banks being listed in order here.
*/
static struct s3c_gpio_chip s5pc100_gpio_chips[] = { static struct s3c_gpio_chip s5pc100_gpio_chips[] = {
{ {
.base = S5PC100_GPA0_BASE,
.config = &gpio_cfg,
.chip = { .chip = {
.base = S5PC100_GPA0(0), .base = S5PC100_GPA0(0),
.ngpio = S5PC100_GPIO_A0_NR, .ngpio = S5PC100_GPIO_A0_NR,
.label = "GPA0", .label = "GPA0",
}, },
}, { }, {
.base = S5PC100_GPA1_BASE,
.config = &gpio_cfg,
.chip = { .chip = {
.base = S5PC100_GPA1(0), .base = S5PC100_GPA1(0),
.ngpio = S5PC100_GPIO_A1_NR, .ngpio = S5PC100_GPIO_A1_NR,
.label = "GPA1", .label = "GPA1",
}, },
}, { }, {
.base = S5PC100_GPB_BASE,
.config = &gpio_cfg,
.chip = { .chip = {
.base = S5PC100_GPB(0), .base = S5PC100_GPB(0),
.ngpio = S5PC100_GPIO_B_NR, .ngpio = S5PC100_GPIO_B_NR,
.label = "GPB", .label = "GPB",
}, },
}, { }, {
.base = S5PC100_GPC_BASE,
.config = &gpio_cfg,
.chip = { .chip = {
.base = S5PC100_GPC(0), .base = S5PC100_GPC(0),
.ngpio = S5PC100_GPIO_C_NR, .ngpio = S5PC100_GPIO_C_NR,
.label = "GPC", .label = "GPC",
}, },
}, { }, {
.base = S5PC100_GPD_BASE,
.config = &gpio_cfg,
.chip = { .chip = {
.base = S5PC100_GPD(0), .base = S5PC100_GPD(0),
.ngpio = S5PC100_GPIO_D_NR, .ngpio = S5PC100_GPIO_D_NR,
.label = "GPD", .label = "GPD",
}, },
}, { }, {
.base = S5PC100_GPE0_BASE,
.config = &gpio_cfg,
.chip = { .chip = {
.base = S5PC100_GPE0(0), .base = S5PC100_GPE0(0),
.ngpio = S5PC100_GPIO_E0_NR, .ngpio = S5PC100_GPIO_E0_NR,
.label = "GPE0", .label = "GPE0",
}, },
}, { }, {
.base = S5PC100_GPE1_BASE,
.config = &gpio_cfg,
.chip = { .chip = {
.base = S5PC100_GPE1(0), .base = S5PC100_GPE1(0),
.ngpio = S5PC100_GPIO_E1_NR, .ngpio = S5PC100_GPIO_E1_NR,
.label = "GPE1", .label = "GPE1",
}, },
}, { }, {
.base = S5PC100_GPF0_BASE,
.config = &gpio_cfg,
.chip = { .chip = {
.base = S5PC100_GPF0(0), .base = S5PC100_GPF0(0),
.ngpio = S5PC100_GPIO_F0_NR, .ngpio = S5PC100_GPIO_F0_NR,
.label = "GPF0", .label = "GPF0",
}, },
}, { }, {
.base = S5PC100_GPF1_BASE,
.config = &gpio_cfg,
.chip = { .chip = {
.base = S5PC100_GPF1(0), .base = S5PC100_GPF1(0),
.ngpio = S5PC100_GPIO_F1_NR, .ngpio = S5PC100_GPIO_F1_NR,
.label = "GPF1", .label = "GPF1",
}, },
}, { }, {
.base = S5PC100_GPF2_BASE,
.config = &gpio_cfg,
.chip = { .chip = {
.base = S5PC100_GPF2(0), .base = S5PC100_GPF2(0),
.ngpio = S5PC100_GPIO_F2_NR, .ngpio = S5PC100_GPIO_F2_NR,
.label = "GPF2", .label = "GPF2",
}, },
}, { }, {
.base = S5PC100_GPF3_BASE,
.config = &gpio_cfg,
.chip = { .chip = {
.base = S5PC100_GPF3(0), .base = S5PC100_GPF3(0),
.ngpio = S5PC100_GPIO_F3_NR, .ngpio = S5PC100_GPIO_F3_NR,
.label = "GPF3", .label = "GPF3",
}, },
}, { }, {
.base = S5PC100_GPG0_BASE,
.config = &gpio_cfg,
.chip = { .chip = {
.base = S5PC100_GPG0(0), .base = S5PC100_GPG0(0),
.ngpio = S5PC100_GPIO_G0_NR, .ngpio = S5PC100_GPIO_G0_NR,
.label = "GPG0", .label = "GPG0",
}, },
}, { }, {
.base = S5PC100_GPG1_BASE,
.config = &gpio_cfg,
.chip = { .chip = {
.base = S5PC100_GPG1(0), .base = S5PC100_GPG1(0),
.ngpio = S5PC100_GPIO_G1_NR, .ngpio = S5PC100_GPIO_G1_NR,
.label = "GPG1", .label = "GPG1",
}, },
}, { }, {
.base = S5PC100_GPG2_BASE,
.config = &gpio_cfg,
.chip = { .chip = {
.base = S5PC100_GPG2(0), .base = S5PC100_GPG2(0),
.ngpio = S5PC100_GPIO_G2_NR, .ngpio = S5PC100_GPIO_G2_NR,
.label = "GPG2", .label = "GPG2",
}, },
}, { }, {
.base = S5PC100_GPG3_BASE,
.config = &gpio_cfg,
.chip = { .chip = {
.base = S5PC100_GPG3(0), .base = S5PC100_GPG3(0),
.ngpio = S5PC100_GPIO_G3_NR, .ngpio = S5PC100_GPIO_G3_NR,
.label = "GPG3", .label = "GPG3",
}, },
}, { }, {
.base = S5PC100_GPH0_BASE,
.config = &gpio_cfg_eint,
.irq_base = IRQ_EINT(0),
.chip = {
.base = S5PC100_GPH0(0),
.ngpio = S5PC100_GPIO_H0_NR,
.label = "GPH0",
.to_irq = samsung_gpiolib_to_irq,
},
}, {
.base = S5PC100_GPH1_BASE,
.config = &gpio_cfg_eint,
.irq_base = IRQ_EINT(8),
.chip = {
.base = S5PC100_GPH1(0),
.ngpio = S5PC100_GPIO_H1_NR,
.label = "GPH1",
.to_irq = samsung_gpiolib_to_irq,
},
}, {
.base = S5PC100_GPH2_BASE,
.config = &gpio_cfg_eint,
.irq_base = IRQ_EINT(16),
.chip = {
.base = S5PC100_GPH2(0),
.ngpio = S5PC100_GPIO_H2_NR,
.label = "GPH2",
.to_irq = samsung_gpiolib_to_irq,
},
}, {
.base = S5PC100_GPH3_BASE,
.config = &gpio_cfg_eint,
.irq_base = IRQ_EINT(24),
.chip = {
.base = S5PC100_GPH3(0),
.ngpio = S5PC100_GPIO_H3_NR,
.label = "GPH3",
.to_irq = samsung_gpiolib_to_irq,
},
}, {
.base = S5PC100_GPI_BASE,
.config = &gpio_cfg,
.chip = { .chip = {
.base = S5PC100_GPI(0), .base = S5PC100_GPI(0),
.ngpio = S5PC100_GPIO_I_NR, .ngpio = S5PC100_GPIO_I_NR,
.label = "GPI", .label = "GPI",
}, },
}, { }, {
.base = S5PC100_GPJ0_BASE,
.config = &gpio_cfg,
.chip = { .chip = {
.base = S5PC100_GPJ0(0), .base = S5PC100_GPJ0(0),
.ngpio = S5PC100_GPIO_J0_NR, .ngpio = S5PC100_GPIO_J0_NR,
.label = "GPJ0", .label = "GPJ0",
}, },
}, { }, {
.base = S5PC100_GPJ1_BASE,
.config = &gpio_cfg,
.chip = { .chip = {
.base = S5PC100_GPJ1(0), .base = S5PC100_GPJ1(0),
.ngpio = S5PC100_GPIO_J1_NR, .ngpio = S5PC100_GPIO_J1_NR,
.label = "GPJ1", .label = "GPJ1",
}, },
}, { }, {
.base = S5PC100_GPJ2_BASE,
.config = &gpio_cfg,
.chip = { .chip = {
.base = S5PC100_GPJ2(0), .base = S5PC100_GPJ2(0),
.ngpio = S5PC100_GPIO_J2_NR, .ngpio = S5PC100_GPIO_J2_NR,
.label = "GPJ2", .label = "GPJ2",
}, },
}, { }, {
.base = S5PC100_GPJ3_BASE,
.config = &gpio_cfg,
.chip = { .chip = {
.base = S5PC100_GPJ3(0), .base = S5PC100_GPJ3(0),
.ngpio = S5PC100_GPIO_J3_NR, .ngpio = S5PC100_GPIO_J3_NR,
.label = "GPJ3", .label = "GPJ3",
}, },
}, { }, {
.base = S5PC100_GPJ4_BASE,
.config = &gpio_cfg,
.chip = { .chip = {
.base = S5PC100_GPJ4(0), .base = S5PC100_GPJ4(0),
.ngpio = S5PC100_GPIO_J4_NR, .ngpio = S5PC100_GPIO_J4_NR,
.label = "GPJ4", .label = "GPJ4",
}, },
}, { }, {
.base = S5PC100_GPK0_BASE,
.config = &gpio_cfg_noint, .config = &gpio_cfg_noint,
.chip = { .chip = {
.base = S5PC100_GPK0(0), .base = S5PC100_GPK0(0),
...@@ -298,7 +233,6 @@ static struct s3c_gpio_chip s5pc100_gpio_chips[] = { ...@@ -298,7 +233,6 @@ static struct s3c_gpio_chip s5pc100_gpio_chips[] = {
.label = "GPK0", .label = "GPK0",
}, },
}, { }, {
.base = S5PC100_GPK1_BASE,
.config = &gpio_cfg_noint, .config = &gpio_cfg_noint,
.chip = { .chip = {
.base = S5PC100_GPK1(0), .base = S5PC100_GPK1(0),
...@@ -306,7 +240,6 @@ static struct s3c_gpio_chip s5pc100_gpio_chips[] = { ...@@ -306,7 +240,6 @@ static struct s3c_gpio_chip s5pc100_gpio_chips[] = {
.label = "GPK1", .label = "GPK1",
}, },
}, { }, {
.base = S5PC100_GPK2_BASE,
.config = &gpio_cfg_noint, .config = &gpio_cfg_noint,
.chip = { .chip = {
.base = S5PC100_GPK2(0), .base = S5PC100_GPK2(0),
...@@ -314,7 +247,6 @@ static struct s3c_gpio_chip s5pc100_gpio_chips[] = { ...@@ -314,7 +247,6 @@ static struct s3c_gpio_chip s5pc100_gpio_chips[] = {
.label = "GPK2", .label = "GPK2",
}, },
}, { }, {
.base = S5PC100_GPK3_BASE,
.config = &gpio_cfg_noint, .config = &gpio_cfg_noint,
.chip = { .chip = {
.base = S5PC100_GPK3(0), .base = S5PC100_GPK3(0),
...@@ -322,7 +254,6 @@ static struct s3c_gpio_chip s5pc100_gpio_chips[] = { ...@@ -322,7 +254,6 @@ static struct s3c_gpio_chip s5pc100_gpio_chips[] = {
.label = "GPK3", .label = "GPK3",
}, },
}, { }, {
.base = S5PC100_GPL0_BASE,
.config = &gpio_cfg_noint, .config = &gpio_cfg_noint,
.chip = { .chip = {
.base = S5PC100_GPL0(0), .base = S5PC100_GPL0(0),
...@@ -330,7 +261,6 @@ static struct s3c_gpio_chip s5pc100_gpio_chips[] = { ...@@ -330,7 +261,6 @@ static struct s3c_gpio_chip s5pc100_gpio_chips[] = {
.label = "GPL0", .label = "GPL0",
}, },
}, { }, {
.base = S5PC100_GPL1_BASE,
.config = &gpio_cfg_noint, .config = &gpio_cfg_noint,
.chip = { .chip = {
.base = S5PC100_GPL1(0), .base = S5PC100_GPL1(0),
...@@ -338,7 +268,6 @@ static struct s3c_gpio_chip s5pc100_gpio_chips[] = { ...@@ -338,7 +268,6 @@ static struct s3c_gpio_chip s5pc100_gpio_chips[] = {
.label = "GPL1", .label = "GPL1",
}, },
}, { }, {
.base = S5PC100_GPL2_BASE,
.config = &gpio_cfg_noint, .config = &gpio_cfg_noint,
.chip = { .chip = {
.base = S5PC100_GPL2(0), .base = S5PC100_GPL2(0),
...@@ -346,7 +275,6 @@ static struct s3c_gpio_chip s5pc100_gpio_chips[] = { ...@@ -346,7 +275,6 @@ static struct s3c_gpio_chip s5pc100_gpio_chips[] = {
.label = "GPL2", .label = "GPL2",
}, },
}, { }, {
.base = S5PC100_GPL3_BASE,
.config = &gpio_cfg_noint, .config = &gpio_cfg_noint,
.chip = { .chip = {
.base = S5PC100_GPL3(0), .base = S5PC100_GPL3(0),
...@@ -354,34 +282,72 @@ static struct s3c_gpio_chip s5pc100_gpio_chips[] = { ...@@ -354,34 +282,72 @@ static struct s3c_gpio_chip s5pc100_gpio_chips[] = {
.label = "GPL3", .label = "GPL3",
}, },
}, { }, {
.base = S5PC100_GPL4_BASE,
.config = &gpio_cfg_noint, .config = &gpio_cfg_noint,
.chip = { .chip = {
.base = S5PC100_GPL4(0), .base = S5PC100_GPL4(0),
.ngpio = S5PC100_GPIO_L4_NR, .ngpio = S5PC100_GPIO_L4_NR,
.label = "GPL4", .label = "GPL4",
}, },
}, {
.base = (S5P_VA_GPIO + 0xC00),
.config = &gpio_cfg_eint,
.irq_base = IRQ_EINT(0),
.chip = {
.base = S5PC100_GPH0(0),
.ngpio = S5PC100_GPIO_H0_NR,
.label = "GPH0",
.to_irq = samsung_gpiolib_to_irq,
},
}, {
.base = (S5P_VA_GPIO + 0xC20),
.config = &gpio_cfg_eint,
.irq_base = IRQ_EINT(8),
.chip = {
.base = S5PC100_GPH1(0),
.ngpio = S5PC100_GPIO_H1_NR,
.label = "GPH1",
.to_irq = samsung_gpiolib_to_irq,
},
}, {
.base = (S5P_VA_GPIO + 0xC40),
.config = &gpio_cfg_eint,
.irq_base = IRQ_EINT(16),
.chip = {
.base = S5PC100_GPH2(0),
.ngpio = S5PC100_GPIO_H2_NR,
.label = "GPH2",
.to_irq = samsung_gpiolib_to_irq,
},
}, {
.base = (S5P_VA_GPIO + 0xC60),
.config = &gpio_cfg_eint,
.irq_base = IRQ_EINT(24),
.chip = {
.base = S5PC100_GPH3(0),
.ngpio = S5PC100_GPIO_H3_NR,
.label = "GPH3",
.to_irq = samsung_gpiolib_to_irq,
},
}, },
}; };
static __init int s5pc100_gpiolib_init(void) static __init int s5pc100_gpiolib_init(void)
{ {
struct s3c_gpio_chip *chip; struct s3c_gpio_chip *chip = s5pc100_gpio_chips;
int nr_chips; int nr_chips = ARRAY_SIZE(s5pc100_gpio_chips);
int gpioint_group = 0; int gpioint_group = 0;
int i;
chip = s5pc100_gpio_chips; for (i = 0; i < nr_chips; i++, chip++) {
nr_chips = ARRAY_SIZE(s5pc100_gpio_chips); if (chip->config == NULL) {
chip->config = &gpio_cfg;
for (; nr_chips > 0; nr_chips--, chip++) {
if (chip->config == &gpio_cfg) {
/* gpio interrupts */
chip->group = gpioint_group++; chip->group = gpioint_group++;
} }
if (chip->base == NULL)
chip->base = S5PC100_BANK_BASE(i);
} }
samsung_gpiolib_add_4bit_chips(s5pc100_gpio_chips, samsung_gpiolib_add_4bit_chips(s5pc100_gpio_chips, nr_chips);
ARRAY_SIZE(s5pc100_gpio_chips));
return 0; return 0;
} }
......
arch/arm/mach-s5pc100/include/mach/regs-gpio.h
View file @ 2ad530d2
...@@ -11,43 +11,6 @@ ...@@ -11,43 +11,6 @@
#include <mach/map.h> #include <mach/map.h>
/* S5PC100 */
#define S5PC100_GPIO_BASE S5P_VA_GPIO
#define S5PC100_GPA0_BASE (S5PC100_GPIO_BASE + 0x0000)
#define S5PC100_GPA1_BASE (S5PC100_GPIO_BASE + 0x0020)
#define S5PC100_GPB_BASE (S5PC100_GPIO_BASE + 0x0040)
#define S5PC100_GPC_BASE (S5PC100_GPIO_BASE + 0x0060)
#define S5PC100_GPD_BASE (S5PC100_GPIO_BASE + 0x0080)
#define S5PC100_GPE0_BASE (S5PC100_GPIO_BASE + 0x00A0)
#define S5PC100_GPE1_BASE (S5PC100_GPIO_BASE + 0x00C0)
#define S5PC100_GPF0_BASE (S5PC100_GPIO_BASE + 0x00E0)
#define S5PC100_GPF1_BASE (S5PC100_GPIO_BASE + 0x0100)
#define S5PC100_GPF2_BASE (S5PC100_GPIO_BASE + 0x0120)
#define S5PC100_GPF3_BASE (S5PC100_GPIO_BASE + 0x0140)
#define S5PC100_GPG0_BASE (S5PC100_GPIO_BASE + 0x0160)
#define S5PC100_GPG1_BASE (S5PC100_GPIO_BASE + 0x0180)
#define S5PC100_GPG2_BASE (S5PC100_GPIO_BASE + 0x01A0)
#define S5PC100_GPG3_BASE (S5PC100_GPIO_BASE + 0x01C0)
#define S5PC100_GPH0_BASE (S5PC100_GPIO_BASE + 0x0C00)
#define S5PC100_GPH1_BASE (S5PC100_GPIO_BASE + 0x0C20)
#define S5PC100_GPH2_BASE (S5PC100_GPIO_BASE + 0x0C40)
#define S5PC100_GPH3_BASE (S5PC100_GPIO_BASE + 0x0C60)
#define S5PC100_GPI_BASE (S5PC100_GPIO_BASE + 0x01E0)
#define S5PC100_GPJ0_BASE (S5PC100_GPIO_BASE + 0x0200)
#define S5PC100_GPJ1_BASE (S5PC100_GPIO_BASE + 0x0220)
#define S5PC100_GPJ2_BASE (S5PC100_GPIO_BASE + 0x0240)
#define S5PC100_GPJ3_BASE (S5PC100_GPIO_BASE + 0x0260)
#define S5PC100_GPJ4_BASE (S5PC100_GPIO_BASE + 0x0280)
#define S5PC100_GPK0_BASE (S5PC100_GPIO_BASE + 0x02A0)
#define S5PC100_GPK1_BASE (S5PC100_GPIO_BASE + 0x02C0)
#define S5PC100_GPK2_BASE (S5PC100_GPIO_BASE + 0x02E0)
#define S5PC100_GPK3_BASE (S5PC100_GPIO_BASE + 0x0300)
#define S5PC100_GPL0_BASE (S5PC100_GPIO_BASE + 0x0320)
#define S5PC100_GPL1_BASE (S5PC100_GPIO_BASE + 0x0340)
#define S5PC100_GPL2_BASE (S5PC100_GPIO_BASE + 0x0360)
#define S5PC100_GPL3_BASE (S5PC100_GPIO_BASE + 0x0380)
#define S5PC100_GPL4_BASE (S5PC100_GPIO_BASE + 0x03A0)
#define S5PC100EINT30CON (S5P_VA_GPIO + 0xE00) #define S5PC100EINT30CON (S5P_VA_GPIO + 0xE00)
#define S5P_EINT_CON(x) (S5PC100EINT30CON + ((x) * 0x4)) #define S5P_EINT_CON(x) (S5PC100EINT30CON + ((x) * 0x4))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7