From patchwork Fri Feb 28 10:10:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 25526 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f198.google.com (mail-ob0-f198.google.com [209.85.214.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6346220543 for ; Fri, 28 Feb 2014 10:10:56 +0000 (UTC) Received: by mail-ob0-f198.google.com with SMTP id vb8sf13372079obc.9 for ; Fri, 28 Feb 2014 02:10:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id:cc :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=5wUSXsguw2NfKMfaXeLRN9WOzLPE/aF0S9hmJ9iq2t4=; b=WO0Av5KZ60h1F9Qlv+yWKenqoDOlj+9kkjfXghR65zzi+W+Vz1VmzpslRmYOMqpmAh /9P5SIwciMGBKevgmuO55B0ZH5rkAY7sr5+mpHnTlRS/gP6uypw+2+pTgnFoOr+Eju66 d9GbH/pTqbgE33AzMov6Hontv4k3CerEAW3cPpdYZwcgqMMySVOX2SAZdAF9FU9X24KA qRArMD1oXmKwIFizRblkAQel0IUpRRZhw59bHfdTJQsfMCcO4CIjBYxV/FcpN+jEbQs+ 7iDtJ2SKq6YXL3+y+BfWEkJCFc7GlsSLTFksitfzXFbTFbI9YxK700x3LB68EFgnB+/r KZPw== X-Gm-Message-State: ALoCoQkmBQJp16wcc9keSCj7lQ27jGzNhE+8bH16Jx4Mheu9Rj1MgBnHNCoCYcnATtub1ZSHcvCD X-Received: by 10.42.13.198 with SMTP id e6mr4018924ica.21.1393582255907; Fri, 28 Feb 2014 02:10:55 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.49.113 with SMTP id p104ls991631qga.41.gmail; Fri, 28 Feb 2014 02:10:55 -0800 (PST) X-Received: by 10.220.88.204 with SMTP id b12mr1697576vcm.3.1393582255798; Fri, 28 Feb 2014 02:10:55 -0800 (PST) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id e10si1712792vcq.2.2014.02.28.02.10.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 28 Feb 2014 02:10:55 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id lf12so496730vcb.31 for ; Fri, 28 Feb 2014 02:10:55 -0800 (PST) X-Received: by 10.220.200.6 with SMTP id eu6mr472522vcb.35.1393582255683; Fri, 28 Feb 2014 02:10:55 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.130.193 with SMTP id u1csp43144vcs; Fri, 28 Feb 2014 02:10:55 -0800 (PST) X-Received: by 10.180.37.162 with SMTP id z2mr1647863wij.51.1393582254693; Fri, 28 Feb 2014 02:10:54 -0800 (PST) Received: from casper.infradead.org (casper.infradead.org. [85.118.1.10]) by mx.google.com with ESMTPS id nd19si1069919wic.31.2014.02.28.02.10.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Feb 2014 02:10:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 85.118.1.10 as permitted sender) client-ip=85.118.1.10; Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJKOu-0006t3-1x; Fri, 28 Feb 2014 10:10:40 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJKOr-0005Ut-Jc; Fri, 28 Feb 2014 10:10:37 +0000 Received: from mail-wg0-f42.google.com ([74.125.82.42]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJKOo-0005Tm-H3 for linux-arm-kernel@lists.infradead.org; Fri, 28 Feb 2014 10:10:35 +0000 Received: by mail-wg0-f42.google.com with SMTP id y10so359254wgg.25 for ; Fri, 28 Feb 2014 02:10:10 -0800 (PST) X-Received: by 10.180.95.100 with SMTP id dj4mr1634199wib.35.1393582209963; Fri, 28 Feb 2014 02:10:09 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id jd2sm3579339wic.9.2014.02.28.02.10.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Feb 2014 02:10:09 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: ux500: delete pointless DT config option Date: Fri, 28 Feb 2014 11:10:04 +0100 Message-Id: <1393582204-9156-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.5.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140228_051034_764508_499AD343 X-CRM114-Status: UNSURE ( 9.83 ) X-CRM114-Notice: Please train this message. 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 [74.125.82.42 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Linus Walleij , Lee Jones 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+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.172 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 Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Supporting device tree on the Ux500 is not optional anymore, so delete the config option and compile this in at all times. Cc: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/mach-ux500/Kconfig | 5 ----- arch/arm/mach-ux500/cpu-db8500.c | 3 --- 2 files changed, 8 deletions(-) diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index 0034d2cd6973..b2019dc50e40 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig @@ -73,11 +73,6 @@ config UX500_AUTO_PLATFORM a working kernel. If everything else is disabled, this automatically enables MACH_MOP500. -config MACH_UX500_DT - bool "Generic U8500 support using device tree" - depends on MACH_MOP500 - select USE_OF - endmenu config UX500_DEBUG_UART diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 180b3c59be36..5e8a4021e4e0 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -146,7 +146,6 @@ static struct device * __init db8500_soc_device_init(void) return ux500_soc_device_init(soc_id); } -#ifdef CONFIG_MACH_UX500_DT static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { /* Requires call-back bindings. */ OF_DEV_AUXDATA("arm,cortex-a9-pmu", 0, "arm-pmu", &db8500_pmu_platdata), @@ -219,5 +218,3 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson Ux5x0 platform (Device Tree Support)") .dt_compat = stericsson_dt_platform_compat, .restart = ux500_restart, MACHINE_END - -#endif