From patchwork Mon Jul 7 07:54:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 4493421 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BCD269F36A for ; Mon, 7 Jul 2014 07:55:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E453F2027D for ; Mon, 7 Jul 2014 07:55:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0BC7220272 for ; Mon, 7 Jul 2014 07:55:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751873AbaGGHzg (ORCPT ); Mon, 7 Jul 2014 03:55:36 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:58795 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751857AbaGGHzg (ORCPT ); Mon, 7 Jul 2014 03:55:36 -0400 Received: from penelope.isobedori.kobe.vergenet.net (243-249.80-90.static-ip.oleane.fr [90.80.249.243]) by kirsty.vergenet.net (Postfix) with ESMTP id BF4A626718A; Mon, 7 Jul 2014 17:55:34 +1000 (EST) Received: by penelope.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id A400D7C029D; Mon, 7 Jul 2014 09:55:01 +0200 (CEST) From: Simon Horman To: linux-sh@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Magnus Damm , Laurent Pinchart , Simon Horman Subject: [PATCH v2 23/30] ARM: shmobile: armadillo800eva-reference: Initialise CMT1 device using DT Date: Mon, 7 Jul 2014 09:54:48 +0200 Message-Id: <1404719695-1634-24-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 2.0.0.rc2 In-Reply-To: <1404719695-1634-1-git-send-email-horms+renesas@verge.net.au> References: <1404719695-1634-1-git-send-email-horms+renesas@verge.net.au> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Initialise CMT1 device using DT when booting armadillo800eva using DT-reference. Signed-off-by: Simon Horman --- v2 * First post --- arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts | 4 ++++ arch/arm/mach-shmobile/setup-r8a7740.c | 11 +---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts index c430197..346f6ef 100644 --- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts +++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts @@ -205,6 +205,10 @@ }; }; +&cmt1 { + status = "okay"; +}; + &tmu0 { status = "okay"; }; diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c index 3d5eaca..3dcdc8d 100644 --- a/arch/arm/mach-shmobile/setup-r8a7740.c +++ b/arch/arm/mach-shmobile/setup-r8a7740.c @@ -311,10 +311,6 @@ static struct platform_device ipmmu_device = { .num_resources = ARRAY_SIZE(ipmmu_resources), }; -static struct platform_device *r8a7740_devices_dt[] __initdata = { - &cmt1_device, -}; - static struct platform_device *r8a7740_early_devices[] __initdata = { &scif0_device, &scif1_device, @@ -325,6 +321,7 @@ static struct platform_device *r8a7740_early_devices[] __initdata = { &scif6_device, &scif7_device, &scif8_device, + &cmt1_device, &irqpin0_device, &irqpin1_device, &irqpin2_device, @@ -756,8 +753,6 @@ void __init r8a7740_add_standard_devices(void) /* add devices */ platform_add_devices(r8a7740_early_devices, ARRAY_SIZE(r8a7740_early_devices)); - platform_add_devices(r8a7740_devices_dt, - ARRAY_SIZE(r8a7740_devices_dt)); platform_add_devices(r8a7740_late_devices, ARRAY_SIZE(r8a7740_late_devices)); @@ -779,8 +774,6 @@ void __init r8a7740_add_early_devices(void) { early_platform_add_devices(r8a7740_early_devices, ARRAY_SIZE(r8a7740_early_devices)); - early_platform_add_devices(r8a7740_devices_dt, - ARRAY_SIZE(r8a7740_devices_dt)); /* setup early console here as well */ shmobile_setup_console(); @@ -790,8 +783,6 @@ void __init r8a7740_add_early_devices(void) void __init r8a7740_add_standard_devices_dt(void) { - platform_add_devices(r8a7740_devices_dt, - ARRAY_SIZE(r8a7740_devices_dt)); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); }