From patchwork Mon May 11 22:41:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 6384601 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7DA209F32B for ; Mon, 11 May 2015 22:44:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A71562045E for ; Mon, 11 May 2015 22:44:46 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D1C4320457 for ; Mon, 11 May 2015 22:44:45 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YrwOw-0003mU-6m; Mon, 11 May 2015 22:42:18 +0000 Received: from mail-ob0-x231.google.com ([2607:f8b0:4003:c01::231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YrwOg-0003fe-Qg for linux-arm-kernel@lists.infradead.org; Mon, 11 May 2015 22:42:03 +0000 Received: by obfe9 with SMTP id e9so111288950obf.1 for ; Mon, 11 May 2015 15:41:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=u7Uk9DA1IZj7qyfw0G1gfIAZNELJMj3IEzAgZ+miRj4=; b=ak/nAFQZyysATjAX5nToWz83jtmDjV8745UpPiNFiByD0Gghnp4o30nDotn5GIS/U0 O9nzQMKvybgjSmn5D+gvQf41sBEXIIRizeqXnSULnEu0jGAiZOpT/dyY0SzMs6kYFqu4 0VYbSxz1MOyb1ddwo07+5UNpDQWsxsAV7mCLQxbzW8e7urfIecX+QMcWHOPQG8EqwBqf ssp2h2LQwib+3foKHKJ+JwvlqDizvpKOgh9A8bxdwBxNgC4qkiE7Vy9NDRd7CkDZZ0yg 5jxPxbAUcJbFespSSnzw7y2xcjggGzHzvSFJRaCLpklwbox7Yq8izA9+i0KncdefxoZw KW5Q== X-Received: by 10.202.67.10 with SMTP id q10mr9273797oia.124.1431384101884; Mon, 11 May 2015 15:41:41 -0700 (PDT) Received: from rob-hp-laptop.herring.priv (72-48-98-129.dyn.grandenetworks.net. [72.48.98.129]) by mx.google.com with ESMTPSA id oy11sm9724918oeb.3.2015.05.11.15.41.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 May 2015 15:41:41 -0700 (PDT) From: Rob Herring To: Russell King , Alexandre Belloni , Eric Miao , Haojian Zhuang , Alessandro Zummo Subject: [PATCH v3 1/4] ARM: pxa: add memory resource to RTC device Date: Mon, 11 May 2015 17:41:26 -0500 Message-Id: <1431384089-28367-2-git-send-email-robh@kernel.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1431384089-28367-1-git-send-email-robh@kernel.org> References: <1431384089-28367-1-git-send-email-robh@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150511_154202_908471_980737AE X-CRM114-Status: GOOD ( 12.15 ) X-Spam-Score: -0.4 (/) Cc: Rob Herring , rtc-linux@googlegroups.com, Arnd Bergmann , Daniel Mack , Robert Jarzmik , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add the memory resource for the sa1100-rtc device. Since the memory resource is already present in the pxa_rtc_resources, that makes sa1100_rtc_resources and pxa_rtc_resources equivalent, so use pxa_rtc_resources for both devices and remove the duplicate sa1100_rtc_resources. Signed-off-by: Rob Herring Cc: Daniel Mack Cc: Haojian Zhuang Acked-by: Robert Jarzmik Cc: Russell King Cc: linux-arm-kernel@lists.infradead.org --- arch/arm/mach-pxa/devices.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index 3543466..b598db6 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c @@ -439,25 +439,11 @@ struct platform_device pxa_device_rtc = { .resource = pxa_rtc_resources, }; -static struct resource sa1100_rtc_resources[] = { - { - .start = IRQ_RTC1Hz, - .end = IRQ_RTC1Hz, - .name = "rtc 1Hz", - .flags = IORESOURCE_IRQ, - }, { - .start = IRQ_RTCAlrm, - .end = IRQ_RTCAlrm, - .name = "rtc alarm", - .flags = IORESOURCE_IRQ, - }, -}; - struct platform_device sa1100_device_rtc = { .name = "sa1100-rtc", .id = -1, - .num_resources = ARRAY_SIZE(sa1100_rtc_resources), - .resource = sa1100_rtc_resources, + .num_resources = ARRAY_SIZE(pxa_rtc_resources), + .resource = pxa_rtc_resources, }; static struct resource pxa_ac97_resources[] = {