From: Olof Johansson Date: Fri, 21 Sep 2012 05:53:18 +0000 (-0700) Subject: Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux into... X-Git-Tag: upstream/snapshot3+hdmi~6572^2~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5ae8d15f686f93d2ac60a7b16d8ddfbfdfc7c00f;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux into next/multiplatform Enable initial ARM multi-platform support for highbank, mvebu, socfpga, picoxcell, and vexpress. Multi-platform support is dependent on mach/gpio.h removal and restructuring of DEBUG_LL and dtb build rules included in this branch. This has been built for all defconfigs, and booted on highbank with all 5 platforms enabled. By Rob Herring (18) and Arnd Bergmann (1) via Rob Herring * tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux: ARM: vexpress: convert to multi-platform ARM: initial multiplatform support ARM: mvebu: move armada-370-xp.h in mach dir ARM: vexpress: remove dependency on mach/* headers ARM: picoxcell: remove dependency on mach/* headers ARM: move all dtb targets out of Makefile.boot ARM: picoxcell: move debug macros to include/debug ARM: socfpga: move debug macros to include/debug ARM: mvebu: move debug macros to include/debug ARM: vexpress: move debug macros to include/debug ARM: highbank: move debug macros to include/debug ARM: move debug macros to common location ARM: make mach/gpio.h headers optional ARM: orion: move custom gpio functions to orion-gpio.h ARM: shmobile: move custom gpio functions to sh-gpio.h ARM: pxa: use gpio_to_irq for sharppm_sl net: pxaficp_ir: add irq resources usb: pxa27x_udc: remove IRQ_USB define staging: ste_rmi4: remove gpio.h include Conflicts due to addition of bcm2835 and removal of pnx4008 in: arch/arm/Kconfig arch/arm/Makefile Conflicts due to new dtb targets, moved to arch/arm/boot/dts/Makefile in: arch/arm/mach-imx/Makefile.boot arch/arm/mach-mxs/Makefile.boot arch/arm/mach-tegra/Makefile.boot Signed-off-by: Olof Johansson --- 5ae8d15f686f93d2ac60a7b16d8ddfbfdfc7c00f diff --cc arch/arm/Kconfig index 4235503,16773aa..f416422 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@ -696,25 -644,14 +652,6 @@@ config ARCH_TEGR This enables support for NVIDIA Tegra based systems (Tegra APX, Tegra 6xx and Tegra 2 series). - config ARCH_PICOXCELL - bool "Picochip picoXcell" - select ARCH_REQUIRE_GPIOLIB - select ARM_PATCH_PHYS_VIRT - select ARM_VIC - select CPU_V6K - select DW_APB_TIMER - select DW_APB_TIMER_OF - select GENERIC_CLOCKEVENTS - select GENERIC_GPIO - select HAVE_TCM - select NO_IOPORT - select SPARSE_IRQ - select USE_OF -config ARCH_PNX4008 - bool "Philips Nexperia PNX4008 Mobile" - select CPU_ARM926T - select CLKDEV_LOOKUP - select ARCH_USES_GETTIMEOFFSET -- help - This enables support for systems based on the Picochip picoXcell - family of Femtocell devices. The picoxcell support requires device tree - for all boards. - This enables support for Philips PNX4008 mobile platform. -- config ARCH_PXA bool "PXA2xx/PXA3xx-based" depends on MMU diff --cc arch/arm/Makefile index f476182,5f3c55a..1c974cf --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@@ -135,69 -135,64 +135,64 @@@ textofs-$(CONFIG_ARCH_MSM8960) := 0x002 # Machine directory name. This list is sorted alphanumerically # by CONFIG_* macro name. - machine-$(CONFIG_ARCH_AT91) := at91 - machine-$(CONFIG_ARCH_BCM2835) := bcm2835 - machine-$(CONFIG_ARCH_BCMRING) := bcmring - machine-$(CONFIG_ARCH_CLPS711X) := clps711x - machine-$(CONFIG_ARCH_CNS3XXX) := cns3xxx - machine-$(CONFIG_ARCH_DAVINCI) := davinci - machine-$(CONFIG_ARCH_DOVE) := dove - machine-$(CONFIG_ARCH_EBSA110) := ebsa110 - machine-$(CONFIG_ARCH_EP93XX) := ep93xx - machine-$(CONFIG_ARCH_GEMINI) := gemini - machine-$(CONFIG_ARCH_H720X) := h720x - machine-$(CONFIG_ARCH_HIGHBANK) := highbank - machine-$(CONFIG_ARCH_INTEGRATOR) := integrator - machine-$(CONFIG_ARCH_IOP13XX) := iop13xx - machine-$(CONFIG_ARCH_IOP32X) := iop32x - machine-$(CONFIG_ARCH_IOP33X) := iop33x - machine-$(CONFIG_ARCH_IXP4XX) := ixp4xx - machine-$(CONFIG_ARCH_KIRKWOOD) := kirkwood - machine-$(CONFIG_ARCH_KS8695) := ks8695 - machine-$(CONFIG_ARCH_LPC32XX) := lpc32xx - machine-$(CONFIG_ARCH_MMP) := mmp - machine-$(CONFIG_ARCH_MSM) := msm - machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 - machine-$(CONFIG_ARCH_IMX_V4_V5) := imx - machine-$(CONFIG_ARCH_IMX_V6_V7) := imx - machine-$(CONFIG_ARCH_MXS) := mxs - machine-$(CONFIG_ARCH_MVEBU) := mvebu - machine-$(CONFIG_ARCH_NETX) := netx - machine-$(CONFIG_ARCH_NOMADIK) := nomadik - machine-$(CONFIG_ARCH_OMAP1) := omap1 - machine-$(CONFIG_ARCH_OMAP2PLUS) := omap2 - machine-$(CONFIG_ARCH_ORION5X) := orion5x - machine-$(CONFIG_ARCH_PICOXCELL) := picoxcell - machine-$(CONFIG_ARCH_PRIMA2) := prima2 - machine-$(CONFIG_ARCH_PXA) := pxa - machine-$(CONFIG_ARCH_REALVIEW) := realview - machine-$(CONFIG_ARCH_RPC) := rpc - machine-$(CONFIG_ARCH_S3C24XX) := s3c24xx s3c2412 s3c2440 - machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx - machine-$(CONFIG_ARCH_S5P64X0) := s5p64x0 - machine-$(CONFIG_ARCH_S5PC100) := s5pc100 - machine-$(CONFIG_ARCH_S5PV210) := s5pv210 - machine-$(CONFIG_ARCH_EXYNOS4) := exynos - machine-$(CONFIG_ARCH_EXYNOS5) := exynos - machine-$(CONFIG_ARCH_SA1100) := sa1100 - machine-$(CONFIG_ARCH_SHARK) := shark - machine-$(CONFIG_ARCH_SHMOBILE) := shmobile - machine-$(CONFIG_ARCH_TEGRA) := tegra - machine-$(CONFIG_ARCH_U300) := u300 - machine-$(CONFIG_ARCH_U8500) := ux500 - machine-$(CONFIG_ARCH_VERSATILE) := versatile - machine-$(CONFIG_ARCH_VEXPRESS) := vexpress - machine-$(CONFIG_ARCH_VT8500) := vt8500 - machine-$(CONFIG_ARCH_W90X900) := w90x900 - machine-$(CONFIG_FOOTBRIDGE) := footbridge - machine-$(CONFIG_ARCH_SOCFPGA) := socfpga - machine-$(CONFIG_MACH_SPEAR1310) := spear13xx - machine-$(CONFIG_MACH_SPEAR1340) := spear13xx - machine-$(CONFIG_MACH_SPEAR300) := spear3xx - machine-$(CONFIG_MACH_SPEAR310) := spear3xx - machine-$(CONFIG_MACH_SPEAR320) := spear3xx - machine-$(CONFIG_MACH_SPEAR600) := spear6xx - machine-$(CONFIG_ARCH_ZYNQ) := zynq + machine-$(CONFIG_ARCH_AT91) += at91 ++machine-$(CONFIG_ARCH_BCM2835) += bcm2835 + machine-$(CONFIG_ARCH_BCMRING) += bcmring + machine-$(CONFIG_ARCH_CLPS711X) += clps711x + machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx + machine-$(CONFIG_ARCH_DAVINCI) += davinci + machine-$(CONFIG_ARCH_DOVE) += dove + machine-$(CONFIG_ARCH_EBSA110) += ebsa110 + machine-$(CONFIG_ARCH_EP93XX) += ep93xx + machine-$(CONFIG_ARCH_GEMINI) += gemini + machine-$(CONFIG_ARCH_H720X) += h720x + machine-$(CONFIG_ARCH_HIGHBANK) += highbank + machine-$(CONFIG_ARCH_INTEGRATOR) += integrator + machine-$(CONFIG_ARCH_IOP13XX) += iop13xx + machine-$(CONFIG_ARCH_IOP32X) += iop32x + machine-$(CONFIG_ARCH_IOP33X) += iop33x + machine-$(CONFIG_ARCH_IXP4XX) += ixp4xx + machine-$(CONFIG_ARCH_KIRKWOOD) += kirkwood + machine-$(CONFIG_ARCH_KS8695) += ks8695 + machine-$(CONFIG_ARCH_LPC32XX) += lpc32xx + machine-$(CONFIG_ARCH_MMP) += mmp + machine-$(CONFIG_ARCH_MSM) += msm + machine-$(CONFIG_ARCH_MV78XX0) += mv78xx0 + machine-$(CONFIG_ARCH_MXC) += imx + machine-$(CONFIG_ARCH_MXS) += mxs + machine-$(CONFIG_ARCH_MVEBU) += mvebu + machine-$(CONFIG_ARCH_NETX) += netx + machine-$(CONFIG_ARCH_NOMADIK) += nomadik + machine-$(CONFIG_ARCH_OMAP1) += omap1 + machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2 + machine-$(CONFIG_ARCH_ORION5X) += orion5x + machine-$(CONFIG_ARCH_PICOXCELL) += picoxcell -machine-$(CONFIG_ARCH_PNX4008) += pnx4008 + machine-$(CONFIG_ARCH_PRIMA2) += prima2 + machine-$(CONFIG_ARCH_PXA) += pxa + machine-$(CONFIG_ARCH_REALVIEW) += realview + machine-$(CONFIG_ARCH_RPC) += rpc + machine-$(CONFIG_ARCH_S3C24XX) += s3c24xx s3c2412 s3c2440 + machine-$(CONFIG_ARCH_S3C64XX) += s3c64xx + machine-$(CONFIG_ARCH_S5P64X0) += s5p64x0 + machine-$(CONFIG_ARCH_S5PC100) += s5pc100 + machine-$(CONFIG_ARCH_S5PV210) += s5pv210 + machine-$(CONFIG_ARCH_EXYNOS) += exynos + machine-$(CONFIG_ARCH_SA1100) += sa1100 + machine-$(CONFIG_ARCH_SHARK) += shark + machine-$(CONFIG_ARCH_SHMOBILE) += shmobile + machine-$(CONFIG_ARCH_TEGRA) += tegra + machine-$(CONFIG_ARCH_U300) += u300 + machine-$(CONFIG_ARCH_U8500) += ux500 + machine-$(CONFIG_ARCH_VERSATILE) += versatile + machine-$(CONFIG_ARCH_VEXPRESS) += vexpress + machine-$(CONFIG_ARCH_VT8500) += vt8500 + machine-$(CONFIG_ARCH_W90X900) += w90x900 + machine-$(CONFIG_FOOTBRIDGE) += footbridge + machine-$(CONFIG_ARCH_SOCFPGA) += socfpga + machine-$(CONFIG_ARCH_SPEAR13XX) += spear13xx + machine-$(CONFIG_ARCH_SPEAR3XX) += spear3xx + machine-$(CONFIG_MACH_SPEAR600) += spear6xx + machine-$(CONFIG_ARCH_ZYNQ) += zynq # Platform directory name. This list is sorted alphanumerically # by CONFIG_* macro name. diff --cc arch/arm/boot/dts/Makefile index 0000000,d081e6a..eda7b55 mode 000000,100644..100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@@ -1,0 -1,71 +1,84 @@@ + ifeq ($(CONFIG_OF),y) + + dtb-$(CONFIG_ARCH_AT91) += aks-cdu.dtb \ + at91sam9263ek.dtb \ + at91sam9g20ek_2mmc.dtb \ + at91sam9g20ek.dtb \ + at91sam9g25ek.dtb \ + at91sam9m10g45ek.dtb \ + at91sam9n12ek.dtb \ + ethernut5.dtb \ + evk-pro3.dtb \ + kizbox.dtb \ + tny_a9260.dtb \ + tny_a9263.dtb \ + tny_a9g20.dtb \ + usb_a9260.dtb \ + usb_a9263.dtb \ + usb_a9g20.dtb + dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \ + exynos4210-smdkv310.dtb \ + exynos5250-smdk5250.dtb + dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb ++dtb-$(CONFIG_ARCH_IMX5) += imx51-babbage.dtb \ ++ imx53-ard.dtb \ ++ imx53-evk.dtb \ ++ imx53-qsb.dtb \ ++ imx53-smd.dtb ++dtb-$(CONFIG_SOC_IMX6Q) += imx6q-arm2.dtb \ ++ imx6q-sabrelite.dtb \ ++ imx6q-sabresd.dtb + dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb + dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \ + kirkwood-dns325.dtb \ + kirkwood-dreamplug.dtb \ + kirkwood-goflexnet.dtb \ + kirkwood-ib62x0.dtb \ + kirkwood-iconnect.dtb \ + kirkwood-lschlv2.dtb \ + kirkwood-lsxhl.dtb \ + kirkwood-ts219-6281.dtb \ + kirkwood-ts219-6282.dtb + dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \ + armada-xp-db.dtb + dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \ + imx53-ard.dtb \ + imx53-evk.dtb \ + imx53-qsb.dtb \ + imx53-smd.dtb \ + imx6q-arm2.dtb \ + imx6q-sabrelite.dtb \ + imx6q-sabresd.dtb + dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \ + imx23-olinuxino.dtb \ + imx23-stmp378x_devb.dtb \ + imx28-apx4devkit.dtb \ + imx28-cfa10036.dtb \ ++ imx28-cfa10049.dtb \ + imx28-evk.dtb \ + imx28-m28evk.dtb \ + imx28-tx28.dtb + dtb-$(CONFIG_ARCH_U8500) += snowball.dtb + dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \ + spear1340-evb.dtb + dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \ + spear310-evb.dtb \ + spear320-evb.dtb + dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb + dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ ++ tegra20-medcom-wide.dtb \ + tegra20-paz00.dtb \ ++ tegra20-plutux.dtb \ + tegra20-seaboard.dtb \ ++ tegra20-tec.dtb \ + tegra20-trimslice.dtb \ + tegra20-ventana.dtb \ + tegra20-whistler.dtb \ - tegra30-cardhu.dtb ++ tegra30-cardhu-a02.dtb \ ++ tegra30-cardhu-a04.dtb + dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \ + vexpress-v2p-ca9.dtb \ + vexpress-v2p-ca15-tc1.dtb \ + vexpress-v2p-ca15_a7.dtb + + endif