From patchwork Thu Sep 27 15:12:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11770 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 1974723E54 for ; Thu, 27 Sep 2012 15:12:32 +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 D4EF4A18857 for ; Thu, 27 Sep 2012 15:12:31 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so4450868iej.11 for ; Thu, 27 Sep 2012 08:12:31 -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=/r1bN66K3GL6mgGpHjJwWv13DzgD3LW9GLptsvxFm7g=; b=nbYOzSMowAZcZHoI2YDGiPPq5AHJH/WWyaRbpf3k/YwTigFRspubDko39kqvBOqqBe ikRlMIPXwpnXW9c+WEnQ7/hkDIElnbD/LasFEGH7Y665vTkO/lzL3BlqpqdaKSUpnL+Y WfI8mB6LN5WsQPK8Wtc+MSMS4lJeJ3PZ8+T4dH0aygtvoV0aYsOEZi6UeGsYoiUgGD2a ngAgry9nu98xgwINJSoOiKQFq2Qdu67Qm5/vpyNlq1BkXXEd0frqFPMi6hcJUyJK0JnP M7ya1/+gf0PFwr65Xs8e+zaQzTXP8aJ/NGM9i6A+s7hu/t8U9jd+qv/gfRGDtsBhye3r X52g== Received: by 10.42.84.69 with SMTP id k5mr3304389icl.5.1348758751520; Thu, 27 Sep 2012 08:12:31 -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 ex8csp420844igc; Thu, 27 Sep 2012 08:12:29 -0700 (PDT) Received: by 10.216.241.198 with SMTP id g48mr1353570wer.192.1348758749130; Thu, 27 Sep 2012 08:12:29 -0700 (PDT) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id q23si7107098wei.27.2012.09.27.08.12.28 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 08:12:29 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.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-we0-f178.google.com with SMTP id r6so811594wey.37 for ; Thu, 27 Sep 2012 08:12:28 -0700 (PDT) Received: by 10.217.6.12 with SMTP id x12mr1497371wes.176.1348758748625; Thu, 27 Sep 2012 08:12:28 -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 t7sm13643780wix.6.2012.09.27.08.12.27 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 08:12:28 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, Lee Jones Subject: [PATCH 7/7] ARM: ux500: Remove platform specific device registration when DT is enabled Date: Thu, 27 Sep 2012 16:12:06 +0100 Message-Id: <1348758726-25336-8-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348758726-25336-1-git-send-email-lee.jones@linaro.org> References: <1348758726-25336-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQm9792b27dqArDRxGlZbLs9anYp7bwjv0Xm/Rba0gYTTjUOkN3ZLzSdDlejYY39eHpQyYMf Most devices have now been successfully DT:ed and each supported platform has its own Device Tree source file. Hence the majority of the platform specific device registration calls can now be successfully removed. Acked-by: Linus Walleij Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500.c | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 38e53b2..5dd4a59 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -793,8 +793,6 @@ static const struct of_device_id u8500_local_bus_nodes[] = { static void __init u8500_init_machine(void) { struct device *parent = NULL; - int i2c0_devs; - int i; /* Pinmaps must be in place before devices register */ if (of_machine_is_compatible("st-ericsson,mop500")) @@ -804,37 +802,12 @@ static void __init u8500_init_machine(void) else if (of_machine_is_compatible("st-ericsson,hrefv60+")) hrefv60_pinmaps_init(); + /* TODO: Export SoC, USB, cpu-freq and DMA40 */ parent = u8500_of_init_devices(); - for (i = 0; i < ARRAY_SIZE(mop500_platform_devs); i++) - mop500_platform_devs[i]->dev.parent = parent; - /* automatically probe child nodes of db8500 device */ of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent); - if (of_machine_is_compatible("st-ericsson,mop500")) { - mop500_gpio_keys[0].gpio = GPIO_PROX_SENSOR; - - platform_add_devices(mop500_platform_devs, - ARRAY_SIZE(mop500_platform_devs)); - - mop500_audio_init(parent); - i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices); - i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs); - i2c_register_board_info(2, mop500_i2c2_devices, - ARRAY_SIZE(mop500_i2c2_devices)); - - } else if (of_machine_is_compatible("st-ericsson,hrefv60+")) { - /* - * The HREFv60 board removed a GPIO expander and routed - * all these GPIO pins to the internal GPIO controller - * instead. - */ - mop500_gpio_keys[0].gpio = HREFV60_PROX_SENSE_GPIO; - platform_add_devices(mop500_platform_devs, - ARRAY_SIZE(mop500_platform_devs)); - } - /* This board has full regulator constraints */ regulator_has_full_constraints(); }