From patchwork Mon Oct 28 20:43:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Brown X-Patchwork-Id: 3104341 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D10599F431 for ; Mon, 28 Oct 2013 20:45:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B74DE201E9 for ; Mon, 28 Oct 2013 20:45:13 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 81676201CD for ; Mon, 28 Oct 2013 20:45:12 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vatfr-0008Kd-Co; Mon, 28 Oct 2013 20:44:31 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vatfh-0002UF-Ce; Mon, 28 Oct 2013 20:44:21 +0000 Received: from smtp.codeaurora.org ([198.145.11.231]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VatfH-0002Pt-6z for linux-arm-kernel@lists.infradead.org; Mon, 28 Oct 2013 20:43:58 +0000 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id F0F6613F286; Mon, 28 Oct 2013 20:43:32 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id E210C13F2A1; Mon, 28 Oct 2013 20:43:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from codeaurora.org (i-global252.qualcomm.com [199.106.103.252]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: davidb@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 30CEE13F286; Mon, 28 Oct 2013 20:43:32 +0000 (UTC) From: David Brown To: David Brown , Daniel Walker , Bryan Huntsman , Russell King , Olof Johansson , Arnd Bergmann , Kevin Hilman Subject: [PATCH 3/4] ARM: msm: Remove 7x30 support Date: Mon, 28 Oct 2013 13:43:25 -0700 Message-Id: <1382993006-27359-4-git-send-email-davidb@codeaurora.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1382993006-27359-1-git-send-email-davidb@codeaurora.org> References: <1382993006-27359-1-git-send-email-davidb@codeaurora.org> X-Virus-Scanned: ClamAV using ClamSMTP X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131028_164355_565602_2DDCF7AA X-CRM114-Status: GOOD ( 20.78 ) X-Spam-Score: -2.4 (--) Cc: linux-arm-msm@vger.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.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The MSM7x30 SoC support was added in 2009 based on code from Google's Android kernels. Platform support is fairly minimal, and the only changes that have been made have been trivial and cleanup changes. This code has not been converted to device tree, and is hindering supporting multiple-platform on ARM. If someone wishes to continue support for this target, patches that provide devicetree and multi-platform support can start by re-adding these files. Signed-off-by: David Brown --- Note that this patch was made with -D. I can send the full patch on request, and have also made the tree available at: git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git for-3.14/big-cleanup arch/arm/mach-msm/Kconfig | 19 +- arch/arm/mach-msm/Makefile | 2 - arch/arm/mach-msm/board-msm7x30.c | 157 --------------- arch/arm/mach-msm/devices-msm7x30.c | 246 ------------------------ arch/arm/mach-msm/include/mach/irqs-7x30.h | 153 --------------- arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 103 ---------- 6 files changed, 1 insertion(+), 679 deletions(-) delete mode 100644 arch/arm/mach-msm/board-msm7x30.c delete mode 100644 arch/arm/mach-msm/devices-msm7x30.c delete mode 100644 arch/arm/mach-msm/include/mach/irqs-7x30.h delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-7x30.h diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c deleted file mode 100644 index f9af5a4..0000000 diff --git a/arch/arm/mach-msm/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c deleted file mode 100644 index c15ea8a..0000000 diff --git a/arch/arm/mach-msm/include/mach/irqs-7x30.h b/arch/arm/mach-msm/include/mach/irqs-7x30.h deleted file mode 100644 index 1f15902..0000000 diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h b/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h deleted file mode 100644 index 198202c..0000000 diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index d43d20c..c9c113d 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -5,20 +5,9 @@ comment "Qualcomm MSM SoC Type" choice prompt "Qualcomm MSM SoC Type" - default ARCH_MSM7X30 + default ARCH_QSD8X50 depends on !ARCH_MSM_DT -config ARCH_MSM7X30 - bool "MSM7x30" - select ARCH_MSM_SCORPION - select CPU_V7 - select GPIO_MSM_V1 - select MACH_MSM7X30_SURF # if ! - select MSM_GPIOMUX - select MSM_PROC_COMM - select MSM_SMD - select MSM_VIC - config ARCH_QSD8X50 bool "QSD8X50" select ARCH_MSM_SCORPION @@ -69,12 +58,6 @@ config MSM_VIC menu "Qualcomm MSM Board Type" depends on !ARCH_MSM_DT -config MACH_MSM7X30_SURF - depends on ARCH_MSM7X30 - bool "MSM7x30 SURF" - help - Support for the Qualcomm MSM7x30 SURF eval board. - config MACH_QSD8X50_SURF depends on ARCH_QSD8X50 bool "QSD8x50 SURF" diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile index c7a5b53..4bc7ee4 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile @@ -8,7 +8,6 @@ obj-$(CONFIG_ARCH_QSD8X50) += sirc.o obj-$(CONFIG_MSM_PROC_COMM) += proc_comm.o clock-pcom.o vreg.o obj-$(CONFIG_ARCH_MSM7X00A) += dma.o io.o -obj-$(CONFIG_ARCH_MSM7X30) += dma.o io.o obj-$(CONFIG_ARCH_QSD8X50) += dma.o io.o obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o @@ -20,7 +19,6 @@ CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o obj-$(CONFIG_SMP) += headsmp.o platsmp.o -obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o obj-$(CONFIG_ARCH_MSM_DT) += board-dt.o obj-$(CONFIG_MSM_GPIOMUX) += gpiomux.o