From: Olof Johansson Date: Mon, 17 Sep 2012 00:46:19 +0000 (-0700) Subject: Merge branch 'next/cleanup' into for-next X-Git-Tag: next-20120917~16^2~14 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=eb9f3fb753e689f40fdbc5d2899a6535bbede004;p=karo-tx-linux.git Merge branch 'next/cleanup' into for-next * next/cleanup: ARM: msm: Remove uncompiled board-msm7x27 ARM: msm: Remove unused acpuclock-arm11 ARM: msm: dma: use list_move_tail instead of list_del/list_add_tail ARM: msm: Fix sparse warnings due to incorrect type ARM: msm: Remove unused idle.c ARM: msm: clock-pcom: Mark functions static ARM: msm: Remove msm_hw_reset_hook --- eb9f3fb753e689f40fdbc5d2899a6535bbede004 diff --cc arch/arm/arm-soc-for-next-contents.txt index 6baeb63a0645,000000000000..32d7777e4d6b mode 100644,000000..100644 --- a/arch/arm/arm-soc-for-next-contents.txt +++ b/arch/arm/arm-soc-for-next-contents.txt @@@ -1,90 -1,0 +1,91 @@@ +This file lists all branches that are pulled into the for-next branch +of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git +and their external dependencies. + +It also includes a couple of directly applied patches for build breaks with subject +The next/* branches are kept in the order in which they get applied. + +external dependencies: +depends/clk-3.7 git://git.linaro.org/people/mturquette/linux.git clk-3.7 + +fixes: + +next/fixes-non-critical: +ux500/fixes-non-critical http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-core-updates +cleanup/of-deviceid-data git://git.pengutronix.de/git/ukl/linux ofdeviceiddata + (pulled again on Sep 12) +imx/fixes-non-critical git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-fixes +msm/fixes-non-critical git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-fix-noncrit-for-3.7 + +next/cleanup: +cleanup/io-pci: git://sources.calxeda.com/kernel/linux.git io-cleanup-pci-v2 +bcmring/cleanup: patches from Arnd +u300/cleanup git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git u300-cleanup +csr/marco-prepare git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git marco-prepare + (includes two patches from clk-next that adds prima2 clocks) +pmu/cleanup git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git tags/arm-perf-3.7 +ks8695/timer http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ks8695-time-for-arm-soc + + http://marc.info/?l=linux-arm-kernel&m=134734253519144 +renesas/ag5evm git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git ag5evm +nxp4008/removal git://git.antcom.de/linux-2.6.git pnx4008-removal +pxa/clk git://github.com/hzhuang1/linux.git clk +imx/cleanup git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-cleanup ++msm/cleanup git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-cleanup-for-3.7 + +next/maintainers: +[email] Entry for ks8695 from Arnd + +next/soc: +ux500/asic-id: git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git ux500-core + + http://marc.info/?l=linux-arm-kernel&m=134667789927502 +renesas/kzm9g git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git kzm9g +lpc32xx/core git://git.antcom.de/linux-2.6.git lpc32xx/core +renesas/soc git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git soc +renesas/pmu git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git pmu/cleanup + depends on pmu/cleanup (next/cleanup) +imx/soc git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-soc + +next/dt: +pxa/dt: git://github.com/hzhuang1/linux.git dt +renesas/soc-core git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git soc-core +csr/pinmux-dt git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git pinmux-dt +lpc32xx/dts git://git.antcom.de/linux-2.6.git lpc32xx/dts +mxs/dt git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-dt-3.7 +depends/clk-3.7 git://git.linaro.org/people/mturquette/linux.git clk-3.7 + -> this is a prereq for mxs/clk-dt-lookup below +mxs/clk-dt-lookup git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-clk-dt-lookup +imx/dt git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-dt-3.7 +imx/clk-dt-lookup git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-clk-dt-lookup + +next/soc2: +mxs/sparse-irq git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-sparse-irq + (functionally depends on mxs/dt) + +next/defconfig: +renesas/defconfig git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git defconfig +lpc32xx/defconfig git://git.antcom.de/linux-2.6.git lpc32xx/defconfig +mxs/defconfig git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-defconfig-3.7 +imx/defconfig git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-defconfig + +next/drivers: +devel/led-driver git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git for-arm-soc +at91/mci git://github.com/at91linux/linux-at91 at91-for-next-soc +drivers/ocp2scp patches from Kishon Vijay Abraham I + + http://marc.info/?l=linux-next&m=134574365000518&w=2 + +next/boards: +pxa/board git://github.com/hzhuang1/linux.git board +ks8695/boards <1346995449-5436-1-git-send-email-gerg@snapgear.com> and + <1346996139-5692-1-git-send-email-gerg@snapgear.com> +renesas/boards git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git boards + (pulled twice) +pxa/boards git://github.com/hzhuang1/linux.git board +imx/boards git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-boards + +next/docs: +mvebu/docs: git://github.com/MISL-EBU-System-SW/mainline-public.git marvell-doc + + + + + diff --cc arch/arm/mach-msm/io.c index af43f6acd7fc,97042331cfc7..3cb4f4c35710 --- a/arch/arm/mach-msm/io.c +++ b/arch/arm/mach-msm/io.c @@@ -33,27 -33,25 +33,26 @@@ .virtual = (unsigned long) MSM_##name##_BASE, \ .pfn = __phys_to_pfn(chip##_##name##_PHYS), \ .length = chip##_##name##_SIZE, \ - .type = MT_DEVICE_NONSHARED, \ + .type = mem_type, \ } +#define MSM_DEVICE_TYPE(name, mem_type) \ + MSM_CHIP_DEVICE_TYPE(name, MSM, mem_type) +#define MSM_CHIP_DEVICE(name, chip) \ + MSM_CHIP_DEVICE_TYPE(name, chip, MT_DEVICE) #define MSM_DEVICE(name) MSM_CHIP_DEVICE(name, MSM) - #if defined(CONFIG_ARCH_MSM7X00A) || defined(CONFIG_ARCH_MSM7X27) \ - || defined(CONFIG_ARCH_MSM7X25) + #if defined(CONFIG_ARCH_MSM7X00A) static struct map_desc msm_io_desc[] __initdata = { - MSM_DEVICE(VIC), - MSM_CHIP_DEVICE(CSR, MSM7X00), - MSM_DEVICE(DMOV), - MSM_CHIP_DEVICE(GPIO1, MSM7X00), - MSM_CHIP_DEVICE(GPIO2, MSM7X00), - MSM_DEVICE(CLK_CTL), + MSM_DEVICE_TYPE(VIC, MT_DEVICE_NONSHARED), + MSM_CHIP_DEVICE_TYPE(CSR, MSM7X00, MT_DEVICE_NONSHARED), + MSM_DEVICE_TYPE(DMOV, MT_DEVICE_NONSHARED), + MSM_CHIP_DEVICE_TYPE(GPIO1, MSM7X00, MT_DEVICE_NONSHARED), + MSM_CHIP_DEVICE_TYPE(GPIO2, MSM7X00, MT_DEVICE_NONSHARED), + MSM_DEVICE_TYPE(CLK_CTL, MT_DEVICE_NONSHARED), #if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \ defined(CONFIG_DEBUG_MSM_UART3) - MSM_DEVICE(DEBUG_UART), -#endif -#ifdef CONFIG_ARCH_MSM7X30 - MSM_DEVICE(GCC), + MSM_DEVICE_TYPE(DEBUG_UART, MT_DEVICE_NONSHARED), #endif { .virtual = (unsigned long) MSM_SHARED_RAM_BASE,