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: 9850 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id D66AB23E16 for ; Thu, 5 Jul 2012 13:06:49 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id A6585A182E7 for ; Thu, 5 Jul 2012 13:06:49 +0000 (UTC) Received: by ggnf1 with SMTP id f1so7946238ggn.11 for ; Thu, 05 Jul 2012 06:06:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=v8c9hI9SM/Z4fNtL0g3Oh9KDzt10hOFNRNmQsf+jnPs=; b=p1plVvDtwit7DjtPA7uDccmTL5o32rgQLxfTCa06SIJQLoPrau3+umMpVsRczo0JkH oGr1h7ZpHk7lMfim1NN9o+k3/XZdluar/F/xAaZPs8t8YO3i6Ro7MGGDzSL9raiFtEfX RTxKqO7a4V5921R9qusqWbUGZGPgIfeZOm7F1imm2Ddd2STtmjzs/cx+l/+PN75v6sho W26VFKBY1nNmmGr8NzLNdr0iDvqLh3UqCQ7VEANv4dIS5POp9s8KXq+8HTdHLhJp23o8 mO8WLbR8E6EuNHTZyTGgti+nPli76fRi5nJACrqshjh8aXjEWrUKuvQxb8s48mWIzEMp TdWg== Received: by 10.50.46.232 with SMTP id y8mr15874054igm.57.1341493608900; Thu, 05 Jul 2012 06:06:48 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.24.148 with SMTP id v20csp65224ibb; Thu, 5 Jul 2012 06:06:48 -0700 (PDT) Received: by 10.216.61.210 with SMTP id w60mr8832431wec.59.1341493607657; Thu, 05 Jul 2012 06:06:47 -0700 (PDT) Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by mx.google.com with ESMTPS id w3si8340023wel.97.2012.07.05.06.06.47 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Jul 2012 06:06:47 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by wibhr14 with SMTP id hr14so5144173wib.13 for ; Thu, 05 Jul 2012 06:06:47 -0700 (PDT) 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 Cc: STEricsson_nomadik_linux@list.st.com, linus.walleij@stericsson.com, arnd@arndb.de, Lee Jones 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: ALoCoQlyBg+tc8SkR6U1hU1DrKojn3iXZBxPJjmNY3ZyKXB1/K0M9/srSSEXFIRNPqHCMniGbNy2 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; }