From patchwork Fri Aug 23 12:23:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 19469 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 07EAB248E6 for ; Fri, 23 Aug 2013 12:25:00 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id ht10sf431217vcb.5 for ; Fri, 23 Aug 2013 05:24:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=+QU4VukDfLp6mXwPLQ9s5br5a/oA9EeFgGzWp5vzXMM=; b=l8cWZptG1dGC7ydDDSttaSrtcDTN9bsCxfsT+iu+M43EhR9uIFdoCxmAhZid8dCYKz x5mDNFHvGHv/6IldoeOf+y3y0KKy9dvgT0T88I63gm0zT642DqvJW9Bi7rkQzNbyRspO 5QQlSWCEMuh0IF4W/ubhQpsB1rpmwb/ngXGixWAHUcWsiFYmLATDIPAaf6jIPTE6G2b/ OUZV2NTS6199WekCXZc3YErIxhnueVsAtafJKLM5n1KamGLJvWNGty8HtXoSqSOAJZ98 J042Usn/7imCBV1aVgiYLCDpJr5ZGdRZXNaRYtskeLxFRJkGl2MXeVFi28jTPmvwGb9E kvaw== X-Received: by 10.236.145.196 with SMTP id p44mr1278270yhj.24.1377260699862; Fri, 23 Aug 2013 05:24:59 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.26.6 with SMTP id h6ls1485896qeg.99.gmail; Fri, 23 Aug 2013 05:24:59 -0700 (PDT) X-Received: by 10.58.75.41 with SMTP id z9mr16505653vev.4.1377260699715; Fri, 23 Aug 2013 05:24:59 -0700 (PDT) Received: from mail-vb0-f42.google.com (mail-vb0-f42.google.com [209.85.212.42]) by mx.google.com with ESMTPS id fb4si5468715veb.88.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:59 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.42 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.42; Received: by mail-vb0-f42.google.com with SMTP id e12so382043vbg.29 for ; Fri, 23 Aug 2013 05:24:59 -0700 (PDT) X-Gm-Message-State: ALoCoQltxIo12CQxBpuUxd4lzULEfPIUdFaDjVZhJCnCW2Tg0FOhREDAGylNF7lGs4JBDCfou31F X-Received: by 10.220.91.16 with SMTP id k16mr16599018vcm.21.1377260699644; Fri, 23 Aug 2013 05:24:59 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp90159vcz; Fri, 23 Aug 2013 05:24:59 -0700 (PDT) X-Received: by 10.14.8.72 with SMTP id 48mr26245873eeq.25.1377260697868; Fri, 23 Aug 2013 05:24:57 -0700 (PDT) Received: from mail-ee0-f44.google.com (mail-ee0-f44.google.com [74.125.83.44]) by mx.google.com with ESMTPS id f3si16786981eet.89.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:57 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.44 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.83.44; Received: by mail-ee0-f44.google.com with SMTP id b47so263341eek.3 for ; Fri, 23 Aug 2013 05:24:57 -0700 (PDT) X-Received: by 10.15.76.198 with SMTP id n46mr3241610eey.60.1377260697264; Fri, 23 Aug 2013 05:24:57 -0700 (PDT) Received: from localhost.localdomain (cpc15-aztw25-2-0-cust493.aztw.cable.virginmedia.com. [92.233.57.238]) by mx.google.com with ESMTPSA id f49sm24417729eec.7.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:56 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@linaro.org, Lee Jones Subject: [PATCH 35/40] ARM: ux500: Take out STUIB support when not booting with Device Tree Date: Fri, 23 Aug 2013 13:23:35 +0100 Message-Id: <1377260620-18829-36-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1377260620-18829-1-git-send-email-lee.jones@linaro.org> References: <1377260620-18829-1-git-send-email-lee.jones@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.42 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , It's time to remove all ATAG support from ux500 and rely solely on Device Tree booting. This patch is part of that endeavour. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/Makefile | 2 +- arch/arm/mach-ux500/board-mop500-stuib.c | 14 -------------- arch/arm/mach-ux500/board-mop500-uib.c | 8 -------- arch/arm/mach-ux500/board-mop500.h | 1 - 4 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 arch/arm/mach-ux500/board-mop500-stuib.c diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile index 8634a3fa..b34b74b 100644 --- a/arch/arm/mach-ux500/Makefile +++ b/arch/arm/mach-ux500/Makefile @@ -9,7 +9,7 @@ obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o devices-db8500.o obj-$(CONFIG_MACH_MOP500) += board-mop500.o board-mop500-sdi.o \ board-mop500-regulators.o \ - board-mop500-uib.o board-mop500-stuib.o \ + board-mop500-uib.o \ board-mop500-pins.o \ board-mop500-audio.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o diff --git a/arch/arm/mach-ux500/board-mop500-stuib.c b/arch/arm/mach-ux500/board-mop500-stuib.c deleted file mode 100644 index 7fa3021..0000000 --- a/arch/arm/mach-ux500/board-mop500-stuib.c +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (C) ST-Ericsson SA 2010 - * - * License terms: GNU General Public License (GPL), version 2 - */ - -#include -#include - -#include "board-mop500.h" - -void __init mop500_stuib_init(void) -{ -} diff --git a/arch/arm/mach-ux500/board-mop500-uib.c b/arch/arm/mach-ux500/board-mop500-uib.c index 0e94f1d..2742eec 100644 --- a/arch/arm/mach-ux500/board-mop500-uib.c +++ b/arch/arm/mach-ux500/board-mop500-uib.c @@ -15,7 +15,6 @@ #include "id.h" enum mop500_uib { - STUIB, }; struct uib { @@ -25,11 +24,6 @@ struct uib { }; static struct uib __initdata mop500_uibs[] = { - [STUIB] = { - .name = "ST-UIB", - .option = "stuib", - .init = mop500_stuib_init, - }, }; static struct uib *mop500_uib; @@ -99,7 +93,5 @@ int __init mop500_uib_init(void) return 0; } - __mop500_uib_init(&mop500_uibs[STUIB], "detected"); - return 0; } diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h index 223639b..2fb89e2 100644 --- a/arch/arm/mach-ux500/board-mop500.h +++ b/arch/arm/mach-ux500/board-mop500.h @@ -89,7 +89,6 @@ extern struct msp_i2s_platform_data msp2_platform_data; extern struct msp_i2s_platform_data msp3_platform_data; extern struct pl022_ssp_controller ssp0_plat; -void __init mop500_stuib_init(void); void __init mop500_pinmaps_init(void); void __init snowball_pinmaps_init(void); void __init hrefv60_pinmaps_init(void);