From patchwork Mon Oct 1 10:43:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 1530841 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 2681BDFFAD for ; Mon, 1 Oct 2012 10:47:34 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TIdV8-0006iU-9l; Mon, 01 Oct 2012 10:45:26 +0000 Received: from mail-wi0-f171.google.com ([209.85.212.171]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TIdTx-0006Bt-I6 for linux-arm-kernel@lists.infradead.org; Mon, 01 Oct 2012 10:44:15 +0000 Received: by mail-wi0-f171.google.com with SMTP id hj13so1742132wib.0 for ; Mon, 01 Oct 2012 03:44:13 -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=/r1bN66K3GL6mgGpHjJwWv13DzgD3LW9GLptsvxFm7g=; b=aDAkTu9Ysnsk/D2W0s9lLxlvYrdAo42oBhXTEi7mQy6IID/DoJMoMn+kkWyo6FLkRY vzv7EVchbDljw30hGhy59bUUJwllCkhMxFPwf7eAs8ZgKRuzrIKshBm8FmIfrXbp4Kfh lXBPHj8RjoAy1qnK9dSVN5zw0IoSKwaY1oPnQS8cbBtnF8/upNqm+KxdMeZNlVWyXd/6 QA3LHZ+FFA6OHGaXTmiBPu3eoUAMK/w5w6/pn0iiPJpNC9bgoJodiCX+Yh9veThQLYGz gK0cZ6Gal/NNNByv5ju3ubBYkP10KeG/kVdxvh/FKqDJD1sLH9+2Agb6wjAZdksY8+mj 3UDw== Received: by 10.180.99.99 with SMTP id ep3mr13708651wib.15.1349088253230; Mon, 01 Oct 2012 03:44:13 -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 v3sm15856944wiw.7.2012.10.01.03.44.11 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 01 Oct 2012 03:44:12 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 7/7] ARM: ux500: Remove platform specific device registration when DT is enabled Date: Mon, 1 Oct 2012 11:43:48 +0100 Message-Id: <1349088228-8582-8-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1349088228-8582-1-git-send-email-lee.jones@linaro.org> References: <1349088228-8582-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnAUu+uQOgTW4rAb74dXYE6xQ6YzkmCbZl6AyS8IGVX0VU0MLdlgDJR39w74sDZKxOo+CNE 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 [209.85.212.171 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: 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 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(); }