From: Stephen Rothwell Date: Thu, 18 Aug 2011 01:44:37 +0000 (+1000) Subject: Merge remote-tracking branch 'msm/for-next' X-Git-Tag: next-20110818~79 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bb499020ac86acafe5b7f2aec7046f1f01883696;p=karo-tx-linux.git Merge remote-tracking branch 'msm/for-next' Conflicts: arch/arm/mach-msm/io.c --- bb499020ac86acafe5b7f2aec7046f1f01883696 diff --cc arch/arm/mach-msm/board-msm8960.c index b04468e7d00e,8294692c27d7..dab58ef834d7 --- a/arch/arm/mach-msm/board-msm8960.c +++ b/arch/arm/mach-msm/board-msm8960.c @@@ -94,18 -92,16 +110,20 @@@ static void __init msm8960_rumi3_init(v } MACHINE_START(MSM8960_SIM, "QCT MSM8960 SIMULATOR") + .fixup = msm8960_fixup, + .reserve = msm8960_reserve, .map_io = msm8960_map_io, + .init_early = msm8960_init_early, .init_irq = msm8960_init_irq, .timer = &msm_timer, .init_machine = msm8960_sim_init, MACHINE_END MACHINE_START(MSM8960_RUMI3, "QCT MSM8960 RUMI3") + .fixup = msm8960_fixup, + .reserve = msm8960_reserve, .map_io = msm8960_map_io, + .init_early = msm8960_init_early, .init_irq = msm8960_init_irq, .timer = &msm_timer, .init_machine = msm8960_rumi3_init, diff --cc arch/arm/mach-msm/board-msm8x60.c index 9221f54778be,98c47ce517fb..5b47ec85aa54 --- a/arch/arm/mach-msm/board-msm8x60.c +++ b/arch/arm/mach-msm/board-msm8x60.c @@@ -29,22 -27,8 +29,23 @@@ #include #include + #include "devices.h" +static void __init msm8x60_fixup(struct machine_desc *desc, struct tag *tag, + char **cmdline, struct meminfo *mi) +{ + for (; tag->hdr.size; tag = tag_next(tag)) + if (tag->hdr.tag == ATAG_MEM && + tag->u.mem.start == 0x40200000) { + tag->u.mem.start = 0x40000000; + tag->u.mem.size += SZ_2M; + } +} + +static void __init msm8x60_reserve(void) +{ + memblock_remove(0x40000000, SZ_2M); +} static void __init msm8x60_map_io(void) { diff --cc arch/arm/mach-msm/include/mach/msm_iomap-7x00.h index 94fe9fe6feb3,d6540e1192eb..04bca831ecb0 --- a/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h +++ b/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h @@@ -51,15 -51,16 +51,14 @@@ #define MSM7X00_CSR_PHYS 0xC0100000 #define MSM7X00_CSR_SIZE SZ_4K - #define MSM_DMOV_BASE IOMEM(0xE0002000) - #define MSM_DMOV_PHYS 0xA9700000 - #define MSM_DMOV_SIZE SZ_4K + #define MSM7X00_DMOV_PHYS 0xA9700000 + #define MSM7X00_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 diff --cc arch/arm/mach-msm/include/mach/msm_iomap-7x30.h index 37694442d1bd,23912e541cdb..7357ed6b1164 --- a/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h +++ b/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h @@@ -42,15 -42,16 +42,14 @@@ #define MSM7X30_CSR_PHYS 0xC0100000 #define MSM7X30_CSR_SIZE SZ_4K - #define MSM_DMOV_BASE IOMEM(0xE0002000) - #define MSM_DMOV_PHYS 0xAC400000 - #define MSM_DMOV_SIZE SZ_4K + #define MSM7X30_DMOV_PHYS 0xAC400000 + #define MSM7X30_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 diff --cc arch/arm/mach-msm/include/mach/msm_iomap-8x50.h index d67cd73316f4,fc36b82d41b3..38f37ed66c70 --- a/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h +++ b/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h @@@ -42,15 -42,16 +42,14 @@@ #define QSD8X50_CSR_PHYS 0xAC100000 #define QSD8X50_CSR_SIZE SZ_4K - #define MSM_DMOV_BASE IOMEM(0xE0002000) - #define MSM_DMOV_PHYS 0xA9700000 - #define MSM_DMOV_SIZE SZ_4K + #define QSD8X50_DMOV_PHYS 0xA9700000 + #define QSD8X50_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 diff --cc arch/arm/mach-msm/io.c index 140ddbbc3a8a,1c86cda45d3b..067653a11fbb --- a/arch/arm/mach-msm/io.c +++ b/arch/arm/mach-msm/io.c @@@ -42,9 -42,8 +42,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), @@@ -75,9 -74,8 +74,8 @@@ void __init msm_map_common_io(void 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), @@@ -134,9 -132,8 +132,8 @@@ void __init msm_map_msm8960_io(void 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),