Message ID | 1442238160-5674-3-git-send-email-balbi@ti.com |
---|---|
State | New |
Headers | show
Return-Path: <patchwork-forward+bncBC5M7T4HYEKRB4453OXQKGQEVF4BV2A@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by patches.linaro.org (Postfix) with ESMTPS id CD9FD2056A for <linaro@patches.linaro.org>; Mon, 14 Sep 2015 13:43:16 +0000 (UTC) Received: by lamp12 with SMTP id p12sf47801497lam.2 for <linaro@patches.linaro.org>; Mon, 14 Sep 2015 06:43:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe; bh=+YRU8QwMg/zF3Df4JMDrazA/wrqGY/wsbr9dURbnoXw=; b=SYDaXFaiURMYheQXC8ZZg6eHz1Q8QgSvTo3a85xEZDiTjVgxKQ4ia5qmg6M0I81dqN UgKg/28sdCyJuQEjM1aIMuOXwoL3of+00jhXPiFBHKSNYbx4pCAX2aptuYPvVoqPp/HL GNgtPY+4l0XtYuwBrsyWz2+7SmGyZHBgjUx2YVdcp2zxXqNXlNz5oRlmO3FYu0QP6f95 Pc+ZyG/+pNnIlqW7Qrnsu6H3YgJ+Bs7Pc3kaVfNhaB9IVW8Ee36fnIBHkrj8e7TdcLOj e75mXRtCzytGksC1NMWXDdUkwEp2IMqkzKLY2F21XAxugtkXuuUm+5jt3b8QEHUi8Rwl RvaQ== X-Gm-Message-State: ALoCoQnrwV2Ajl4UaXXs4FRqTOb0rKfhSaqn9VVfYE751N1V9Sdd68807BfuTEULSyikKBb+7Cee X-Received: by 10.112.158.202 with SMTP id ww10mr3110053lbb.13.1442238195824; Mon, 14 Sep 2015 06:43:15 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.198.203 with SMTP id je11ls97348lac.9.gmail; Mon, 14 Sep 2015 06:43:15 -0700 (PDT) X-Received: by 10.152.27.230 with SMTP id w6mr13763529lag.63.1442238195518; Mon, 14 Sep 2015 06:43:15 -0700 (PDT) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id f3si9768993lag.4.2015.09.14.06.43.15 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Sep 2015 06:43:15 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by lanb10 with SMTP id b10so86667401lan.3 for <patchwork-forward@linaro.org>; Mon, 14 Sep 2015 06:43:15 -0700 (PDT) X-Received: by 10.112.17.34 with SMTP id l2mr3318037lbd.117.1442238195170; Mon, 14 Sep 2015 06:43:15 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1208314lbq; Mon, 14 Sep 2015 06:43:14 -0700 (PDT) X-Received: by 10.107.31.135 with SMTP id f129mr4470435iof.8.1442238193984; Mon, 14 Sep 2015 06:43:13 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n2si8045557ige.66.2015.09.14.06.43.13; Mon, 14 Sep 2015 06:43:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753858AbbINNnM (ORCPT <rfc822;nicolas.dechesne@linaro.org> + 5 others); Mon, 14 Sep 2015 09:43:12 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:55440 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753672AbbINNnK (ORCPT <rfc822; linux-omap@vger.kernel.org>); Mon, 14 Sep 2015 09:43:10 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id t8EDgh8b024838; Mon, 14 Sep 2015 08:42:44 -0500 Received: from DLEE70.ent.ti.com (dlemailx.itg.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8EDghFi001951; Mon, 14 Sep 2015 08:42:43 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.224.2; Mon, 14 Sep 2015 08:42:43 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8EDgg4b017358; Mon, 14 Sep 2015 08:42:43 -0500 From: Felipe Balbi <balbi@ti.com> To: Tony Lindgren <tony@atomide.com> CC: Linux OMAP Mailing List <linux-omap@vger.kernel.org>, Linux ARM Kernel Mailing List <linux-arm-kernel@lists.infradead.org>, Felipe Balbi <balbi@ti.com> Subject: [PATCH 2/2] arm: omap2: board-generic: use omap4_local_timer_init for AM437x Date: Mon, 14 Sep 2015 08:42:40 -0500 Message-ID: <1442238160-5674-3-git-send-email-balbi@ti.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1442238160-5674-1-git-send-email-balbi@ti.com> References: <1442238160-5674-1-git-send-email-balbi@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-omap-owner@vger.kernel.org Precedence: list List-ID: <patchwork-forward.linaro.org> X-Mailing-List: linux-omap@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: balbi@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> |
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 24c9afc9e8a7..89bf39663d61 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -279,7 +279,7 @@ DT_MACHINE_START(AM43_DT, "Generic AM43 (Flattened Device Tree)") .init_late = am43xx_init_late, .init_irq = omap_gic_of_init, .init_machine = omap_generic_init, - .init_time = omap3_gptimer_timer_init, + .init_time = omap4_local_timer_init, .dt_compat = am43_boards_compat, .restart = omap44xx_restart, MACHINE_END
AM437x-based boards, can use omap4_local_timer_init() just fine. Let's use that instead. Signed-off-by: Felipe Balbi <balbi@ti.com> --- arch/arm/mach-omap2/board-generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)