From b11f70db1670a31d70b92e148d47010adf86aea3 Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Tue, 4 Dec 2012 12:54:22 -0500 Subject: OMAP3: Replace magic GPIO numbers in omap3_generic.c with macros. Based on following lines in omap3-silicon.h: #define OMAP_L4_WKUP_BASE 0x48300000 #define OMAP_L4_PER_BASE 0x49000000 ... snip ... #define OMAP_GPIO1_BASE (OMAP_L4_WKUP_BASE + 0x10000) #define OMAP_GPIO2_BASE (OMAP_L4_PER_BASE + 0x50000) #define OMAP_GPIO3_BASE (OMAP_L4_PER_BASE + 0x52000) #define OMAP_GPIO4_BASE (OMAP_L4_PER_BASE + 0x54000) #define OMAP_GPIO5_BASE (OMAP_L4_PER_BASE + 0x56000) #define OMAP_GPIO6_BASE (OMAP_L4_PER_BASE + 0x58000) Signed-off-by: Robert P. J. Day Signed-off-by: Sascha Hauer --- arch/arm/mach-omap/omap3_generic.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-omap/omap3_generic.c b/arch/arm/mach-omap/omap3_generic.c index 1e1308ec6a..7b6f1f9c41 100644 --- a/arch/arm/mach-omap/omap3_generic.c +++ b/arch/arm/mach-omap/omap3_generic.c @@ -515,17 +515,17 @@ const struct gpmc_config omap3_nand_cfg = { #ifndef __PBL__ static int omap3_gpio_init(void) { - add_generic_device("omap-gpio", 0, NULL, 0x48310000, + add_generic_device("omap-gpio", 0, NULL, OMAP_GPIO1_BASE, 0xf00, IORESOURCE_MEM, NULL); - add_generic_device("omap-gpio", 1, NULL, 0x49050000, + add_generic_device("omap-gpio", 1, NULL, OMAP_GPIO2_BASE, 0xf00, IORESOURCE_MEM, NULL); - add_generic_device("omap-gpio", 2, NULL, 0x49052000, + add_generic_device("omap-gpio", 2, NULL, OMAP_GPIO3_BASE, 0xf00, IORESOURCE_MEM, NULL); - add_generic_device("omap-gpio", 3, NULL, 0x49054000, + add_generic_device("omap-gpio", 3, NULL, OMAP_GPIO4_BASE, 0xf00, IORESOURCE_MEM, NULL); - add_generic_device("omap-gpio", 4, NULL, 0x49056000, + add_generic_device("omap-gpio", 4, NULL, OMAP_GPIO5_BASE, 0xf00, IORESOURCE_MEM, NULL); - add_generic_device("omap-gpio", 5, NULL, 0x49058000, + add_generic_device("omap-gpio", 5, NULL, OMAP_GPIO6_BASE, 0xf00, IORESOURCE_MEM, NULL); return 0; -- cgit v1.2.3