Commit 03db0729 authored by David Brown's avatar David Brown
Browse files

msm: Remove chip-ifdefs for GPIO io mappings 



The two GPIO controllers are always mapped to the same virtual address
across all MSM devices.  Instead of selecting this at compile time,
determine the physical address at runtime, eliminating yet something
else preventing multiple MSM targets from being compiled into the same
kernel.

Change-Id: I1672219d978ab6243526adeda6badf49472baa27
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
parent ce427c38

arch/arm/mach-msm/include/mach/msm_iomap-7x00.h

+4 −6
Original line number Diff line number Diff line
@@ -55,13 +55,11 @@ 
#define MSM_DMOV_PHYS         0xA9700000

#define MSM_DMOV_SIZE         SZ_4K



#define MSM_GPIO1_BASE        IOMEM(0xE0003000)

#define MSM_GPIO1_PHYS        0xA9200000

#define MSM_GPIO1_SIZE        SZ_4K

#define MSM7X00_GPIO1_PHYS        0xA9200000

#define MSM7X00_GPIO1_SIZE        SZ_4K



#define MSM_GPIO2_BASE        IOMEM(0xE0004000)

#define MSM_GPIO2_PHYS        0xA9300000

#define MSM_GPIO2_SIZE        SZ_4K

#define MSM7X00_GPIO2_PHYS        0xA9300000

#define MSM7X00_GPIO2_SIZE        SZ_4K



#define MSM_CLK_CTL_BASE      IOMEM(0xE0005000)

#define MSM_CLK_CTL_PHYS      0xA8600000

arch/arm/mach-msm/include/mach/msm_iomap-7x30.h

+4 −6
Original line number Diff line number Diff line
@@ -46,13 +46,11 @@ 
#define MSM_DMOV_PHYS         0xAC400000

#define MSM_DMOV_SIZE         SZ_4K



#define MSM_GPIO1_BASE        IOMEM(0xE0003000)

#define MSM_GPIO1_PHYS        0xAC001000

#define MSM_GPIO1_SIZE        SZ_4K

#define MSM7X30_GPIO1_PHYS        0xAC001000

#define MSM7X30_GPIO1_SIZE        SZ_4K



#define MSM_GPIO2_BASE        IOMEM(0xE0004000)

#define MSM_GPIO2_PHYS        0xAC101000

#define MSM_GPIO2_SIZE        SZ_4K

#define MSM7X30_GPIO2_PHYS        0xAC101000

#define MSM7X30_GPIO2_SIZE        SZ_4K



#define MSM_CLK_CTL_BASE      IOMEM(0xE0005000)

#define MSM_CLK_CTL_PHYS      0xAB800000

arch/arm/mach-msm/include/mach/msm_iomap-8x50.h

+4 −6
Original line number Diff line number Diff line
@@ -46,13 +46,11 @@ 
#define MSM_DMOV_PHYS         0xA9700000

#define MSM_DMOV_SIZE         SZ_4K



#define MSM_GPIO1_BASE        IOMEM(0xE0003000)

#define MSM_GPIO1_PHYS        0xA9000000

#define MSM_GPIO1_SIZE        SZ_4K

#define QSD8X50_GPIO1_PHYS        0xA9000000

#define QSD8X50_GPIO1_SIZE        SZ_4K



#define MSM_GPIO2_BASE        IOMEM(0xE0004000)

#define MSM_GPIO2_PHYS        0xA9100000

#define MSM_GPIO2_SIZE        SZ_4K

#define QSD8X50_GPIO2_PHYS        0xA9100000

#define QSD8X50_GPIO2_SIZE        SZ_4K



#define MSM_CLK_CTL_BASE      IOMEM(0xE0005000)

#define MSM_CLK_CTL_PHYS      0xA8600000

arch/arm/mach-msm/include/mach/msm_iomap.h

+2 −0
Original line number Diff line number Diff line
@@ -61,5 +61,7 @@ 
#define MSM_QGIC_CPU_BASE	IOMEM(0xF0001000)

#define MSM_TMR_BASE		IOMEM(0xF0200000)

#define MSM_TMR0_BASE		IOMEM(0xF0201000)

#define MSM_GPIO1_BASE		IOMEM(0xE0003000)

#define MSM_GPIO2_BASE		IOMEM(0xE0004000)



#endif

arch/arm/mach-msm/io.c

+6 −6
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ static struct map_desc msm_io_desc[] __initdata = { 
	MSM_DEVICE(VIC),

	MSM_CHIP_DEVICE(CSR, MSM7X00),

	MSM_DEVICE(DMOV),

	MSM_DEVICE(GPIO1),

	MSM_DEVICE(GPIO2),

	MSM_CHIP_DEVICE(GPIO1, MSM7X00),

	MSM_CHIP_DEVICE(GPIO2, MSM7X00),

	MSM_DEVICE(CLK_CTL),

#ifdef CONFIG_MSM_DEBUG_UART

	MSM_DEVICE(DEBUG_UART),
@@ -76,8 +76,8 @@ static struct map_desc qsd8x50_io_desc[] __initdata = { 
	MSM_DEVICE(VIC),

	MSM_CHIP_DEVICE(CSR, QSD8X50),

	MSM_DEVICE(DMOV),

	MSM_DEVICE(GPIO1),

	MSM_DEVICE(GPIO2),

	MSM_CHIP_DEVICE(GPIO1, QSD8X50),

	MSM_CHIP_DEVICE(GPIO2, QSD8X50),

	MSM_DEVICE(CLK_CTL),

	MSM_DEVICE(SIRC),

	MSM_DEVICE(SCPLL),
@@ -135,8 +135,8 @@ static struct map_desc msm7x30_io_desc[] __initdata = { 
	MSM_DEVICE(VIC),

	MSM_CHIP_DEVICE(CSR, MSM7X30),

	MSM_DEVICE(DMOV),

	MSM_DEVICE(GPIO1),

	MSM_DEVICE(GPIO2),

	MSM_CHIP_DEVICE(GPIO1, MSM7X30),

	MSM_CHIP_DEVICE(GPIO2, MSM7X30),

	MSM_DEVICE(CLK_CTL),

	MSM_DEVICE(CLK_CTL_SH2),

	MSM_DEVICE(AD5),

CRA Git | Maintained and supported by SUSTech CRA and CCSE