diff options
| author | Tarun Kanti DebBarma <tarun.kanti@ti.com> | 2012-04-27 10:13:31 -0400 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2012-05-11 20:08:39 -0400 |
| commit | d13710a7e6241f1725da34004928b93a71b05508 (patch) | |
| tree | c5346e226276371265a496471d4a1ec3097ba272 | |
| parent | 6edd94db250038c8fdf176f23ca4017d2f312509 (diff) | |
gpio/omap: remove virtual_irq_start variable
This cleanup got missed while implementing following:
25db711 gpio/omap: Fix IRQ handling for SPARSE_IRQ
384ebe1 gpio/omap: Add DT support to GPIO driver
Cc: Kevin Hilman <khilman@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Cousson, Benoit <b-cousson@ti.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com>
Reviewed-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: Govindraj.R <govindraj.raja@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
| -rw-r--r-- | arch/arm/mach-omap1/gpio15xx.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/gpio16xx.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/gpio7xx.c | 7 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/gpio.c | 1 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/gpio.h | 1 |
5 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/mach-omap1/gpio15xx.c b/arch/arm/mach-omap1/gpio15xx.c index 634903ef8292..ebef15e5e7b7 100644 --- a/arch/arm/mach-omap1/gpio15xx.c +++ b/arch/arm/mach-omap1/gpio15xx.c | |||
| @@ -46,7 +46,6 @@ static struct omap_gpio_reg_offs omap15xx_mpuio_regs = { | |||
| 46 | }; | 46 | }; |
| 47 | 47 | ||
| 48 | static struct __initdata omap_gpio_platform_data omap15xx_mpu_gpio_config = { | 48 | static struct __initdata omap_gpio_platform_data omap15xx_mpu_gpio_config = { |
| 49 | .virtual_irq_start = IH_MPUIO_BASE, | ||
| 50 | .is_mpuio = true, | 49 | .is_mpuio = true, |
| 51 | .bank_width = 16, | 50 | .bank_width = 16, |
| 52 | .bank_stride = 1, | 51 | .bank_stride = 1, |
| @@ -89,7 +88,6 @@ static struct omap_gpio_reg_offs omap15xx_gpio_regs = { | |||
| 89 | }; | 88 | }; |
| 90 | 89 | ||
| 91 | static struct __initdata omap_gpio_platform_data omap15xx_gpio_config = { | 90 | static struct __initdata omap_gpio_platform_data omap15xx_gpio_config = { |
| 92 | .virtual_irq_start = IH_GPIO_BASE, | ||
| 93 | .bank_width = 16, | 91 | .bank_width = 16, |
| 94 | .regs = &omap15xx_gpio_regs, | 92 | .regs = &omap15xx_gpio_regs, |
| 95 | }; | 93 | }; |
diff --git a/arch/arm/mach-omap1/gpio16xx.c b/arch/arm/mach-omap1/gpio16xx.c index 1fb3b9ad496e..2a48cd2e1754 100644 --- a/arch/arm/mach-omap1/gpio16xx.c +++ b/arch/arm/mach-omap1/gpio16xx.c | |||
| @@ -52,7 +52,6 @@ static struct omap_gpio_reg_offs omap16xx_mpuio_regs = { | |||
| 52 | }; | 52 | }; |
| 53 | 53 | ||
| 54 | static struct __initdata omap_gpio_platform_data omap16xx_mpu_gpio_config = { | 54 | static struct __initdata omap_gpio_platform_data omap16xx_mpu_gpio_config = { |
| 55 | .virtual_irq_start = IH_MPUIO_BASE, | ||
| 56 | .is_mpuio = true, | 55 | .is_mpuio = true, |
| 57 | .bank_width = 16, | 56 | .bank_width = 16, |
| 58 | .bank_stride = 1, | 57 | .bank_stride = 1, |
| @@ -99,7 +98,6 @@ static struct omap_gpio_reg_offs omap16xx_gpio_regs = { | |||
| 99 | }; | 98 | }; |
| 100 | 99 | ||
| 101 | static struct __initdata omap_gpio_platform_data omap16xx_gpio1_config = { | 100 | static struct __initdata omap_gpio_platform_data omap16xx_gpio1_config = { |
| 102 | .virtual_irq_start = IH_GPIO_BASE, | ||
| 103 | .bank_width = 16, | 101 | .bank_width = 16, |
| 104 | .regs = &omap16xx_gpio_regs, | 102 | .regs = &omap16xx_gpio_regs, |
| 105 | }; | 103 | }; |
| @@ -128,7 +126,6 @@ static struct __initdata resource omap16xx_gpio2_resources[] = { | |||
| 128 | }; | 126 | }; |
| 129 | 127 | ||
| 130 | static struct __initdata omap_gpio_platform_data omap16xx_gpio2_config = { | 128 | static struct __initdata omap_gpio_platform_data omap16xx_gpio2_config = { |
| 131 | .virtual_irq_start = IH_GPIO_BASE + 16, | ||
| 132 | .bank_width = 16, | 129 | .bank_width = 16, |
| 133 | .regs = &omap16xx_gpio_regs, | 130 | .regs = &omap16xx_gpio_regs, |
| 134 | }; | 131 | }; |
| @@ -157,7 +154,6 @@ static struct __initdata resource omap16xx_gpio3_resources[] = { | |||
| 157 | }; | 154 | }; |
| 158 | 155 | ||
| 159 | static struct __initdata omap_gpio_platform_data omap16xx_gpio3_config = { | 156 | static struct __initdata omap_gpio_platform_data omap16xx_gpio3_config = { |
| 160 | .virtual_irq_start = IH_GPIO_BASE + 32, | ||
| 161 | .bank_width = 16, | 157 | .bank_width = 16, |
| 162 | .regs = &omap16xx_gpio_regs, | 158 | .regs = &omap16xx_gpio_regs, |
| 163 | }; | 159 | }; |
| @@ -186,7 +182,6 @@ static struct __initdata resource omap16xx_gpio4_resources[] = { | |||
| 186 | }; | 182 | }; |
| 187 | 183 | ||
| 188 | static struct __initdata omap_gpio_platform_data omap16xx_gpio4_config = { | 184 | static struct __initdata omap_gpio_platform_data omap16xx_gpio4_config = { |
| 189 | .virtual_irq_start = IH_GPIO_BASE + 48, | ||
| 190 | .bank_width = 16, | 185 | .bank_width = 16, |
| 191 | .regs = &omap16xx_gpio_regs, | 186 | .regs = &omap16xx_gpio_regs, |
| 192 | }; | 187 | }; |
diff --git a/arch/arm/mach-omap1/gpio7xx.c b/arch/arm/mach-omap1/gpio7xx.c index 4771d6b68b96..acf12b73eace 100644 --- a/arch/arm/mach-omap1/gpio7xx.c +++ b/arch/arm/mach-omap1/gpio7xx.c | |||
| @@ -51,7 +51,6 @@ static struct omap_gpio_reg_offs omap7xx_mpuio_regs = { | |||
| 51 | }; | 51 | }; |
| 52 | 52 | ||
| 53 | static struct __initdata omap_gpio_platform_data omap7xx_mpu_gpio_config = { | 53 | static struct __initdata omap_gpio_platform_data omap7xx_mpu_gpio_config = { |
| 54 | .virtual_irq_start = IH_MPUIO_BASE, | ||
| 55 | .is_mpuio = true, | 54 | .is_mpuio = true, |
| 56 | .bank_width = 16, | 55 | .bank_width = 16, |
| 57 | .bank_stride = 2, | 56 | .bank_stride = 2, |
| @@ -93,7 +92,6 @@ static struct omap_gpio_reg_offs omap7xx_gpio_regs = { | |||
| 93 | }; | 92 | }; |
| 94 | 93 | ||
| 95 | static struct __initdata omap_gpio_platform_data omap7xx_gpio1_config = { | 94 | static struct __initdata omap_gpio_platform_data omap7xx_gpio1_config = { |
| 96 | .virtual_irq_start = IH_GPIO_BASE, | ||
| 97 | .bank_width = 32, | 95 | .bank_width = 32, |
| 98 | .regs = &omap7xx_gpio_regs, | 96 | .regs = &omap7xx_gpio_regs, |
| 99 | }; | 97 | }; |
| @@ -122,7 +120,6 @@ static struct __initdata resource omap7xx_gpio2_resources[] = { | |||
| 122 | }; | 120 | }; |
| 123 | 121 | ||
| 124 | static struct __initdata omap_gpio_platform_data omap7xx_gpio2_config = { | 122 | static struct __initdata omap_gpio_platform_data omap7xx_gpio2_config = { |
| 125 | .virtual_irq_start = IH_GPIO_BASE + 32, | ||
| 126 | .bank_width = 32, | 123 | .bank_width = 32, |
| 127 | .regs = &omap7xx_gpio_regs, | 124 | .regs = &omap7xx_gpio_regs, |
| 128 | }; | 125 | }; |
| @@ -151,7 +148,6 @@ static struct __initdata resource omap7xx_gpio3_resources[] = { | |||
| 151 | }; | 148 | }; |
| 152 | 149 | ||
| 153 | static struct __initdata omap_gpio_platform_data omap7xx_gpio3_config = { | 150 | static struct __initdata omap_gpio_platform_data omap7xx_gpio3_config = { |
| 154 | .virtual_irq_start = IH_GPIO_BASE + 64, | ||
| 155 | .bank_width = 32, | 151 | .bank_width = 32, |
| 156 | .regs = &omap7xx_gpio_regs, | 152 | .regs = &omap7xx_gpio_regs, |
| 157 | }; | 153 | }; |
| @@ -180,7 +176,6 @@ static struct __initdata resource omap7xx_gpio4_resources[] = { | |||
| 180 | }; | 176 | }; |
| 181 | 177 | ||
| 182 | static struct __initdata omap_gpio_platform_data omap7xx_gpio4_config = { | 178 | static struct __initdata omap_gpio_platform_data omap7xx_gpio4_config = { |
| 183 | .virtual_irq_start = IH_GPIO_BASE + 96, | ||
| 184 | .bank_width = 32, | 179 | .bank_width = 32, |
| 185 | .regs = &omap7xx_gpio_regs, | 180 | .regs = &omap7xx_gpio_regs, |
| 186 | }; | 181 | }; |
| @@ -209,7 +204,6 @@ static struct __initdata resource omap7xx_gpio5_resources[] = { | |||
| 209 | }; | 204 | }; |
| 210 | 205 | ||
| 211 | static struct __initdata omap_gpio_platform_data omap7xx_gpio5_config = { | 206 | static struct __initdata omap_gpio_platform_data omap7xx_gpio5_config = { |
| 212 | .virtual_irq_start = IH_GPIO_BASE + 128, | ||
| 213 | .bank_width = 32, | 207 | .bank_width = 32, |
| 214 | .regs = &omap7xx_gpio_regs, | 208 | .regs = &omap7xx_gpio_regs, |
| 215 | }; | 209 | }; |
| @@ -238,7 +232,6 @@ static struct __initdata resource omap7xx_gpio6_resources[] = { | |||
| 238 | }; | 232 | }; |
| 239 | 233 | ||
| 240 | static struct __initdata omap_gpio_platform_data omap7xx_gpio6_config = { | 234 | static struct __initdata omap_gpio_platform_data omap7xx_gpio6_config = { |
| 241 | .virtual_irq_start = IH_GPIO_BASE + 160, | ||
| 242 | .bank_width = 32, | 235 | .bank_width = 32, |
| 243 | .regs = &omap7xx_gpio_regs, | 236 | .regs = &omap7xx_gpio_regs, |
| 244 | }; | 237 | }; |
diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c index 2f994e5194e8..86f91a6ed4e4 100644 --- a/arch/arm/mach-omap2/gpio.c +++ b/arch/arm/mach-omap2/gpio.c | |||
| @@ -55,7 +55,6 @@ static int __init omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) | |||
| 55 | dev_attr = (struct omap_gpio_dev_attr *)oh->dev_attr; | 55 | dev_attr = (struct omap_gpio_dev_attr *)oh->dev_attr; |
| 56 | pdata->bank_width = dev_attr->bank_width; | 56 | pdata->bank_width = dev_attr->bank_width; |
| 57 | pdata->dbck_flag = dev_attr->dbck_flag; | 57 | pdata->dbck_flag = dev_attr->dbck_flag; |
| 58 | pdata->virtual_irq_start = IH_GPIO_BASE + 32 * (id - 1); | ||
| 59 | pdata->get_context_loss_count = omap_pm_get_dev_context_loss_count; | 58 | pdata->get_context_loss_count = omap_pm_get_dev_context_loss_count; |
| 60 | pdata->regs = kzalloc(sizeof(struct omap_gpio_reg_offs), GFP_KERNEL); | 59 | pdata->regs = kzalloc(sizeof(struct omap_gpio_reg_offs), GFP_KERNEL); |
| 61 | if (!pdata) { | 60 | if (!pdata) { |
diff --git a/arch/arm/plat-omap/include/plat/gpio.h b/arch/arm/plat-omap/include/plat/gpio.h index 2f6e9924a814..d903e7df3fb1 100644 --- a/arch/arm/plat-omap/include/plat/gpio.h +++ b/arch/arm/plat-omap/include/plat/gpio.h | |||
| @@ -193,7 +193,6 @@ struct omap_gpio_reg_offs { | |||
| 193 | }; | 193 | }; |
| 194 | 194 | ||
| 195 | struct omap_gpio_platform_data { | 195 | struct omap_gpio_platform_data { |
| 196 | u16 virtual_irq_start; | ||
| 197 | int bank_type; | 196 | int bank_type; |
| 198 | int bank_width; /* GPIO bank width */ | 197 | int bank_width; /* GPIO bank width */ |
| 199 | int bank_stride; /* Only needed for omap1 MPUIO */ | 198 | int bank_stride; /* Only needed for omap1 MPUIO */ |
