| Submitter | Olof Johansson |
|---|---|
| Date | Oct. 1, 2012, 11:57 p.m. |
| Message ID | <1349135827-24790-7-git-send-email-olof@lixom.net> |
| Download | mbox |
| Permalink | /patch/188443/ |
| State | New |
| Headers | show
Return-Path: <linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5E2B62C00A8 for <incoming-imx@patchwork.ozlabs.org>; Tue, 2 Oct 2012 20:50:41 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TJ01M-0003gz-LB; Tue, 02 Oct 2012 10:48:12 +0000 Received: from mail-pb0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TIprp-0002OC-7z for linux-arm-kernel@lists.infradead.org; Mon, 01 Oct 2012 23:57:44 +0000 Received: by mail-pb0-f49.google.com with SMTP id xa7so7546439pbc.36 for <linux-arm-kernel@lists.infradead.org>; Mon, 01 Oct 2012 16:57:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=XJ3ZN69MQHnoP+cK1+j6AOrsdYHvLs5bZKeZlH5KupM=; b=A2kdJxpaip1W5/LrY3PyXmpos8BjsL4jk3mz/Nbdx0dKskz3q8hS7ETDB+ew99qOnm ByaPR1Hr2FKBQ1IdLUrAeA6jwTItwZFOaSuP3SuuwnfrNx3tcO+RYIxfx3+X4p0TAVuW neKEObM12BEFN9yng0cTZb6/8rGTYUxZagejivd1O9x+nIaSlS1ygS8Ta5rFFv2PHBzm oEpsfyrNqSl7FkOpr+ZYkH0P6cNQvh4KaPHNR8HLKhjbMlGAafR4DbqM8iX2Lw14y8A1 zru/tSMV+5LlXbru24kM1jG1F9AZsj9wNFsATqzAK1CaS8FrRGc8BNmtPov8+jFWoZym Ym/Q== Received: by 10.66.87.132 with SMTP id ay4mr39780926pab.82.1349135860952; Mon, 01 Oct 2012 16:57:40 -0700 (PDT) Received: from quad.lixom.net (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPS id pj8sm10991584pbb.60.2012.10.01.16.57.38 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 01 Oct 2012 16:57:40 -0700 (PDT) From: Olof Johansson <olof@lixom.net> To: Linus Torvalds <torvalds@linux-foundation.org> Subject: [GIT PULL 6/12] ARM: soc: cleanups, part 2 Date: Mon, 1 Oct 2012 16:57:01 -0700 Message-Id: <1349135827-24790-7-git-send-email-olof@lixom.net> X-Mailer: git-send-email 1.7.10.1.488.g05fbf7a In-Reply-To: <1349135827-24790-1-git-send-email-olof@lixom.net> References: <1349135827-24790-1-git-send-email-olof@lixom.net> X-Gm-Message-State: ALoCoQk9CLoKVbRnXt1Sr7gL5A0KTy/OWkk2sPCGk8UpLBtq9dVtsmhKTPG3ECjQUg6MJdxFUxZw X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject. X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Mailman-Approved-At: Tue, 02 Oct 2012 06:47:33 -0400 Cc: Olof Johansson <olof@lixom.net>, arm@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org |
A shorter cleanup branch submitted separately due to dependencies with some of the previous topics. Major thing here is that the Broadcom bcmring platform is removed. It's an SoC that's used on some stationary VoIP platforms, and is in desperate need of some cleanup. Broadcom came back and suggested that we just deprecate the platform for now, since they aren't going to spend the resources needed on cleaning it up, and there are no users of the platform directly from mainline. Conflicts: * A few removed files in tegra, safe to remove here. * bcmring/bcm2835 conflicts in Kconfig and Makefile, remove bcmring. ---------------------------------------------------------------- The following changes since commit 7e95c548818d2b311090848083277fb907cfb56d: Merge branch 'next/dt' into HEAD are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/cleanup2 for you to fetch changes up to b98138e00d96abc85b100c9b6886f105d9868ab5: Merge branch 'cleanup/__iomem' into next/cleanup2 ---------------------------------------------------------------- Alexander Shiyan (4): ARM: clps711x: Added simple clock framework ARM: clps711x: Fix lowlevel debug-macro ARM: clps711x: Fix register definitions ARM: clps711x: Remove board support for CEIVA Andrew Lunn (1): ARM: Orion5x: ts78xx: Add IOMEM for virtual addresses. Arnd Bergmann (6): Merge branch 'clps711x/cleanup' into next/cleanup2 ARM: Remove mach-bcmring Merge branch 'bcmring/cleanup' into bcmring/removal Merge branch 'bcmring/removal' into next/cleanup2 ARM: ux500: use __iomem pointers for MMIO Merge branch 'cleanup/__iomem' into next/cleanup2 Olof Johansson (2): Merge tag 'xceiv-for-v3.7' of git://git.kernel.org/.../balbi/usb into next/cleanup2 Merge tag 'tegra-for-3.7-cleanup2' of git://git.kernel.org/.../swarren/linux-tegra into next/cleanup2 Stephen Warren (7): Merge branch 'for-3.7/board-removal' into for-3.7/cleanup2 Merge branch 'for-3.7/common-clk' into for-3.7/cleanup2 Merge commit 'xceiv-for-v3.7' into for-3.7/cleanup2 ARM: tegra: remove dead code ARM: tegra: remove useless includes of <mach/*.h> ARM: tegra: delete unused headers pinctrl: tegra: move pinconf-tegra.h content into drivers/pinctrl MAINTAINERS | 16 - arch/arm/Kconfig | 16 +- arch/arm/Makefile | 1 - arch/arm/configs/bcmring_defconfig | 79 - arch/arm/mach-bcmring/Kconfig | 19 - arch/arm/mach-bcmring/Makefile | 8 - arch/arm/mach-bcmring/Makefile.boot | 6 - arch/arm/mach-bcmring/arch.c | 198 --- arch/arm/mach-bcmring/clock.c | 223 --- arch/arm/mach-bcmring/clock.h | 33 - arch/arm/mach-bcmring/core.c | 227 --- arch/arm/mach-bcmring/core.h | 31 - arch/arm/mach-bcmring/csp/Makefile | 3 - arch/arm/mach-bcmring/csp/chipc/Makefile | 1 - arch/arm/mach-bcmring/csp/chipc/chipcHw.c | 779 -------- arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c | 283 --- arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c | 125 -- arch/arm/mach-bcmring/csp/chipc/chipcHw_str.c | 64 - arch/arm/mach-bcmring/csp/dmac/Makefile | 1 - arch/arm/mach-bcmring/csp/dmac/dmacHw.c | 916 ---------- arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c | 1017 ----------- arch/arm/mach-bcmring/csp/tmr/Makefile | 1 - arch/arm/mach-bcmring/csp/tmr/tmrHw.c | 576 ------ arch/arm/mach-bcmring/dma.c | 1518 ---------------- arch/arm/mach-bcmring/dma_device.c | 593 ------ arch/arm/mach-bcmring/include/mach/cfg_global.h | 51 - arch/arm/mach-bcmring/include/mach/csp/cap.h | 63 - .../mach-bcmring/include/mach/csp/cap_inline.h | 409 ----- .../mach-bcmring/include/mach/csp/chipcHw_def.h | 1123 ------------ .../include/mach/csp/chipcHw_inline.h | 1682 ------------------ .../mach-bcmring/include/mach/csp/chipcHw_reg.h | 530 ------ .../arm/mach-bcmring/include/mach/csp/ddrcReg.h | 872 --------- arch/arm/mach-bcmring/include/mach/csp/dmacHw.h | 596 ------- .../mach-bcmring/include/mach/csp/dmacHw_priv.h | 145 -- .../mach-bcmring/include/mach/csp/dmacHw_reg.h | 406 ----- arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h | 73 - .../mach-bcmring/include/mach/csp/intcHw_reg.h | 246 --- .../arm/mach-bcmring/include/mach/csp/mm_addr.h | 101 -- arch/arm/mach-bcmring/include/mach/csp/mm_io.h | 147 -- arch/arm/mach-bcmring/include/mach/csp/reg.h | 115 -- .../mach-bcmring/include/mach/csp/secHw_def.h | 100 -- .../include/mach/csp/secHw_inline.h | 79 - arch/arm/mach-bcmring/include/mach/csp/tmrHw.h | 263 --- .../mach-bcmring/include/mach/csp/tmrHw_reg.h | 82 - arch/arm/mach-bcmring/include/mach/dma.h | 630 ------- .../arm/mach-bcmring/include/mach/entry-macro.S | 76 - arch/arm/mach-bcmring/include/mach/hardware.h | 57 - arch/arm/mach-bcmring/include/mach/irqs.h | 132 -- .../mach-bcmring/include/mach/memory_settings.h | 67 - arch/arm/mach-bcmring/include/mach/reg_nand.h | 66 - arch/arm/mach-bcmring/include/mach/reg_umi.h | 237 --- arch/arm/mach-bcmring/include/mach/timer.h | 77 - arch/arm/mach-bcmring/include/mach/timex.h | 25 - arch/arm/mach-bcmring/include/mach/uncompress.h | 43 - arch/arm/mach-bcmring/irq.c | 126 -- arch/arm/mach-bcmring/mm.c | 60 - arch/arm/mach-bcmring/timer.c | 61 - arch/arm/mach-clps711x/Kconfig | 6 - arch/arm/mach-clps711x/Makefile | 1 - arch/arm/mach-clps711x/ceiva.c | 64 - arch/arm/mach-clps711x/common.c | 89 +- arch/arm/mach-clps711x/include/mach/clps711x.h | 9 +- .../mach-clps711x/include/mach/debug-macro.S | 8 +- arch/arm/mach-clps711x/include/mach/hardware.h | 48 - arch/arm/mach-clps711x/include/mach/timex.h | 23 +- arch/arm/mach-orion5x/ts78xx-setup.c | 12 +- arch/arm/mach-tegra/Makefile | 2 - arch/arm/mach-tegra/board-dt-tegra20.c | 27 +- arch/arm/mach-tegra/board-pinmux.c | 87 - arch/arm/mach-tegra/board-pinmux.h | 54 - arch/arm/mach-tegra/devices.c | 701 -------- arch/arm/mach-tegra/devices.h | 60 - arch/arm/mach-tegra/include/mach/gpio-tegra.h | 28 - .../arm/mach-tegra/include/mach/pinconf-tegra.h | 63 - arch/arm/mach-tegra/include/mach/suspend.h | 38 - arch/arm/mach-tegra/tegra20_clocks.c | 1 - arch/arm/mach-tegra/tegra20_clocks_data.c | 1 - arch/arm/mach-tegra/timer.c | 1 - arch/arm/mach-ux500/include/mach/uncompress.h | 4 +- arch/arm/tools/mach-types | 1 - drivers/pinctrl/pinctrl-tegra.c | 2 - drivers/pinctrl/pinctrl-tegra.h | 44 + drivers/usb/phy/tegra_usb_phy.c | 1 - drivers/video/Kconfig | 12 - drivers/video/Makefile | 1 - drivers/video/epson1355fb.c | 749 -------- include/video/epson1355.h | 64 - 87 files changed, 159 insertions(+), 17516 deletions(-) delete mode 100644 arch/arm/configs/bcmring_defconfig delete mode 100644 arch/arm/mach-bcmring/Kconfig delete mode 100644 arch/arm/mach-bcmring/Makefile delete mode 100644 arch/arm/mach-bcmring/Makefile.boot delete mode 100644 arch/arm/mach-bcmring/arch.c delete mode 100644 arch/arm/mach-bcmring/clock.c delete mode 100644 arch/arm/mach-bcmring/clock.h delete mode 100644 arch/arm/mach-bcmring/core.c delete mode 100644 arch/arm/mach-bcmring/core.h delete mode 100644 arch/arm/mach-bcmring/csp/Makefile delete mode 100644 arch/arm/mach-bcmring/csp/chipc/Makefile delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw.c delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_str.c delete mode 100644 arch/arm/mach-bcmring/csp/dmac/Makefile delete mode 100644 arch/arm/mach-bcmring/csp/dmac/dmacHw.c delete mode 100644 arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c delete mode 100644 arch/arm/mach-bcmring/csp/tmr/Makefile delete mode 100644 arch/arm/mach-bcmring/csp/tmr/tmrHw.c delete mode 100644 arch/arm/mach-bcmring/dma.c delete mode 100644 arch/arm/mach-bcmring/dma_device.c delete mode 100644 arch/arm/mach-bcmring/include/mach/cfg_global.h delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/cap.h delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/cap_inline.h delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_def.h delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_inline.h delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_reg.h delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/ddrcReg.h delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/dmacHw.h delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/dmacHw_priv.h delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/dmacHw_reg.h delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/intcHw_reg.h delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/mm_addr.h delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/mm_io.h delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/reg.h delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/secHw_def.h delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/secHw_inline.h delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/tmrHw.h delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/tmrHw_reg.h delete mode 100644 arch/arm/mach-bcmring/include/mach/dma.h delete mode 100644 arch/arm/mach-bcmring/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-bcmring/include/mach/hardware.h delete mode 100644 arch/arm/mach-bcmring/include/mach/irqs.h delete mode 100644 arch/arm/mach-bcmring/include/mach/memory_settings.h delete mode 100644 arch/arm/mach-bcmring/include/mach/reg_nand.h delete mode 100644 arch/arm/mach-bcmring/include/mach/reg_umi.h delete mode 100644 arch/arm/mach-bcmring/include/mach/timer.h delete mode 100644 arch/arm/mach-bcmring/include/mach/timex.h delete mode 100644 arch/arm/mach-bcmring/include/mach/uncompress.h delete mode 100644 arch/arm/mach-bcmring/irq.c delete mode 100644 arch/arm/mach-bcmring/mm.c delete mode 100644 arch/arm/mach-bcmring/timer.c delete mode 100644 arch/arm/mach-clps711x/ceiva.c delete mode 100644 arch/arm/mach-tegra/board-pinmux.c delete mode 100644 arch/arm/mach-tegra/board-pinmux.h delete mode 100644 arch/arm/mach-tegra/devices.c delete mode 100644 arch/arm/mach-tegra/devices.h delete mode 100644 arch/arm/mach-tegra/include/mach/gpio-tegra.h delete mode 100644 arch/arm/mach-tegra/include/mach/pinconf-tegra.h delete mode 100644 arch/arm/mach-tegra/include/mach/suspend.h delete mode 100644 drivers/video/epson1355fb.c delete mode 100644 include/video/epson1355.h