| Message ID | 1343075561-17446-10-git-send-email-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show
Return-Path: <patch+caf_=linaro-patchwork=canonical.com@linaro.org> X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 993E72402A for <patchwork@peony.canonical.com>; Mon, 23 Jul 2012 20:33:30 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 4C28EA18382 for <linaro-patchwork@canonical.com>; Mon, 23 Jul 2012 20:33:30 +0000 (UTC) Received: by ghbz12 with SMTP id z12so6272967ghb.11 for <linaro-patchwork@canonical.com>; Mon, 23 Jul 2012 13:33:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-provags-id:x-gm-message-state; bh=aqXzcJ+kkOVRR1W+lbN8E53j6ius6eYoW+XLEnwAvKk=; b=D/z40JIJ6gHWoi7uOQ4Gu2Jwviaf84iL5TBI1PbiDopRpAeDRqz0aAkZNZLMZO92IG LySg1n+2IO0JEHABwPxkc+jIqUiWbN0J7feBTBfF3U98iA848FcYlN8q7Jm/TBtloFxl bawIWlETZ2LZMt8ahSAjXRI80bW9t/JP+L/O7pxmrffbPE8VbpF3ONthPufW7yyZYr3w a3N/orFMJ6Nqpc9qMIoea9y0AgDCjHJx006BxleeWCVk9gDCuItTPjEKVSZIQ38TlDbp wxr0cPWonElep8CbFqI8MC44bPxW64+DlT2VB1KshVSM92U3v+OKBKTN57PinvnHCb/C LUqg== Received: by 10.43.126.1 with SMTP id gu1mr9623571icc.6.1343075609613; Mon, 23 Jul 2012 13:33:29 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.153.7 with SMTP id i7csp61709ibw; Mon, 23 Jul 2012 13:33:28 -0700 (PDT) Received: by 10.180.78.33 with SMTP id y1mr766562wiw.3.1343075608311; Mon, 23 Jul 2012 13:33:28 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.126.187]) by mx.google.com with ESMTP id u8si673769wia.35.2012.07.23.13.33.27; Mon, 23 Jul 2012 13:33:28 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.126.187 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.126.187; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.126.187 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from klappe2.lan (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mrbap4) with ESMTP (Nemesis) id 0MUEZG-1TKOL640Qs-00R5CY; Mon, 23 Jul 2012 22:32:47 +0200 From: Arnd Bergmann <arnd@arndb.de> To: Linus Torvalds <torvalds@linux-foundation.org> Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, arm@kernel.org Subject: [GIT PULL 09/15] arm-soc: new SoC support Date: Mon, 23 Jul 2012 22:32:35 +0200 Message-Id: <1343075561-17446-10-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1343075561-17446-1-git-send-email-arnd@arndb.de> References: <1343075561-17446-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:J2197GalMWEfaZnWW1xh0LXeqntrEkeOeAOh0Jr8ps1 RlebMvxGNvPPPQ9Avv3Osmrah1BVqb13G5aWrf9IyikOoeGsco 9O84F5Ez8dk0srmoZO22eGq6zwlVq2hFVEeZIcYbd/6UpG50ai Ogd4sWEGjPTKcluo0C2mkE6mrnTfb3O9Lnk+Nl76X+3YRJ0fvV Uw5eQpYVjOSdaLBHJd1rUbyVsxIpWaiBOkVuz45e3pD7/wNl4z lcy3cashRgiVONjABd53EF2JPy0Y7CPUhx9kJHhr3ZOugoxmMT nJKWqo1ver+v6FV3O6w0ZA2mqsvJ6u4pmFClYbM81pKlR836bP KStfKjuBCHdf3o+jE4Wb0hO5F1IGrk8ubj35bNszP X-Gm-Message-State: ALoCoQnV041DVfhExPI4FnrIdUR901aVMxiKdb1oE7GCNLN4va56WgQbMTQP6AL7YCMc6vSczMKv |
The following changes since commit fb584511c4664573097ece7df0de06ad00b713a2: ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds (2012-07-09 01:44:11 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/newsoc for you to fetch changes up to 66314223aa5e862c9d1d068cb7186b4fd58ebeaa: ARM: socfpga: initial support for Altera's SOCFPGA platform (2012-07-19 10:39:00 +0200) ---------------------------------------------------------------- arm-soc: new SoC support This adds support for three new SoC types: * The mvebu platform includes Marvell's Armada XP and Armada 370 chips, made by the mvebu business unit inside of Marvell. Since the same group also made the older but similar platforms we call "orion5x", "kirkwood", "mv78xx0" and "dove", we plan to move all of them into the mach-mvebu directory in the future. * socfpga is Altera's platform based on Cortex-A9 cores and a lot of FPGA space. This is similar to the Xilinx zynq platform we already support. The code is particularly clean, which is helped by the fact that the hardware doesn't do much besides the parts that are expected to get added in the FPGA. * The OMAP subarchitecture gains support for the latest generation, the OMAP5 based on the new Cortex-A15 core. Support is rather rudimentary for now, but will be extended in the future. ---------------------------------------------------------------- Arnd Bergmann (5): Merge branch 'mvebu/newsoc' into next/newsoc Merge branch 'omap/cleanup2' into next/newsoc Merge branch 'devel-omap5' of git://git.kernel.org/.../tmlind/linux-omap into next/newsoc Merge branch 'mvebu/newsoc' into next/newsoc Merge branch 'next/newsoc' into for-next Ben Dooks (1): ARM: mvebu: MPIC: read number of interrupts from control register Dinh Nguyen (1): ARM: socfpga: initial support for Altera's SOCFPGA platform Gregory CLEMENT (4): clocksource: time-armada-370-xp: Marvell Armada 370/XP SoC timer driver arm: mach-mvebu: add source files arm: mach-mvebu: add documentation for new device tree bindings arm: mach-mvebu: add compilation/configuration change R Sricharan (11): ARM: OMAP2+: Move stubbed secure_sram_reserve function to a common.c and call it __weak ARM: OMAP: counter-32k: Select the CR register offset using the IP scheme ARM: OMAP5: id: Add cpu id for ES versions ARM: OMAP5: Add minimal support for OMAP5430 SOC ARM: OMAP5: timer: Add clocksource, clockevent support ARM: OMAP5: gpmc: Update gpmc_init() ARM: OMAP5: l3: Add l3 error handler support for omap5 ARM: omap2+: board-generic: clean up the irq data from board file ARM: OMAP5: board-generic: Add device tree support arm/dts: OMAP5: Add omap5 dts files ARM: OMAP5: Add the build support Santosh Shilimkar (2): ARM: OMAP5: Add the WakeupGen IP updates ARM: OMAP5: Add SMP support Tarun Kanti DebBarma (1): ARM: Kconfig update to support additional GPIOs in OMAP5 Thomas Petazzoni (5): arm: mach-mvebu: add header arm: mach-mvebu: add support for Armada 370 and Armada XP with DT arm: mach-mvebu: add defconfig arm: mach-mvebu: add entry to MAINTAINERS arm: mvebu: generate DTBs for supported SoCs .../devicetree/bindings/arm/armada-370-xp-mpic.txt | 23 ++ .../bindings/arm/armada-370-xp-timer.txt | 11 + .../devicetree/bindings/arm/armada-370-xp.txt | 24 +++ .../bindings/arm/mvebu-system-controller.txt | 17 ++ .../devicetree/bindings/arm/omap/omap.txt | 3 + MAINTAINERS | 18 ++ arch/arm/Kconfig | 34 +++ arch/arm/Makefile | 2 + arch/arm/boot/dts/armada-370-db.dts | 42 ++++ arch/arm/boot/dts/armada-370-xp.dtsi | 68 ++++++ arch/arm/boot/dts/armada-370.dtsi | 35 +++ arch/arm/boot/dts/armada-xp-db.dts | 50 +++++ arch/arm/boot/dts/armada-xp.dtsi | 55 +++++ arch/arm/boot/dts/omap5-evm.dts | 20 ++ arch/arm/boot/dts/omap5.dtsi | 184 ++++++++++++++++ arch/arm/boot/dts/socfpga.dtsi | 147 +++++++++++++ arch/arm/boot/dts/socfpga_cyclone5.dts | 34 +++ arch/arm/configs/mvebu_defconfig | 46 ++++ arch/arm/configs/omap2plus_defconfig | 1 + arch/arm/configs/socfpga_defconfig | 83 +++++++ arch/arm/mach-mvebu/Kconfig | 16 ++ arch/arm/mach-mvebu/Makefile | 2 + arch/arm/mach-mvebu/Makefile.boot | 3 + arch/arm/mach-mvebu/armada-370-xp.c | 63 ++++++ arch/arm/mach-mvebu/common.h | 23 ++ arch/arm/mach-mvebu/include/mach/armada-370-xp.h | 22 ++ arch/arm/mach-mvebu/include/mach/debug-macro.S | 24 +++ arch/arm/mach-mvebu/include/mach/timex.h | 13 ++ arch/arm/mach-mvebu/include/mach/uncompress.h | 43 ++++ arch/arm/mach-mvebu/irq-armada-370-xp.c | 133 ++++++++++++ arch/arm/mach-mvebu/system-controller.c | 105 +++++++++ arch/arm/mach-omap2/Kconfig | 8 +- arch/arm/mach-omap2/Makefile | 24 ++- arch/arm/mach-omap2/board-generic.c | 42 ++-- arch/arm/mach-omap2/common.c | 24 +++ arch/arm/mach-omap2/common.h | 19 +- arch/arm/mach-omap2/control.h | 4 + arch/arm/mach-omap2/devices.c | 2 +- arch/arm/mach-omap2/gpmc.c | 3 +- arch/arm/mach-omap2/id.c | 42 +++- arch/arm/mach-omap2/include/mach/debug-macro.S | 8 +- arch/arm/mach-omap2/include/mach/omap-wakeupgen.h | 7 + arch/arm/mach-omap2/io.c | 44 ++++ arch/arm/mach-omap2/iomap.h | 27 +++ arch/arm/mach-omap2/irq.c | 13 +- arch/arm/mach-omap2/omap-headsmp.S | 21 ++ arch/arm/mach-omap2/omap-hotplug.c | 24 ++- arch/arm/mach-omap2/omap-smp.c | 52 +++-- arch/arm/mach-omap2/omap-wakeupgen.c | 114 +++++++--- arch/arm/mach-omap2/omap4-common.c | 14 ++ arch/arm/mach-omap2/omap4-sar-layout.h | 12 +- arch/arm/mach-omap2/omap_hwmod.c | 2 +- arch/arm/mach-omap2/omap_l3_noc.h | 22 +- arch/arm/mach-omap2/prcm-common.h | 2 +- arch/arm/mach-omap2/prcm.c | 2 +- arch/arm/mach-omap2/timer.c | 5 + arch/arm/mach-socfpga/Makefile | 5 + arch/arm/mach-socfpga/Makefile.boot | 1 + arch/arm/mach-socfpga/include/mach/debug-macro.S | 16 ++ arch/arm/mach-socfpga/include/mach/timex.h | 19 ++ arch/arm/mach-socfpga/include/mach/uncompress.h | 9 + arch/arm/mach-socfpga/socfpga.c | 62 ++++++ arch/arm/plat-omap/Kconfig | 4 +- arch/arm/plat-omap/common.c | 9 + arch/arm/plat-omap/counter_32k.c | 16 +- arch/arm/plat-omap/include/plat/cpu.h | 22 +- arch/arm/plat-omap/include/plat/hardware.h | 1 + arch/arm/plat-omap/include/plat/multi.h | 9 + arch/arm/plat-omap/include/plat/omap-secure.h | 5 - arch/arm/plat-omap/include/plat/omap54xx.h | 32 +++ arch/arm/plat-omap/include/plat/serial.h | 10 + arch/arm/plat-omap/include/plat/uncompress.h | 6 + arch/arm/plat-omap/sram.c | 11 +- drivers/clk/Makefile | 1 + drivers/clk/socfpga/Makefile | 1 + drivers/clk/socfpga/clk.c | 51 +++++ drivers/clocksource/Kconfig | 3 + drivers/clocksource/Makefile | 3 +- drivers/clocksource/time-armada-370-xp.c | 226 ++++++++++++++++++++ include/linux/dw_apb_timer.h | 1 + include/linux/time-armada-370-xp.h | 18 ++ 81 files changed, 2323 insertions(+), 99 deletions(-)