From patchwork Mon Mar 31 15:15:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 27428 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f197.google.com (mail-ob0-f197.google.com [209.85.214.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7F627202E0 for ; Mon, 31 Mar 2014 15:17:31 +0000 (UTC) Received: by mail-ob0-f197.google.com with SMTP id wp18sf29201499obc.0 for ; Mon, 31 Mar 2014 08:17:30 -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=lBAGzl4cWZqxW5MPAJTDYivWJHm9W+g4Iv6Pi3YeHbY=; b=CE2YZP1M3HZNrTjfrT6Oom2x4N2re0WOYiyi+oPLabR/O4VdbX/dKqwBpjgCKAw2As 6T/nvZFEo/oIP+ZTVqbaX2lMwWZnnEPdAvWQveUjjCNYUZ8QjpnUY3x8VPIXRIbwVbJr /3VAzbGS3s+lANN7t59lk65LZjkIO3IEK2BJiIGWFGRv3zcv2m1chUmZz6rsXZ6NeySv pGAhGLUyknbv2idceS+FxEHINe/5zRTubB76cAgQFzEHec6TZStty8KJWkz4W7fiK/Gg Us0OMbHwVBk4RQb7ZUcan3FMBMZI3nQsiKx357DzUx7iAMHqSVPiIJ4rTSirLBlbWdyo P+kQ== X-Gm-Message-State: ALoCoQksQKXJBoOwVccJ83LmL/5hUPFw4uXyIy/UEC15mvLv7jwuUO+SeBoUCFLquyR4Zk90cF8K X-Received: by 10.43.18.133 with SMTP id qg5mr8997279icb.13.1396279050839; Mon, 31 Mar 2014 08:17:30 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.102.103 with SMTP id v94ls450046qge.0.gmail; Mon, 31 Mar 2014 08:17:30 -0700 (PDT) X-Received: by 10.221.22.71 with SMTP id qv7mr173542vcb.34.1396279050736; Mon, 31 Mar 2014 08:17:30 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id b2si2913392vcz.200.2014.03.31.08.17.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:17:30 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id lc6so8171679vcb.7 for ; Mon, 31 Mar 2014 08:17:30 -0700 (PDT) X-Received: by 10.52.78.231 with SMTP id e7mr1135046vdx.28.1396279050651; Mon, 31 Mar 2014 08:17:30 -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.220.12.8 with SMTP id v8csp150643vcv; Mon, 31 Mar 2014 08:17:30 -0700 (PDT) X-Received: by 10.68.131.202 with SMTP id oo10mr25880558pbb.35.1396279049752; Mon, 31 Mar 2014 08:17:29 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cb4si4132536pbc.495.2014.03.31.08.17.29; Mon, 31 Mar 2014 08:17:29 -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 S1753345AbaCaPR2 (ORCPT + 5 others); Mon, 31 Mar 2014 11:17:28 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:49786 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752627AbaCaPR2 (ORCPT ); Mon, 31 Mar 2014 11:17:28 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s2VFH4Ho015143; Mon, 31 Mar 2014 10:17:04 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2VFH4Tu013686; Mon, 31 Mar 2014 10:17:04 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Mon, 31 Mar 2014 10:17:04 -0500 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2VFGm3t013169; Mon, 31 Mar 2014 10:17:03 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 08/55] ARM: DRA7: PRM: add voltage processor check behind a prm_feature flag Date: Mon, 31 Mar 2014 18:15:47 +0300 Message-ID: <1396278994-12624-9-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1396278994-12624-1-git-send-email-t-kristo@ti.com> References: <1396278994-12624-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=neutral (google.com: 209.85.220.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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: , This is done in attempt to get rid of cpu_is_X calls from the PRM core. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/prm.h | 1 + arch/arm/mach-omap2/prm44xx.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/prm.h b/arch/arm/mach-omap2/prm.h index fd5123e..8d40a5d 100644 --- a/arch/arm/mach-omap2/prm.h +++ b/arch/arm/mach-omap2/prm.h @@ -29,6 +29,7 @@ int of_prcm_init(void); * PRM_HAS_VOLTAGE: has voltage domains */ #define PRM_HAS_IO_WAKEUP (1 << 0) +#define PRM_HAS_VOLTAGE (1 << 1) #ifndef __ASSEMBLER__ enum { diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c index 18fae1dd..fb05abc 100644 --- a/arch/arm/mach-omap2/prm44xx.c +++ b/arch/arm/mach-omap2/prm44xx.c @@ -624,7 +624,7 @@ static int omap4_pwrdm_wait_transition(struct powerdomain *pwrdm) static int omap4_check_vcvp(void) { /* No VC/VP on dra7xx devices */ - if (soc_is_dra7xx()) + if (!(prm_features & PRM_HAS_VOLTAGE)) return 0; return 1; @@ -664,6 +664,8 @@ static struct prm_ll_data omap44xx_prm_ll_data = { int __init omap44xx_prm_init(u16 cpu_type) { + if (cpu_type != PRM_DRA7) + prm_features |= PRM_HAS_VOLTAGE; if (cpu_type == PRM_OMAP4) prm_features |= PRM_HAS_IO_WAKEUP;