From patchwork Thu Sep 20 12:12:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11539 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 406691B4E37 for ; Thu, 20 Sep 2012 12:13:08 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 93FEE3D098F4 for ; Thu, 20 Sep 2012 12:13:07 +0000 (UTC) Received: by ieje10 with SMTP id e10so2722108iej.11 for ; Thu, 20 Sep 2012 05:13:07 -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=4E++8z5/zotsQjRjVRx8ayLn8iOvyPr+64kIqwZYyTk=; b=Ii5+ZnW4KjUjATJN9hlgw8zxxQNgP4oqJRyBN4KsDjMczhEonGSQu0iYVYZqCZC0nr x0cXtEMzAI6sYVtgLgrh6h9Uhojmbt++1dJK0YEPHMjJf7Sdi8uiORGWaQw6AtBKG2vR sizyzKcw6l9GoupLFy+glr8nDpK7NJLTxcvhN5Yba1aNXb9FI67MpjBxGCfaaSKjdtiA nx+J1Gqncz3XqcoXCWAjV1hz2xpAmNnw3605Q+kQlpzjBHaoLoPyDkFWlcch55104V9k tNuzy9qcgDnt3U5jmq+JYsMV1TIasfcuNdVozAKLGjgV+YvqUfWYM6icrbrZsr186t9h iCTQ== Received: by 10.50.154.227 with SMTP id vr3mr1830401igb.43.1348143187035; Thu, 20 Sep 2012 05:13:07 -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.50.184.232 with SMTP id ex8csp71573igc; Thu, 20 Sep 2012 05:13:06 -0700 (PDT) Received: by 10.180.93.68 with SMTP id cs4mr5611578wib.14.1348143185516; Thu, 20 Sep 2012 05:13:05 -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 h52si7314940wep.93.2012.09.20.05.13.05 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 05:13:05 -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 mail-wi0-f178.google.com with SMTP id hr14so429497wib.13 for ; Thu, 20 Sep 2012 05:13:05 -0700 (PDT) Received: by 10.180.84.169 with SMTP id a9mr4157000wiz.8.1348143185023; Thu, 20 Sep 2012 05:13:05 -0700 (PDT) Received: from localhost.localdomain (LPuteaux-156-14-44-212.w82-127.abo.wanadoo.fr. [82.127.83.212]) by mx.google.com with ESMTPS id w7sm32394460wiz.0.2012.09.20.05.13.03 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 05:13:04 -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, olof.johansson@gmail.com, Lee Jones Subject: [PATCH 02/32] ARM: ux500: Clean-up temporary Device Tree enablement helpers Date: Thu, 20 Sep 2012 14:12:20 +0200 Message-Id: <1348143170-2130-3-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348143170-2130-1-git-send-email-lee.jones@linaro.org> References: <1348143170-2130-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkhuq0bZKy3ScmZDKy56LSHbs+nf83nzBh4JVE7/NgkZbMwOj9Me05uAX4Tdk0dgl0+JDBl Here we remove some of the extra overhead we introduced to make DT:ing the Snowball platform easier. Acked-by: Linus Walleij 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 db3c52d..38b7f9c 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -138,10 +138,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, @@ -235,7 +231,6 @@ struct device * __init u8500_init_devices(struct ab8500_platform_data *ab8500) struct device * __init u8500_of_init_devices(void) { struct device *parent; - int i; parent = db8500_soc_device_init(); @@ -244,8 +239,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: @@ -253,7 +247,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; }