From patchwork Tue Sep 2 09:13:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 4823871 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 93555C0338 for ; Tue, 2 Sep 2014 09:13:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7743520154 for ; Tue, 2 Sep 2014 09:13:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A12E120170 for ; Tue, 2 Sep 2014 09:13:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753262AbaIBJNt (ORCPT ); Tue, 2 Sep 2014 05:13:49 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:55148 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753259AbaIBJNs (ORCPT ); Tue, 2 Sep 2014 05:13:48 -0400 Received: by mail-wi0-f172.google.com with SMTP id n3so13891562wiv.17 for ; Tue, 02 Sep 2014 02:13:47 -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=TCSLg/KH9uBA0pJsakqZM7YQU83isVv+t4N8OubDe/8=; b=U4nWzcJSRb6a6MOlg0LGlpdpChPV0sQ3QW3s4WbvaSuTwuz3KN/8BHa46ns7xDUeZu fha721aE/VluNcAsQ2pWHr4BClx3cOyB0lC6pWAf/1iKtRx9HUVSSI1fagxJj4o+ia3n VRIiwacu5g+MmhhtVjNlv4UsZh13xHGTdpYV+MPdNz0swBUTnEHCNKi7uGxqf8obNi8n 4nR5BPQHm0CJjmWaXR8zndIkB4J8qFCB6qXWE1UszLLZLiecLcQrhqu+hMJEHicOHKL5 Csu2aU4IpXAvPNaJ4ik/q0mO33uUavv0ke+sgDAQ6tf5UHvyMyo17DKIafdEZAPZAxTz LNEw== X-Received: by 10.195.12.103 with SMTP id ep7mr1393032wjd.121.1409649227451; Tue, 02 Sep 2014 02:13:47 -0700 (PDT) Received: from groucho.site ([91.108.183.74]) by mx.google.com with ESMTPSA id h6sm8087525wjb.33.2014.09.02.02.13.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Sep 2014 02:13:46 -0700 (PDT) From: Ulrich Hecht To: horms@verge.net.au Cc: linux-sh@vger.kernel.org, mturquette@linaro.org, magnus.damm@gmail.com, Laurent Pinchart , Geert Uytterhoeven , Ulrich Hecht Subject: [PATCH v2 06/10] ARM: shmobile: kzm9g-reference: Enable CMT1 in device tree Date: Tue, 2 Sep 2014 11:13:02 +0200 Message-Id: <1409649186-1046-7-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1409649186-1046-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1409649186-1046-1-git-send-email-ulrich.hecht+renesas@gmail.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-8.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SBL, RP_MATCHES_RCVD, T_DKIM_INVALID,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 Signed-off-by: Ulrich Hecht --- arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 4 ++++ arch/arm/mach-shmobile/setup-sh73a0.c | 11 +---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts index e33d698..83c6058 100644 --- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts +++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts @@ -177,6 +177,10 @@ clock-frequency = <48000000>; }; +&cmt1 { + status = "ok"; +}; + &i2c0 { status = "okay"; as3711@40 { diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c index 6d73b83..2c6ef79 100644 --- a/arch/arm/mach-shmobile/setup-sh73a0.c +++ b/arch/arm/mach-shmobile/setup-sh73a0.c @@ -697,10 +697,6 @@ static struct platform_device irqpin3_device = { }, }; -static struct platform_device *sh73a0_devices_dt[] __initdata = { - &cmt1_device, -}; - static struct platform_device *sh73a0_early_devices[] __initdata = { &scif0_device, &scif1_device, @@ -713,6 +709,7 @@ static struct platform_device *sh73a0_early_devices[] __initdata = { &scif8_device, &tmu0_device, &ipmmu_device, + &cmt1_device, }; static struct platform_device *sh73a0_late_devices[] __initdata = { @@ -737,8 +734,6 @@ void __init sh73a0_add_standard_devices(void) /* Clear software reset bit on SY-DMAC module */ __raw_writel(__raw_readl(SRCR2) & ~(1 << 18), SRCR2); - platform_add_devices(sh73a0_devices_dt, - ARRAY_SIZE(sh73a0_devices_dt)); platform_add_devices(sh73a0_early_devices, ARRAY_SIZE(sh73a0_early_devices)); platform_add_devices(sh73a0_late_devices, @@ -765,8 +760,6 @@ void __init sh73a0_earlytimer_init(void) void __init sh73a0_add_early_devices(void) { - early_platform_add_devices(sh73a0_devices_dt, - ARRAY_SIZE(sh73a0_devices_dt)); early_platform_add_devices(sh73a0_early_devices, ARRAY_SIZE(sh73a0_early_devices)); @@ -782,8 +775,6 @@ void __init sh73a0_add_standard_devices_dt(void) #ifndef CONFIG_COMMON_CLK sh73a0_clock_init(); #endif - platform_add_devices(sh73a0_devices_dt, - ARRAY_SIZE(sh73a0_devices_dt)); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); }