From patchwork Thu Apr 30 20:37:10 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: 6307041 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 19F7D9F1C2 for ; Thu, 30 Apr 2015 20:40:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 31AE2201CD for ; Thu, 30 Apr 2015 20:40: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 64649201BC for ; Thu, 30 Apr 2015 20:40: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 1YnvDx-0003t5-T4; Thu, 30 Apr 2015 20:38:21 +0000 Received: from mail-ob0-x22c.google.com ([2607:f8b0:4003:c01::22c]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YnvDJ-0003e4-F9 for linux-arm-kernel@lists.infradead.org; Thu, 30 Apr 2015 20:37:42 +0000 Received: by obblk2 with SMTP id lk2so14378889obb.0 for ; Thu, 30 Apr 2015 13:37:20 -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=QSq6eIAiTrBvMK51cajvwXT7Hf+bdi4Guj9DxuIQSEw=; b=YmKnHtP1SiWT8yoYU0l+mFjGQ6zo3kvuW2y2Ts8TzAkPq9zzK3wVIcqu0Mf1kae33X kELG84I3GyYb5/wiBTH/bndmJrzxdUIX+dwR8C2X8gNfG6+OQlS7LuCCk+lPMEq17OI1 CzCx8jCNof8Y9Xofg0sXoR5IN8vh8act2fU2yJGfdMhokBkppOs7UOrwuf5DyNxb6m/k PNn+0zBt95jKXL/TZMxxZ+Xq7FbB010Zd0PiOzIpGzbDkzj26RfpFt78+mroGiz1e52R ywrWsFUQ4FEgADihwI8OI2T1pzmZr+AZ5Z8NrbSwpS+NcfDZpZheKXhNDalR59hxYHXR 05KA== X-Received: by 10.60.143.73 with SMTP id sc9mr5140768oeb.70.1430426240343; Thu, 30 Apr 2015 13:37:20 -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 hc7sm1903940obb.16.2015.04.30.13.37.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 30 Apr 2015 13:37:19 -0700 (PDT) From: Rob Herring To: Russell King , Robert Jarzmik , Alessandro Zummo Subject: [PATCH v2 1/4] ARM: pxa: add memory resource to RTC device Date: Thu, 30 Apr 2015 15:37:10 -0500 Message-Id: <1430426233-7461-2-git-send-email-robh@kernel.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1430426233-7461-1-git-send-email-robh@kernel.org> References: <1430426233-7461-1-git-send-email-robh@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150430_133741_569940_757BA269 X-CRM114-Status: GOOD ( 12.51 ) X-Spam-Score: -0.2 (/) Cc: Rob Herring , Eric Miao , rtc-linux@googlegroups.com, Arnd Bergmann , Haojian Zhuang , Daniel Mack , 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=ham 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 Cc: Robert Jarzmik Cc: Russell King Cc: linux-arm-kernel@lists.infradead.org Acked-by: Robert Jarzmik --- v2: - Rebase to v4.1-rc1 arch/arm/mach-pxa/devices.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) -- 2.1.0 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[] = {