From patchwork Thu Jul 5 13:06:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 1160821 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id DEA1FDFB7C for ; Thu, 5 Jul 2012 13:47:08 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SmmGI-0007qr-J1; Thu, 05 Jul 2012 13:38:26 +0000 Received: from mail-wg0-f49.google.com ([74.125.82.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Smllh-0008FS-6u for linux-arm-kernel@lists.infradead.org; Thu, 05 Jul 2012 13:06:56 +0000 Received: by mail-wg0-f49.google.com with SMTP id ds1so5732325wgb.18 for ; Thu, 05 Jul 2012 06:06:47 -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=v8c9hI9SM/Z4fNtL0g3Oh9KDzt10hOFNRNmQsf+jnPs=; b=asaXtJblBZO0DPPaeo2IPjS8XkIk+leOOAekHpGE7/f48UZ5I+aMxI+SZbyAIz56Fs w/aD0wsZUh1zxZfJ1M1c4jgTXletQKXl+Ka9W+Zebv2WEnaNzPdPuKVzzU5F0/1DPT2Q Cqm7p/YWty66j/NLawuFdA/d+VAG0IhL/rNO/MyV2KqmNaBcVIb+Attmgvm9i163yBf8 J8tN10twRaftj97zN1BJs/QKAe2MgmD+QSgKoBesbBvNW3zj5QLEx0V/U6tIZekp6DcK NaNaUoc7m1JnioZbeJyRIMKJhQ+aFsh1gRTqtq1bnXtHprLuTZpNYipN/mZ/fQTiCELf 9Dzw== Received: by 10.180.100.2 with SMTP id eu2mr41926694wib.10.1341493607139; Thu, 05 Jul 2012 06:06:47 -0700 (PDT) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id k8sm76767305wia.6.2012.07.05.06.06.45 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Jul 2012 06:06:46 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 8/9] ARM: ux500: Clean-up temporary Device Tree enablement helpers Date: Thu, 5 Jul 2012 14:06:11 +0100 Message-Id: <1341493572-29735-9-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1341493572-29735-1-git-send-email-lee.jones@linaro.org> References: <1341493572-29735-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlJMx2R4TeXr7EPD9YnEEmoemE469hmfiTTMVk52zIIHBWkblsTO6d8g9jrugB2T8jQpPCW 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 [74.125.82.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: STEricsson_nomadik_linux@list.st.com, Lee Jones , linus.walleij@stericsson.com, arnd@arndb.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Here we remove some of the extra overhead we introduced to make DT:ing the Snowball platform easier. Unfortunately we can't remove everything. We are forced to leave cpufreq and DMA behind until they have been successfully Device Tree enabled. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/cpu-db8500.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index c8dd94f..d7a28c0 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -137,10 +137,6 @@ static struct platform_device *platform_devs[] __initdata = { &db8500_prcmu_device, }; -static struct platform_device *of_platform_devs[] __initdata = { - &u8500_dma40_device, -}; - static resource_size_t __initdata db8500_gpio_base[] = { U8500_GPIOBANK0_BASE, U8500_GPIOBANK1_BASE, @@ -232,7 +228,6 @@ struct device * __init u8500_init_devices(void) struct device * __init u8500_of_init_devices(void) { struct device *parent; - int i; parent = db8500_soc_device_init(); @@ -241,8 +236,7 @@ struct device * __init u8500_of_init_devices(void) platform_device_register_data(parent, "cpufreq-u8500", -1, NULL, 0); - for (i = 0; i < ARRAY_SIZE(of_platform_devs); i++) - of_platform_devs[i]->dev.parent = parent; + u8500_dma40_device.dev.parent = parent; /* * Devices to be DT:ed: @@ -250,7 +244,7 @@ struct device * __init u8500_of_init_devices(void) * db8500_pmu_device = done * db8500_prcmu_device = done */ - platform_add_devices(of_platform_devs, ARRAY_SIZE(of_platform_devs)); + platform_device_register(&u8500_dma40_device); return parent; }