From patchwork Thu Oct 25 09:57: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: 12497 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 564D323F9B for ; Thu, 25 Oct 2012 09:57:28 +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 06802A187BA for ; Thu, 25 Oct 2012 09:57:27 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so1862475iej.11 for ; Thu, 25 Oct 2012 02:57:27 -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=D4bDlzXlgSgf9PfLd5Qp0gCTQLKNbAHte7IAbuUf+BI=; b=ZBEzKKRI/mhuMnBldOSR6EdIpKhSJf4UAmV8Gx9zrW68VED0m0IN9vo5ofTZv6KmtZ nNxRL/v4DoPQ8ay1x6sQl477IVCXLszB3PWJnCWF5xnNOxVNTeUlOkhCb7oKi/oNC+1e djPef0sxasjrsoO4gih1vwA2qdik78pUDSpRvLqx3niZ0hyGC3h6TUsQ/ZPnS/WbAC6O 2N8lpHu0/f4Xb+0vk6xmNWDVb9y4PQbupNuWh/lhtX1XLZbkw1F6fiPDcqVInxV8p5X4 upTiXfYpq/CH8pUn+ZdmL2CH33Eahq2hJ4rKWF5YLDFyH/oFOyIY/+pNpKVK1ZpNuOtw +x+w== Received: by 10.50.91.195 with SMTP id cg3mr3790493igb.57.1351159047782; Thu, 25 Oct 2012 02:57:27 -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.67.148 with SMTP id n20csp14751igt; Thu, 25 Oct 2012 02:57:27 -0700 (PDT) Received: by 10.180.82.34 with SMTP id f2mr9129986wiy.17.1351159046631; Thu, 25 Oct 2012 02:57:26 -0700 (PDT) Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by mx.google.com with ESMTPS id ct3si8793998wib.13.2012.10.25.02.57.26 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 25 Oct 2012 02:57:26 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.172; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.172 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-f172.google.com with SMTP id hq12so4809336wib.13 for ; Thu, 25 Oct 2012 02:57:26 -0700 (PDT) Received: by 10.216.195.229 with SMTP id p79mr10964212wen.163.1351159046124; Thu, 25 Oct 2012 02:57:26 -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 az2sm9125291wib.10.2012.10.25.02.57.24 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 25 Oct 2012 02:57:25 -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 3/8] ARM: ux500: Remove duplicate DT_MACHINE_START - make u8500 for generic Date: Thu, 25 Oct 2012 10:57:06 +0100 Message-Id: <1351159031-25391-4-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1351159031-25391-1-git-send-email-lee.jones@linaro.org> References: <1351159031-25391-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnGC5JdNCJ0DZ6T5KiL8GYmBK/biCMY8B5ZVkLuhSi7ksbEX9fi+qaWKPcMOPhUdd7MC+t1 The u8500 and u9540 DT_MACHINE_START calls are almost identical at the moment, referencing exactly the same function pointers. Until this changes we may as well convert the original one to be more generic and use that instead. Acked-by: Linus Walleij Signed-off-by: Lee Jones --- arch/arm/mach-ux500/cpu-db8500.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 6e9a06d..472b49f 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -338,7 +338,7 @@ static const char * u8500_dt_board_compat[] = { NULL, }; -DT_MACHINE_START(U8500_DT, "ST-Ericsson U8500 platform (Device Tree Support)") +DT_MACHINE_START(U8500_DT, "ST-Ericsson Ux5x0 platform (Device Tree Support)") .map_io = u8500_map_io, .init_irq = ux500_init_irq, /* we re-use nomadik timer here */ @@ -349,14 +349,4 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson U8500 platform (Device Tree Support)") .dt_compat = u8500_dt_board_compat, MACHINE_END -DT_MACHINE_START(U9540_DT, "ST-Ericsson 9540 platform (Device Tree Support)") - .map_io = u8500_map_io, - .init_irq = ux500_init_irq, - .timer = &ux500_timer, - .handle_irq = gic_handle_irq, - .init_machine = u8500_init_machine, - .init_late = NULL, - .dt_compat = u8500_dt_board_compat, -MACHINE_END - #endif