Skip to content

Commit

Permalink
ARM: OMAP1: Fix a bunch of GPIO related section warnings after initda…
Browse files Browse the repository at this point in the history 
…ta got corrected

Commit f8e7ba6 (ARM: OMAP1: fix incorrect placement of
__initdata tag) fixed things but we started seeing section
warnings. Looks like I missed those in my automatic
build scripts:

Section mismatch in reference from the variable omap7xx_gpio6 to the (unknown reference) .init.data:(unknown)
Section mismatch in reference from the variable omap7xx_gpio6 to the (unknown reference) .init.data:(unknown)
Section mismatch in reference from the variable omap7xx_gpio5 to the (unknown reference) .init.data:(unknown)
...

Fix the issue by removing __initdata for the resources.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
  • Loading branch information
Tony Lindgren authored and Kevin Hilman committed Oct 18, 2013
1 parent 9657b77 commit ffd076e
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 28 deletions.
8 changes: 4 additions & 4 deletions arch/arm/mach-omap1/gpio15xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#define OMAP1510_GPIO_BASE 0xFFFCE000

/* gpio1 */
static struct resource omap15xx_mpu_gpio_resources[] __initdata = {
static struct resource omap15xx_mpu_gpio_resources[] = {
{
.start = OMAP1_MPUIO_VBASE,
.end = OMAP1_MPUIO_VBASE + SZ_2K - 1,
Expand All @@ -48,7 +48,7 @@ static struct omap_gpio_reg_offs omap15xx_mpuio_regs = {
.irqctrl = OMAP_MPUIO_GPIO_INT_EDGE,
};

static struct omap_gpio_platform_data omap15xx_mpu_gpio_config __initdata = {
static struct omap_gpio_platform_data omap15xx_mpu_gpio_config = {
.is_mpuio = true,
.bank_width = 16,
.bank_stride = 1,
Expand All @@ -66,7 +66,7 @@ static struct platform_device omap15xx_mpu_gpio = {
};

/* gpio2 */
static struct resource omap15xx_gpio_resources[] __initdata = {
static struct resource omap15xx_gpio_resources[] = {
{
.start = OMAP1510_GPIO_BASE,
.end = OMAP1510_GPIO_BASE + SZ_2K - 1,
Expand All @@ -90,7 +90,7 @@ static struct omap_gpio_reg_offs omap15xx_gpio_regs = {
.pinctrl = OMAP1510_GPIO_PIN_CONTROL,
};

static struct omap_gpio_platform_data omap15xx_gpio_config __initdata = {
static struct omap_gpio_platform_data omap15xx_gpio_config = {
.bank_width = 16,
.regs = &omap15xx_gpio_regs,
};
Expand Down
20 changes: 10 additions & 10 deletions arch/arm/mach-omap1/gpio16xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#define SYSCONFIG_WORD 0x14

/* mpu gpio */
static struct resource omap16xx_mpu_gpio_resources[] __initdata = {
static struct resource omap16xx_mpu_gpio_resources[] = {
{
.start = OMAP1_MPUIO_VBASE,
.end = OMAP1_MPUIO_VBASE + SZ_2K - 1,
Expand All @@ -54,7 +54,7 @@ static struct omap_gpio_reg_offs omap16xx_mpuio_regs = {
.irqctrl = OMAP_MPUIO_GPIO_INT_EDGE,
};

static struct omap_gpio_platform_data omap16xx_mpu_gpio_config __initdata = {
static struct omap_gpio_platform_data omap16xx_mpu_gpio_config = {
.is_mpuio = true,
.bank_width = 16,
.bank_stride = 1,
Expand All @@ -72,7 +72,7 @@ static struct platform_device omap16xx_mpu_gpio = {
};

/* gpio1 */
static struct resource omap16xx_gpio1_resources[] __initdata = {
static struct resource omap16xx_gpio1_resources[] = {
{
.start = OMAP1610_GPIO1_BASE,
.end = OMAP1610_GPIO1_BASE + SZ_2K - 1,
Expand Down Expand Up @@ -100,7 +100,7 @@ static struct omap_gpio_reg_offs omap16xx_gpio_regs = {
.edgectrl2 = OMAP1610_GPIO_EDGE_CTRL2,
};

static struct omap_gpio_platform_data omap16xx_gpio1_config __initdata = {
static struct omap_gpio_platform_data omap16xx_gpio1_config = {
.bank_width = 16,
.regs = &omap16xx_gpio_regs,
};
Expand All @@ -116,7 +116,7 @@ static struct platform_device omap16xx_gpio1 = {
};

/* gpio2 */
static struct resource omap16xx_gpio2_resources[] __initdata = {
static struct resource omap16xx_gpio2_resources[] = {
{
.start = OMAP1610_GPIO2_BASE,
.end = OMAP1610_GPIO2_BASE + SZ_2K - 1,
Expand All @@ -128,7 +128,7 @@ static struct resource omap16xx_gpio2_resources[] __initdata = {
},
};

static struct omap_gpio_platform_data omap16xx_gpio2_config __initdata = {
static struct omap_gpio_platform_data omap16xx_gpio2_config = {
.bank_width = 16,
.regs = &omap16xx_gpio_regs,
};
Expand All @@ -144,7 +144,7 @@ static struct platform_device omap16xx_gpio2 = {
};

/* gpio3 */
static struct resource omap16xx_gpio3_resources[] __initdata = {
static struct resource omap16xx_gpio3_resources[] = {
{
.start = OMAP1610_GPIO3_BASE,
.end = OMAP1610_GPIO3_BASE + SZ_2K - 1,
Expand All @@ -156,7 +156,7 @@ static struct resource omap16xx_gpio3_resources[] __initdata = {
},
};

static struct omap_gpio_platform_data omap16xx_gpio3_config __initdata = {
static struct omap_gpio_platform_data omap16xx_gpio3_config = {
.bank_width = 16,
.regs = &omap16xx_gpio_regs,
};
Expand All @@ -172,7 +172,7 @@ static struct platform_device omap16xx_gpio3 = {
};

/* gpio4 */
static struct resource omap16xx_gpio4_resources[] __initdata = {
static struct resource omap16xx_gpio4_resources[] = {
{
.start = OMAP1610_GPIO4_BASE,
.end = OMAP1610_GPIO4_BASE + SZ_2K - 1,
Expand All @@ -184,7 +184,7 @@ static struct resource omap16xx_gpio4_resources[] __initdata = {
},
};

static struct omap_gpio_platform_data omap16xx_gpio4_config __initdata = {
static struct omap_gpio_platform_data omap16xx_gpio4_config = {
.bank_width = 16,
.regs = &omap16xx_gpio_regs,
};
Expand Down
28 changes: 14 additions & 14 deletions arch/arm/mach-omap1/gpio7xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#define OMAP1_MPUIO_VBASE OMAP1_MPUIO_BASE

/* mpu gpio */
static struct resource omap7xx_mpu_gpio_resources[] __initdata = {
static struct resource omap7xx_mpu_gpio_resources[] = {
{
.start = OMAP1_MPUIO_VBASE,
.end = OMAP1_MPUIO_VBASE + SZ_2K - 1,
Expand All @@ -53,7 +53,7 @@ static struct omap_gpio_reg_offs omap7xx_mpuio_regs = {
.irqctrl = OMAP_MPUIO_GPIO_INT_EDGE >> 1,
};

static struct omap_gpio_platform_data omap7xx_mpu_gpio_config __initdata = {
static struct omap_gpio_platform_data omap7xx_mpu_gpio_config = {
.is_mpuio = true,
.bank_width = 16,
.bank_stride = 2,
Expand All @@ -71,7 +71,7 @@ static struct platform_device omap7xx_mpu_gpio = {
};

/* gpio1 */
static struct resource omap7xx_gpio1_resources[] __initdata = {
static struct resource omap7xx_gpio1_resources[] = {
{
.start = OMAP7XX_GPIO1_BASE,
.end = OMAP7XX_GPIO1_BASE + SZ_2K - 1,
Expand All @@ -94,7 +94,7 @@ static struct omap_gpio_reg_offs omap7xx_gpio_regs = {
.irqctrl = OMAP7XX_GPIO_INT_CONTROL,
};

static struct omap_gpio_platform_data omap7xx_gpio1_config __initdata = {
static struct omap_gpio_platform_data omap7xx_gpio1_config = {
.bank_width = 32,
.regs = &omap7xx_gpio_regs,
};
Expand All @@ -110,7 +110,7 @@ static struct platform_device omap7xx_gpio1 = {
};

/* gpio2 */
static struct resource omap7xx_gpio2_resources[] __initdata = {
static struct resource omap7xx_gpio2_resources[] = {
{
.start = OMAP7XX_GPIO2_BASE,
.end = OMAP7XX_GPIO2_BASE + SZ_2K - 1,
Expand All @@ -122,7 +122,7 @@ static struct resource omap7xx_gpio2_resources[] __initdata = {
},
};

static struct omap_gpio_platform_data omap7xx_gpio2_config __initdata = {
static struct omap_gpio_platform_data omap7xx_gpio2_config = {
.bank_width = 32,
.regs = &omap7xx_gpio_regs,
};
Expand All @@ -138,7 +138,7 @@ static struct platform_device omap7xx_gpio2 = {
};

/* gpio3 */
static struct resource omap7xx_gpio3_resources[] __initdata = {
static struct resource omap7xx_gpio3_resources[] = {
{
.start = OMAP7XX_GPIO3_BASE,
.end = OMAP7XX_GPIO3_BASE + SZ_2K - 1,
Expand All @@ -150,7 +150,7 @@ static struct resource omap7xx_gpio3_resources[] __initdata = {
},
};

static struct omap_gpio_platform_data omap7xx_gpio3_config __initdata = {
static struct omap_gpio_platform_data omap7xx_gpio3_config = {
.bank_width = 32,
.regs = &omap7xx_gpio_regs,
};
Expand All @@ -166,7 +166,7 @@ static struct platform_device omap7xx_gpio3 = {
};

/* gpio4 */
static struct resource omap7xx_gpio4_resources[] __initdata = {
static struct resource omap7xx_gpio4_resources[] = {
{
.start = OMAP7XX_GPIO4_BASE,
.end = OMAP7XX_GPIO4_BASE + SZ_2K - 1,
Expand All @@ -178,7 +178,7 @@ static struct resource omap7xx_gpio4_resources[] __initdata = {
},
};

static struct omap_gpio_platform_data omap7xx_gpio4_config __initdata = {
static struct omap_gpio_platform_data omap7xx_gpio4_config = {
.bank_width = 32,
.regs = &omap7xx_gpio_regs,
};
Expand All @@ -194,7 +194,7 @@ static struct platform_device omap7xx_gpio4 = {
};

/* gpio5 */
static struct resource omap7xx_gpio5_resources[] __initdata = {
static struct resource omap7xx_gpio5_resources[] = {
{
.start = OMAP7XX_GPIO5_BASE,
.end = OMAP7XX_GPIO5_BASE + SZ_2K - 1,
Expand All @@ -206,7 +206,7 @@ static struct resource omap7xx_gpio5_resources[] __initdata = {
},
};

static struct omap_gpio_platform_data omap7xx_gpio5_config __initdata = {
static struct omap_gpio_platform_data omap7xx_gpio5_config = {
.bank_width = 32,
.regs = &omap7xx_gpio_regs,
};
Expand All @@ -222,7 +222,7 @@ static struct platform_device omap7xx_gpio5 = {
};

/* gpio6 */
static struct resource omap7xx_gpio6_resources[] __initdata = {
static struct resource omap7xx_gpio6_resources[] = {
{
.start = OMAP7XX_GPIO6_BASE,
.end = OMAP7XX_GPIO6_BASE + SZ_2K - 1,
Expand All @@ -234,7 +234,7 @@ static struct resource omap7xx_gpio6_resources[] __initdata = {
},
};

static struct omap_gpio_platform_data omap7xx_gpio6_config __initdata = {
static struct omap_gpio_platform_data omap7xx_gpio6_config = {
.bank_width = 32,
.regs = &omap7xx_gpio_regs,
};
Expand Down

0 comments on commit ffd076e

Please sign in to comment.