From patchwork Mon Jun 11 15:25:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 9206 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 65B3323EB4 for ; Mon, 11 Jun 2012 15:25:51 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 3449EA186CE for ; Mon, 11 Jun 2012 15:25:51 +0000 (UTC) Received: by mail-gh0-f180.google.com with SMTP id z12so2827798ghb.11 for ; Mon, 11 Jun 2012 08:25:51 -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=9Erslz2CLebxbU3uoT9kxLS46p0Hp6aY5hA4pL98b1o=; b=Po2kMfIb5/tXItQ0/WNs/elCizBBQ2QULB1pdloRQroD+7B8qnHp4MsZHDoviD8gVu Ez0Wrh1cH/rR9XiFMtS0OlJ4hdqxOQhPHcrCpyDhLRPGdpIgMre9zcC678XBYU/YD/RH rX4/cfTHE4J2IprjDWqJJQC6qepRhtmTXuJGCw4NZp780zgPpwCoTAkxA8SJijqz6bM8 ZwJKvPHOgjW+h1NTCEwA47nlUymvzcbZFIhy/6AxHC7tbFWusmyPs/vloG/v7X70HIKf rDCiStNK89pUSxKDEQJoCoJQ31vZbihTE3QIgbj8x/KKzgnTJ0PiZzWRuqWyTjNMbsL+ PdYA== Received: by 10.50.193.196 with SMTP id hq4mr6490719igc.57.1339428350735; Mon, 11 Jun 2012 08:25:50 -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.231.24.148 with SMTP id v20csp115750ibb; Mon, 11 Jun 2012 08:25:49 -0700 (PDT) Received: by 10.204.129.17 with SMTP id m17mr10402909bks.4.1339428349143; Mon, 11 Jun 2012 08:25:49 -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 h46si11093593wed.105.2012.06.11.08.25.48 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 11 Jun 2012 08:25:49 -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 e53so2963103wer.37 for ; Mon, 11 Jun 2012 08:25:48 -0700 (PDT) Received: by 10.180.99.70 with SMTP id eo6mr21737833wib.17.1339428348565; Mon, 11 Jun 2012 08:25:48 -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 ch9sm39413606wib.8.2012.06.11.08.25.47 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 11 Jun 2012 08:25:47 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: linus.walleij@stericsson.com, arnd@arndb.de, grant.likely@secretlab.ca, Lee Jones Subject: [PATCH 14/14] ARM: ux500: Move rtc-pl031 registration to Device Tree when enabled Date: Mon, 11 Jun 2012 16:25:07 +0100 Message-Id: <1339428307-3850-15-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1339428307-3850-1-git-send-email-lee.jones@linaro.org> References: <1339428307-3850-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmKxzCFRxX9REgTiIPKao4YynXgMqWKBV0LwZDP2UzJyGRzYUng0pavDJJUvomAmWdrhQNS During a Device Tree boot, all probing will now be completed on parse of the Device Tree binary. In the same patch we remove platform registration of the Real Time Clock. Signed-off-by: Lee Jones --- arch/arm/boot/dts/db8500.dtsi | 2 +- arch/arm/mach-ux500/cpu-db8500.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/db8500.dtsi b/arch/arm/boot/dts/db8500.dtsi index 26f895f..e90a449 100644 --- a/arch/arm/boot/dts/db8500.dtsi +++ b/arch/arm/boot/dts/db8500.dtsi @@ -48,7 +48,7 @@ }; rtc@80154000 { - compatible = "stericsson,db8500-rtc"; + compatible = "arm,rtc-pl031", "arm,primecell"; reg = <0x80154000 0x1000>; interrupts = <0 18 0x4>; }; diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 7d5d090..a823993 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -237,7 +237,6 @@ struct device * __init u8500_of_init_devices(void) parent = db8500_soc_device_init(); - db8500_add_rtc(parent); db8500_add_usb(parent, usb_db8500_rx_dma_cfg, usb_db8500_tx_dma_cfg); platform_device_register_data(parent, "cpufreq-u8500", -1, NULL, 0);