From patchwork Mon Sep 1 18:09:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 36403 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 11A772032B for ; Mon, 1 Sep 2014 18:10:09 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id g18sf33670532oah.6 for ; Mon, 01 Sep 2014 11:10:08 -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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=TInF7gqhuTCF2UzqE3G/BHNG5OXCeDa0gGpsFXHKzSw=; b=TyvM0QfTQo17g84qUD+zEd/RZuEgx7arqxKQ01Dw7YPrBnWy3DKq+HXLWow41Tmvpm Ky9q5El2N1l+1pca+Nk4/GSpGQBK76T7PpcqDP/PhinlNePuacwtY2gS4Bg2/+hlBIey 2eULfXg6uJh7TFiK6jUWEJCt/XN3FqTnBbu/6umpnVB/YtaXsLZoOqEaodpCXMJNpyX5 u7n0J7R0Ekm5EVucJNrAkGwln45tl3lB20hXrGUazpl/c1qlpECxaNxx3IFk0zqbgOTD PNVHV9Rqc4mtJGjEKKCd5l9h4yif4x71XXpb6j4p+7OrQBFw9DyfKL89/8lJOJ8zsaRW jWVw== X-Gm-Message-State: ALoCoQlye2OvaWn17Y4LID7BxTbhyuedDO6ky1LwI0xMRN1JA0FmVRG5ex+bpENWCyEnWAsgK84t X-Received: by 10.42.90.209 with SMTP id l17mr938834icm.34.1409595008686; Mon, 01 Sep 2014 11:10:08 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.82.75 with SMTP id g69ls1996123qgd.53.gmail; Mon, 01 Sep 2014 11:10:08 -0700 (PDT) X-Received: by 10.221.62.7 with SMTP id wy7mr1521760vcb.66.1409595008575; Mon, 01 Sep 2014 11:10:08 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id uh9si1088663vcb.69.2014.09.01.11.10.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 01 Sep 2014 11:10:08 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id hy4so5744846vcb.24 for ; Mon, 01 Sep 2014 11:10:08 -0700 (PDT) X-Received: by 10.221.6.201 with SMTP id ol9mr26552015vcb.2.1409595008464; Mon, 01 Sep 2014 11:10:08 -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.221.45.67 with SMTP id uj3csp421334vcb; Mon, 1 Sep 2014 11:10:08 -0700 (PDT) X-Received: by 10.70.118.9 with SMTP id ki9mr41866061pdb.104.1409595007640; Mon, 01 Sep 2014 11:10:07 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tf5si2430384pab.88.2014.09.01.11.10.07 for ; Mon, 01 Sep 2014 11:10:07 -0700 (PDT) Received-SPF: none (google.com: linux-omap-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754676AbaIASKF (ORCPT + 5 others); Mon, 1 Sep 2014 14:10:05 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:34861 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754675AbaIASKD (ORCPT ); Mon, 1 Sep 2014 14:10:03 -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 s81I9hgP031243; Mon, 1 Sep 2014 13:09:43 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s81I9hPY008094; Mon, 1 Sep 2014 13:09:43 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.174.1; Mon, 1 Sep 2014 13:09:43 -0500 Received: from sokoban.home (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s81I9JlB012145; Mon, 1 Sep 2014 13:09:42 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 12/26] ARM: AM43xx: hwmod: use OMAP4 hardreset ops instead of the AM33xx version Date: Mon, 1 Sep 2014 21:09:01 +0300 Message-ID: <1409594955-1476-13-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1409594955-1476-1-git-send-email-t-kristo@ti.com> References: <1409594955-1476-1-git-send-email-t-kristo@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: t-kristo@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.220.179 as permitted sender) smtp.mail=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: , List-Help: , List-Archive: List-Unsubscribe: , AM43xx is using OMAP4+ PRM driver, so it should be using the corresponding hardreset ops from the hwmod also. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/omap_hwmod.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 0267af5..c52dc4c 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -4115,9 +4115,9 @@ void __init omap_hwmod_init(void) soc_ops.enable_module = _omap4_enable_module; soc_ops.disable_module = _omap4_disable_module; soc_ops.wait_target_ready = _omap4_wait_target_ready; - soc_ops.assert_hardreset = _am33xx_assert_hardreset; - soc_ops.deassert_hardreset = _am33xx_deassert_hardreset; - soc_ops.is_hardreset_asserted = _am33xx_is_hardreset_asserted; + soc_ops.assert_hardreset = _omap4_assert_hardreset; + soc_ops.deassert_hardreset = _omap4_deassert_hardreset; + soc_ops.is_hardreset_asserted = _omap4_is_hardreset_asserted; soc_ops.init_clkdm = _init_clkdm; } else if (soc_is_am33xx()) { soc_ops.enable_module = _omap4_enable_module;